X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=b33820259073e1ea1db09818b02045d9aae16409;hp=345e6a32d8f706151b5554b84ba5760e26ef0e07;hb=36ec86019fa668dddbbe0cf9d9ec53b9ea6569cf;hpb=b24258aa9716c1e375fde230a817f7c9faaf6c2a diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index 345e6a3..b338202 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -4,7 +4,7 @@ from uuid import uuid4 from http import HTTPStatus from time import time -from copy import copy +from copy import copy, deepcopy from validation import validate_input, ValidationError, ns_instantiate, ns_action, ns_scale from base_topic import BaseTopic, EngineException, get_iterable from descriptor_topics import DescriptorTopic @@ -66,7 +66,7 @@ class NsrTopic(BaseTopic): self.db.del_list("vnfrs", {"nsr-id-ref": _id}) # set all used pdus as free self.db.set_list("pdus", {"_admin.usage.nsr_id": _id}, - {"_admin.usageSate": "NOT_IN_USE", "_admin.usage": None}) + {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None}) self._send_msg("deleted", {"_id": _id}) return v @@ -126,13 +126,19 @@ class NsrTopic(BaseTopic): "id": nsr_id, "_id": nsr_id, # "input-parameter": xpath, value, - "ssh-authorized-key": ns_request.get("key-pair-ref"), + "ssh-authorized-key": ns_request.get("key-pair-ref"), # TODO remove } ns_request["nsr_id"] = nsr_id + # Create vld + if nsd.get("vld"): + nsr_descriptor["vld"] = [] + for nsd_vld in nsd.get("vld"): + nsr_descriptor["vld"].append( + {key: nsd_vld[key] for key in ("id", "vim-network-name") if key in nsd_vld}) # Create VNFR needed_vnfds = {} - for member_vnf in nsd["constituent-vnfd"]: + for member_vnf in nsd.get("constituent-vnfd", ()): vnfd_id = member_vnf["vnfd-id-ref"] step = "getting vnfd id='{}' constituent-vnfd='{}' from database".format( member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"]) @@ -160,6 +166,15 @@ class NsrTopic(BaseTopic): "connection-point": [], "ip-address": None, # mgmt-interface filled by LCM } + + # Create vld + if vnfd.get("internal-vld"): + vnfr_descriptor["vld"] = [] + for vnfd_vld in vnfd.get("internal-vld"): + vnfr_descriptor["vld"].append( + {key: vnfd_vld[key] for key in ("id", "vim-network-name") if key in vnfd_vld}) + + vnfd_mgmt_cp = vnfd["mgmt-interface"].get("cp") for cp in vnfd.get("connection-point", ()): vnf_cp = { "name": cp["name"], @@ -169,10 +184,8 @@ class NsrTopic(BaseTopic): # vim-id # TODO it would be nice having a vim port id } vnfr_descriptor["connection-point"].append(vnf_cp) - for vdu in vnfd["vdu"]: - vdur_id = str(uuid4()) + for vdu in vnfd.get("vdu", ()): vdur = { - "id": vdur_id, "vdu-id-ref": vdu["id"], # TODO "name": "" Name of the VDU in the VIM "ip-address": None, # mgmt-interface filled by LCM @@ -180,6 +193,8 @@ class NsrTopic(BaseTopic): "internal-connection-point": [], "interfaces": [], } + if vdu.get("pdu-type"): + vdur["pdu-type"] = vdu["pdu-type"] # TODO volumes: name, volume-id for icp in vdu.get("internal-connection-point", ()): vdu_icp = { @@ -196,8 +211,44 @@ class NsrTopic(BaseTopic): # "ip-address", "mac-address" # filled by LCM # vim-id # TODO it would be nice having a vim port id } + 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 + + # look for network where this interface is connected + if iface.get("external-connection-point-ref"): + for nsd_vld in get_iterable(nsd.get("vld")): + for nsd_vld_cp in get_iterable(nsd_vld.get("vnfd-connection-point-ref")): + if nsd_vld_cp.get("vnfd-connection-point-ref") == \ + iface["external-connection-point-ref"] and \ + nsd_vld_cp.get("member-vnf-index-ref") == member_vnf["member-vnf-index"]: + vdu_iface["ns-vld-id"] = nsd_vld["id"] + break + else: + continue + break + elif iface.get("internal-connection-point-ref"): + for vnfd_ivld in get_iterable(vnfd.get("internal-vld")): + 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"] + break + else: + continue + break + vdur["interfaces"].append(vdu_iface) - vnfr_descriptor["vdur"].append(vdur) + count = vdu.get("count", 1) + if count is None: + count = 1 + count = int(count) # TODO remove when descriptor serialized with payngbind + for index in range(0, count): + if index: + vdur = deepcopy(vdur) + vdur["_id"] = str(uuid4()) + vdur["count-index"] = index + vnfr_descriptor["vdur"].append(vdur) step = "creating vnfr vnfd-id='{}' constituent-vnfd='{}' at database".format( member_vnf["vnfd-id-ref"], member_vnf["member-vnf-index"]) @@ -289,14 +340,62 @@ class NsLcmOpTopic(BaseTopic): raise EngineException("Invalid parameter member_vnf_index='{}' is not one of the " "nsd:constituent-vnfd".format(member_vnf_index)) + def _check_vnf_instantiation_params(in_vnfd, vnfd): + + for in_vdu in get_iterable(in_vnfd.get("vdu")): + for vdu in get_iterable(vnfd.get("vdu")): + if in_vdu["id"] == vdu["id"]: + for volume in get_iterable(in_vdu.get("volume")): + for volumed in get_iterable(vdu.get("volumes")): + if volumed["name"] == volume["name"]: + break + else: + raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:" + "volume:name='{}' is not present at vnfd:vdu:volumes list". + format(in_vnf["member-vnf-index"], in_vdu["id"], + volume["name"])) + for in_iface in get_iterable(in_vdu["interface"]): + for iface in get_iterable(vdu.get("interface")): + if in_iface["name"] == iface["name"]: + break + else: + raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:" + "interface[name='{}'] is not present at vnfd:vdu:interface" + .format(in_vnf["member-vnf-index"], in_vdu["id"], + in_iface["name"])) + break + else: + raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}'] is is not present " + "at vnfd:vdu".format(in_vnf["member-vnf-index"], in_vdu["id"])) + + for in_ivld in get_iterable(in_vnfd.get("internal-vld")): + for ivld in get_iterable(vnfd.get("internal-vld")): + if in_ivld["name"] == ivld["name"] or in_ivld["name"] == ivld["id"]: + for in_icp in get_iterable(in_ivld["internal-connection-point"]): + for icp in ivld["internal-connection-point"]: + if in_icp["id-ref"] == icp["id-ref"]: + break + else: + raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld[name" + "='{}']:internal-connection-point[id-ref:'{}'] is not present at " + "vnfd:internal-vld:name/id:internal-connection-point" + .format(in_vnf["member-vnf-index"], in_ivld["name"], + in_icp["id-ref"], vnfd["id"])) + break + else: + raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'" + " is not present at vnfd '{}'".format(in_vnf["member-vnf-index"], + in_ivld["name"], vnfd["id"])) + def check_valid_vim_account(vim_account): if vim_account in vim_accounts: return try: - # TODO add _get_project_filter - self.db.get_one("vim_accounts", {"_id": vim_account}) + db_filter = self._get_project_filter(session, write=False, show_all=True) + db_filter["_id"] = vim_account + self.db.get_one("vim_accounts", db_filter) except Exception: - raise EngineException("Invalid vimAccountId='{}' not present".format(vim_account)) + raise EngineException("Invalid vimAccountId='{}' not present for the project".format(vim_account)) vim_accounts.append(vim_account) if operation == "action": @@ -341,35 +440,10 @@ class NsLcmOpTopic(BaseTopic): check_valid_vim_account(indata["vimAccountId"]) for in_vnf in get_iterable(indata.get("vnf")): vnfd = check_valid_vnf_member_index(in_vnf["member-vnf-index"]) + _check_vnf_instantiation_params(in_vnf, vnfd) if in_vnf.get("vimAccountId"): check_valid_vim_account(in_vnf["vimAccountId"]) - for in_vdu in get_iterable(in_vnf.get("vdu")): - for vdud in get_iterable(vnfd.get("vdu")): - if vdud["id"] == in_vdu["id"]: - for volume in get_iterable(in_vdu.get("volume")): - for volumed in get_iterable(vdud.get("volumes")): - if volumed["name"] == volume["name"]: - break - else: - raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu[id='{}']:" - "volume:name='{}' is not present at vnfd:vdu:volumes list". - format(in_vnf["member-vnf-index"], in_vdu["id"], - volume["name"])) - break - else: - raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:vdu:id='{}' is not " - "present at vnfd".format(in_vnf["member-vnf-index"], in_vdu["id"])) - for in_internal_vld in get_iterable(in_vnf.get("internal-vld")): - for internal_vldd in get_iterable(vnfd.get("internal-vld")): - if in_internal_vld["name"] == internal_vldd["name"] or \ - in_internal_vld["name"] == internal_vldd["id"]: - break - else: - raise EngineException("Invalid parameter vnf[member-vnf-index='{}']:internal-vld:name='{}'" - " is not present at vnfd '{}'".format(in_vnf["member-vnf-index"], - in_internal_vld["name"], - vnfd["id"])) for in_vld in get_iterable(indata.get("vld")): for vldd in get_iterable(nsd.get("vld")): if in_vld["name"] == vldd["name"] or in_vld["name"] == vldd["id"]: @@ -378,7 +452,164 @@ class NsLcmOpTopic(BaseTopic): raise EngineException("Invalid parameter vld:name='{}' is not present at nsd:vld".format( in_vld["name"])) - def _create_nslcmop(self, session, nsInstanceId, operation, params): + def _look_for_pdu(self, session, rollback, vnfr, vim_account, vnfr_update, vnfr_update_rollback): + """ + Look for a free PDU in the catalog matching vdur type and interfaces. Fills vnfr.vdur with the interface + (ip_address, ...) information. + Modifies PDU _admin.usageState to 'IN_USE' + + :param session: client session information + :param rollback: list with the database modifications to rollback if needed + :param vnfr: vnfr to be updated. It is modified with pdu interface info if pdu is found + :param vim_account: vim_account where this vnfr should be deployed + :param vnfr_update: dictionary filled by this method with changes to be done at database vnfr + :param vnfr_update_rollback: dictionary filled by this method with original content of vnfr in case a rollback + of the changed vnfr is needed + + :return: List of PDU interfaces that are connected to an existing VIM network. Each item contains: + "vim-network-name": used at VIM + "name": interface name + "vnf-vld-id": internal VNFD vld where this interface is connected, or + "ns-vld-id": NSD vld where this interface is connected. + NOTE: One, and only one between 'vnf-vld-id' and 'ns-vld-id' contains a value. The other will be None + """ + + ifaces_forcing_vim_network = [] + for vdur_index, vdur in enumerate(get_iterable(vnfr.get("vdur"))): + if not vdur.get("pdu-type"): + continue + pdu_type = vdur.get("pdu-type") + pdu_filter = self._get_project_filter(session, write=True, show_all=True) + pdu_filter["vim_accounts"] = vim_account + pdu_filter["type"] = pdu_type + pdu_filter["_admin.operationalState"] = "ENABLED" + pdu_filter["_admin.usageState"] = "NOT_IN_USE" + # TODO feature 1417: "shared": True, + + available_pdus = self.db.get_list("pdus", pdu_filter) + for pdu in available_pdus: + # step 1 check if this pdu contains needed interfaces: + match_interfaces = True + for vdur_interface in vdur["interfaces"]: + for pdu_interface in pdu["interfaces"]: + if pdu_interface["name"] == vdur_interface["name"]: + # TODO feature 1417: match per mgmt type + break + else: # no interface found for name + match_interfaces = False + break + if match_interfaces: + break + else: + raise EngineException( + "No PDU of type={} at vim_account={} found for member_vnf_index={}, vdu={} matching interface " + "names".format(pdu_type, vim_account, vnfr["member-vnf-index-ref"], vdur["vdu-id-ref"])) + + # step 2. Update pdu + rollback_pdu = { + "_admin.usageState": pdu["_admin"]["usageState"], + "_admin.usage.vnfr_id": None, + "_admin.usage.nsr_id": None, + "_admin.usage.vdur": None, + } + self.db.set_one("pdus", {"_id": pdu["_id"]}, + {"_admin.usageState": "IN_USE", + "_admin.usage.vnfr_id": vnfr["_id"], + "_admin.usage.nsr_id": vnfr["nsr-id-ref"], + "_admin.usage.vdur": vdur["vdu-id-ref"]} + ) + rollback.append({"topic": "pdus", "_id": pdu["_id"], "operation": "set", "content": rollback_pdu}) + + # step 3. Fill vnfr info by filling vdur + vdu_text = "vdur.{}".format(vdur_index) + vnfr_update_rollback[vdu_text + ".pdu-id"] = None + vnfr_update[vdu_text + ".pdu-id"] = pdu["_id"] + for iface_index, vdur_interface in enumerate(vdur["interfaces"]): + for pdu_interface in pdu["interfaces"]: + if pdu_interface["name"] == vdur_interface["name"]: + iface_text = vdu_text + ".interfaces.{}".format(iface_index) + for k, v in pdu_interface.items(): + if k in ("ip-address", "mac-address"): # TODO: switch-xxxxx must be inserted + vnfr_update[iface_text + ".{}".format(k)] = v + vnfr_update_rollback[iface_text + ".{}".format(k)] = vdur_interface.get(v) + if pdu_interface.get("ip-address"): + if vdur_interface.get("mgmt-interface"): + vnfr_update_rollback[vdu_text + ".ip-address"] = vdur.get("ip-address") + vnfr_update[vdu_text + ".ip-address"] = pdu_interface["ip-address"] + if vdur_interface.get("mgmt-vnf"): + vnfr_update_rollback["ip-address"] = vnfr.get("ip-address") + vnfr_update["ip-address"] = pdu_interface["ip-address"] + if pdu_interface.get("vim-network-name"): # or pdu_interface.get("vim-network-id"): + ifaces_forcing_vim_network.append({ + # "vim-network-id": pdu_interface.get("vim-network-id"), + "vim-network-name": pdu_interface.get("vim-network-name"), + "name": vdur_interface.get("vnf-vld-id") or vdur_interface.get("ns-vld-id"), + "vnf-vld-id": vdur_interface.get("vnf-vld-id"), + "ns-vld-id": vdur_interface.get("ns-vld-id")}) + break + + return ifaces_forcing_vim_network + + def _update_vnfrs(self, session, rollback, nsr, indata): + vnfrs = None + # get vnfr + nsr_id = nsr["_id"] + vnfrs = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) + + for vnfr in vnfrs: + vnfr_update = {} + vnfr_update_rollback = {} + member_vnf_index = vnfr["member-vnf-index-ref"] + # update vim-account-id + + vim_account = indata["vimAccountId"] + # 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") + + vnfr_update["vim-account-id"] = vim_account + vnfr_update_rollback["vim-account-id"] = vnfr.get("vim-account-id") + + # get pdu + ifaces_forcing_vim_network = self._look_for_pdu(session, rollback, vnfr, vim_account, vnfr_update, + vnfr_update_rollback) + + # updata database vnfr + self.db.set_one("vnfrs", {"_id": vnfr["_id"]}, vnfr_update) + rollback.append({"topic": "vnfrs", "_id": vnfr["_id"], "operation": "set", "content": vnfr_update_rollback}) + + # Update indada in case pdu forces to use a concrete vim-network-name + # TODO check if user has already insert a vim-network-name and raises an error + if not ifaces_forcing_vim_network: + continue + for iface_info in ifaces_forcing_vim_network: + if iface_info.get("ns-vld-id"): + if "vld" not in indata: + indata["vld"] = [] + indata["vld"].append({key: iface_info[key] for key in + ("name", "vim-network-name", "vim-network-id") if iface_info.get(key)}) + + elif iface_info.get("vnf-vld-id"): + if "vnf" not in indata: + indata["vnf"] = [] + indata["vnf"].append({ + "member-vnf-index": member_vnf_index, + "internal-vld": [{key: iface_info[key] for key in + ("name", "vim-network-name", "vim-network-id") if iface_info.get(key)}] + }) + + @staticmethod + def _create_nslcmop(nsr_id, operation, params): + """ + Creates a ns-lcm-opp content to be stored at database. + :param nsr_id: internal id of the instance + :param operation: instantiate, terminate, scale, action, ... + :param params: user parameters for the operation + :return: dictionary following SOL005 format + """ now = time() _id = str(uuid4()) nslcmop = { @@ -386,7 +617,7 @@ class NsLcmOpTopic(BaseTopic): "_id": _id, "operationState": "PROCESSING", # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK "statusEnteredTime": now, - "nsInstanceId": nsInstanceId, + "nsInstanceId": nsr_id, "lcmOperationType": operation, "startTime": now, "isAutomaticInvocation": False, @@ -394,7 +625,7 @@ class NsLcmOpTopic(BaseTopic): "isCancelPending": False, "links": { "self": "/osm/nslcm/v1/ns_lcm_op_occs/" + _id, - "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsInstanceId, + "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsr_id, } } return nslcmop @@ -438,7 +669,11 @@ class NsLcmOpTopic(BaseTopic): raise EngineException("ns_instance '{}' cannot be '{}' because it is already instantiated".format( nsInstanceId, operation), HTTPStatus.CONFLICT) self._check_ns_operation(session, nsr, operation, indata) - nslcmop_desc = self._create_nslcmop(session, nsInstanceId, operation, indata) + + if operation == "instantiate": + self._update_vnfrs(session, rollback, nsr, indata) + + nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata) self.format_on_new(nslcmop_desc, session["project_id"], make_public=make_public) _id = self.db.create("nslcmops", nslcmop_desc) rollback.append({"topic": "nslcmops", "_id": _id})