X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=ace7f8e2c752b030fc07b5ec91f2d96863711397;hp=1067ff235bf96ea8342ef5345126a2e87c158136;hb=5baca01e36f5457f79846bca75060b222520ab72;hpb=40f742bad4180e7211a08252079dd873417d1e7c diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 1067ff2..ace7f8e 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -20,7 +20,7 @@ from time import time from copy import copy, deepcopy 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 osm_nbi.base_topic import BaseTopic, EngineException, get_iterable, deep_get, increment_ip_mac # from descriptor_topics import DescriptorTopic from yaml import safe_dump from osm_common.dbbase import DbException @@ -114,6 +114,9 @@ class NsrTopic(BaseTopic): if not nsrs_list: self.db.set_one("vnfds", {"_id": used_vnfd_id}, {"_admin.usageState": "NOT_IN_USE"}) + # delete extra ro_nsrs used for internal RO module + self.db.del_one("ro_nsrs", q_filter={"_id": _id}, fail_on_empty=False) + @staticmethod def _format_ns_request(ns_request): formated_request = copy(ns_request) @@ -289,6 +292,9 @@ class NsrTopic(BaseTopic): "_id": nsr_id, # "input-parameter": xpath, value, "ssh-authorized-key": ns_request.get("ssh_keys"), # TODO remove + "vld": nsd.get("vld") or [], + "flavor": [], + "image": [], } ns_request["nsr_id"] = nsr_id if ns_request and ns_request.get("config-units"): @@ -406,6 +412,8 @@ class NsrTopic(BaseTopic): } if kdu_params and kdu_params.get("config-units"): kdur["config-units"] = kdu_params["config-units"] + if kdu.get("helm-version"): + kdur["helm-version"] = kdu["helm-version"] for k8s_type in ("helm-chart", "juju-bundle"): if kdu.get(k8s_type): kdur[k8s_type] = kdu_model or kdu[k8s_type] @@ -423,7 +431,8 @@ class NsrTopic(BaseTopic): # "vim-id", "flavor-id", "image-id", "management-ip" # filled by LCM "internal-connection-point": [], "interfaces": [], - "additionalParams": additional_params + "additionalParams": additional_params, + "vdu-name": vdu["name"], } if vdu_params and vdu_params.get("config-units"): vdur["config-units"] = vdu_params["config-units"] @@ -432,26 +441,55 @@ class NsrTopic(BaseTopic): if vdu.get("pdu-type"): vdur["pdu-type"] = vdu["pdu-type"] vdur["name"] = vdu["pdu-type"] + + # flavor + flavor_data = copy(vdu.get("vm-flavor", {})) + flavor_data["guest-epa"] = vdu.get("guest-epa") + f = next((f for f in nsr_descriptor["flavor"] if + all(f.get(k) == flavor_data[k] for k in flavor_data)), None) + if not f: + flavor_data["vim_info"] = [] + flavor_data["name"] = vdu["id"][:56] + "-flv" + flavor_data["id"] = str(len(nsr_descriptor["flavor"])) + nsr_descriptor["flavor"].append(flavor_data) + f = flavor_data + vdur["ns-flavor-id"] = f["id"] + + # image + if vdu.get("image"): + image_data = {"image": vdu["image"], "image_checksum": vdu.get("image_checksum")} + img = next((f for f in nsr_descriptor["image"] if + all(f.get(k) == image_data[k] for k in image_data)), None) + if not img: + image_data["vim_info"] = [] + image_data["id"] = str(len(nsr_descriptor["image"])) + nsr_descriptor["image"].append(image_data) + img = image_data + vdur["ns-image-id"] = img["id"] + # TODO volumes: name, volume-id for icp in vdu.get("internal-connection-point", ()): vdu_icp = { "id": icp["id"], "connection-point-id": icp["id"], "name": icp.get("name"), - # "ip-address", "mac-address" # filled by LCM - # vim-id # TODO it would be nice having a vim port id } vdur["internal-connection-point"].append(vdu_icp) for iface in vdu.get("interface", ()): vdu_iface = { - "name": iface.get("name"), - # "ip-address", "mac-address" # filled by LCM - # vim-id # TODO it would be nice having a vim port id - } + x: iface[x] for x in ("name", "ip-address", "mac-address", "internal-connection-point-ref", + "external-connection-point-ref") if iface.get(x) is not None} if vnfd_mgmt_cp and iface.get("external-connection-point-ref") == vnfd_mgmt_cp: vdu_iface["mgmt-vnf"] = True if iface.get("mgmt-interface"): vdu_iface["mgmt-interface"] = True # TODO change to mgmt-vdu + if iface.get("virtual-interface"): + if iface["virtual-interface"].get("type"): + iface["type"] = iface["virtual-interface"]["type"] + if iface["virtual-interface"].get("vpci"): + iface["vpci"] = iface["virtual-interface"]["vpci"] + if iface["virtual-interface"].get("bandwidth"): + iface["bandwidth"] = iface["virtual-interface"]["bandwidth"] # look for network where this interface is connected if iface.get("external-connection-point-ref"): @@ -470,12 +508,16 @@ class NsrTopic(BaseTopic): for vnfd_ivld_icp in get_iterable(vnfd_ivld.get("internal-connection-point")): if vnfd_ivld_icp.get("id-ref") == iface["internal-connection-point-ref"]: vdu_iface["vnf-vld-id"] = vnfd_ivld["id"] + if vnfd_ivld_icp.get("ip-address"): + vdu_iface["ip-address"] = vnfd_ivld_icp["ip-address"] break else: continue break - - vdur["interfaces"].append(vdu_iface) + if iface.get("position") is not None: + vdur["interfaces"].insert(iface["position"], vdu_iface) + else: + vdur["interfaces"].append(vdu_iface) count = vdu.get("count", 1) if count is None: count = 1 @@ -483,8 +525,15 @@ class NsrTopic(BaseTopic): for index in range(0, count): if index: vdur = deepcopy(vdur) + for iface in vdur["interfaces"]: + if iface.get("ip-address"): + iface["ip-address"] = increment_ip_mac(iface["ip-address"]) + if iface.get("mac-address"): + iface["mac-address"] = increment_ip_mac(iface["mac-address"]) + vdur["_id"] = str(uuid4()) vdur["count-index"] = index + vdur["id"] = "{}-{}".format(vdur["vdu-id-ref"], index) vnfr_descriptor["vdur"].append(vdur) step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format( @@ -933,6 +982,56 @@ class NsLcmOpTopic(BaseTopic): if vnf_inst_params.get("vimAccountId"): vim_account = vnf_inst_params.get("vimAccountId") + # 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")): + for vdur_index, vdur in enumerate(vnfr["vdur"]): + if vdu_inst_param["id"] != vdur["vdu-id-ref"]: + continue + for iface_inst_param in get_iterable(vdu_inst_param.get("interface")): + iface_index, _ = next(i for i in enumerate(vdur["interfaces"]) + if i[1]["name"] == iface_inst_param["name"]) + vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index) + if iface_inst_param.get("ip-address"): + vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac( + iface_inst_param.get("ip-address"), vdur.get("count-index", 0)) + if iface_inst_param.get("mac-address"): + vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac( + iface_inst_param.get("mac-address"), vdur.get("count-index", 0)) + # get vnf.internal-vld.internal-conection-point instantiation params to update vnfr.vdur.interfaces + # TODO update vld with the ip-profile + for ivld_inst_param in get_iterable(vnf_inst_params.get("internal-vld")): + for icp_inst_param in get_iterable(ivld_inst_param.get("internal-connection-point")): + # look for iface + for vdur_index, vdur in enumerate(vnfr["vdur"]): + for iface_index, iface in enumerate(vdur["interfaces"]): + if iface.get("internal-connection-point-ref") == icp_inst_param["id-ref"]: + vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index) + if icp_inst_param.get("ip-address"): + vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac( + icp_inst_param.get("ip-address"), vdur.get("count-index", 0)) + if icp_inst_param.get("mac-address"): + vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac( + icp_inst_param.get("mac-address"), vdur.get("count-index", 0)) + break + # get ip address from instantiation parameters.vld.vnfd-connection-point-ref + for vld_inst_param in get_iterable(indata.get("vld")): + for vnfcp_inst_param in get_iterable(vld_inst_param.get("vnfd-connection-point-ref")): + if vnfcp_inst_param["member-vnf-index-ref"] != member_vnf_index: + continue + # look for iface + for vdur_index, vdur in enumerate(vnfr["vdur"]): + for iface_index, iface in enumerate(vdur["interfaces"]): + if iface.get("external-connection-point-ref") == \ + vnfcp_inst_param["vnfd-connection-point-ref"]: + vnfr_update_text = "vdur.{}.interfaces.{}".format(vdur_index, iface_index) + if vnfcp_inst_param.get("ip-address"): + vnfr_update[vnfr_update_text + ".ip-address"] = increment_ip_mac( + vnfcp_inst_param.get("ip-address"), vdur.get("count-index", 0)) + if vnfcp_inst_param.get("mac-address"): + vnfr_update[vnfr_update_text + ".mac-address"] = increment_ip_mac( + vnfcp_inst_param.get("mac-address"), vdur.get("count-index", 0)) + break + vnfr_update["vim-account-id"] = vim_account vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id")