From: tierno Date: Tue, 6 Oct 2020 08:28:00 +0000 (+0000) Subject: fix 1238: Provide known ip-address, mac-address at created vnf X-Git-Tag: release-v9.0-start~17 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F9839%2F1;p=osm%2FNBI.git fix 1238: Provide known ip-address, mac-address at created vnf vnf is created at database. Instantiation parameters of ip-address, mac-adddress are populated to the vnf, so that it is available for jinja2 cloud-init parsing at LCM Change-Id: Ida091f713219f702b753a044683d9474a2670cc1 Signed-off-by: tierno --- diff --git a/osm_nbi/base_topic.py b/osm_nbi/base_topic.py index 5492a8f..9572409 100644 --- a/osm_nbi/base_topic.py +++ b/osm_nbi/base_topic.py @@ -65,6 +65,26 @@ def versiontuple(v): return tuple(filled) +def increment_ip_mac(ip_mac, vm_index=1): + if not isinstance(ip_mac, str): + return ip_mac + try: + # try with ipv4 look for last dot + i = ip_mac.rfind(".") + if i > 0: + i += 1 + return "{}{}".format(ip_mac[:i], int(ip_mac[i:]) + vm_index) + # try with ipv6 or mac look for last colon. Operate in hex + i = ip_mac.rfind(":") + if i > 0: + i += 1 + # format in hex, len can be 2 for mac or 4 for ipv6 + return ("{}{:0" + str(len(ip_mac) - i) + "x}").format(ip_mac[:i], int(ip_mac[i:], 16) + vm_index) + except Exception: + pass + return None + + class BaseTopic: # static variables for all instance classes topic = None # to_override diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 1067ff2..60a569a 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 @@ -438,16 +438,12 @@ class NsrTopic(BaseTopic): "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"): @@ -470,6 +466,8 @@ 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 @@ -483,6 +481,12 @@ 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 vnfr_descriptor["vdur"].append(vdur) @@ -933,6 +937,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")