X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=98c9968211c2349811b016187aea4be4c0fee12c;hb=1674de87bdfcd8548910dd379a486749daf29f5c;hp=1aaf2c56dfa91fac22e71adf89a0c66c384f8965;hpb=0f414de1e2b693b26e5c491bee4b251aed760ce5;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 1aaf2c5..98c9968 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -22,13 +22,14 @@ import logging import logging.handlers import functools import traceback +from jinja2 import Environment, Template, meta, TemplateError, TemplateNotFound, TemplateSyntaxError import ROclient from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase from osm_common.dbbase import DbException from osm_common.fsbase import FsException -from n2vc.vnf import N2VC +from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed from copy import copy, deepcopy from http import HTTPStatus @@ -68,8 +69,9 @@ def populate_dict(target_dict, key_list, value): class NsLcm(LcmBase): timeout_vca_on_error = 5 * 60 # Time for charm from first time at blocked,error status to mark as failed - total_deploy_timeout = 2 * 3600 # global timeout for deployment - timeout_charm_delete = 10 * 60 + total_deploy_timeout = 30 * 60 # global timeout for deployment + timeout_charm_delete = 5 * 60 + timeout_primitive = 5 * 60 # timeout for primitive execution def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop): """ @@ -99,46 +101,61 @@ class NsLcm(LcmBase): artifacts=None, ) - def vnfd2RO(self, vnfd, new_id=None): + def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None): """ Converts creates a new vnfd descriptor for RO base on input OSM IM vnfd :param vnfd: input vnfd :param new_id: overrides vnf id if provided + :param additionalParams: Instantiation params for VNFs provided + :param nsrId: Id of the NSR :return: copy of vnfd """ - ci_file = None try: vnfd_RO = deepcopy(vnfd) + # remove unused by RO configuration, monitoring, scaling and internal keys vnfd_RO.pop("_id", None) vnfd_RO.pop("_admin", None) + vnfd_RO.pop("vnf-configuration", None) + vnfd_RO.pop("monitoring-param", None) + vnfd_RO.pop("scaling-group-descriptor", None) if new_id: vnfd_RO["id"] = new_id - for vdu in vnfd_RO.get("vdu", ()): - if "cloud-init-file" in vdu: + + # parse cloud-init or cloud-init-file with the provided variables using Jinja2 + for vdu in get_iterable(vnfd_RO, "vdu"): + cloud_init_file = None + if vdu.get("cloud-init-file"): base_folder = vnfd["_admin"]["storage"] - clout_init_file = "{}/{}/cloud_init/{}".format( - base_folder["folder"], - base_folder["pkg-dir"], - vdu["cloud-init-file"] - ) - ci_file = self.fs.file_open(clout_init_file, "r") - # TODO: detect if binary or text. Propose to read as binary and try to decode to utf8. If fails - # convert to base 64 or similar - clout_init_content = ci_file.read() - ci_file.close() - ci_file = None + cloud_init_file = "{}/{}/cloud_init/{}".format(base_folder["folder"], base_folder["pkg-dir"], + vdu["cloud-init-file"]) + with self.fs.file_open(cloud_init_file, "r") as ci_file: + cloud_init_content = ci_file.read() vdu.pop("cloud-init-file", None) - vdu["cloud-init"] = clout_init_content - # remnove unused by RO configuration, monitoring, scaling - vnfd_RO.pop("vnf-configuration", None) - vnfd_RO.pop("monitoring-param", None) - vnfd_RO.pop("scaling-group-descriptor", None) + elif vdu.get("cloud-init"): + cloud_init_content = vdu["cloud-init"] + else: + continue + + env = Environment() + ast = env.parse(cloud_init_content) + mandatory_vars = meta.find_undeclared_variables(ast) + if mandatory_vars: + for var in mandatory_vars: + if not additionalParams or var not in additionalParams.keys(): + raise LcmException("Variable '{}' defined at vnfd[id={}]:vdu[id={}]:cloud-init/cloud-init-" + "file, must be provided in the instantiation parameters inside the " + "'additionalParamsForVnf' block".format(var, vnfd["id"], vdu["id"])) + template = Template(cloud_init_content) + cloud_init_content = template.render(additionalParams or {}) + vdu["cloud-init"] = cloud_init_content + return vnfd_RO except FsException as e: - raise LcmException("Error reading file at vnfd {}: {} ".format(vnfd["_id"], e)) - finally: - if ci_file: - ci_file.close() + raise LcmException("Error reading vnfd[id={}]:vdu[id={}]:cloud-init-file={}: {}". + format(vnfd["id"], vdu["id"], cloud_init_file, e)) + except (TemplateError, TemplateNotFound, TemplateSyntaxError) as e: + raise LcmException("Error parsing Jinja2 to cloud-init content at vnfd[id={}]:vdu[id={}]: {}". + format(vnfd["id"], vdu["id"], e)) def n2vc_callback(self, model_name, application_name, status, message, n2vc_info, task=None): """ @@ -225,6 +242,7 @@ class NsLcm(LcmBase): :return: The RO ns descriptor """ vim_2_RO = {} + wim_2_RO = {} # TODO feature 1417: Check that no instantiation is set over PDU # check if PDU forces a concrete vim-network-id and add it # check if PDU contains a SDN-assist info (dpid, switch, port) and pass it to RO @@ -241,6 +259,21 @@ class NsLcm(LcmBase): vim_2_RO[vim_account] = RO_vim_id return RO_vim_id + def wim_account_2_RO(wim_account): + if isinstance(wim_account, str): + if wim_account in wim_2_RO: + return wim_2_RO[wim_account] + + db_wim = self.db.get_one("wim_accounts", {"_id": wim_account}) + if db_wim["_admin"]["operationalState"] != "ENABLED": + raise LcmException("WIM={} is not available. operationalState={}".format( + wim_account, db_wim["_admin"]["operationalState"])) + RO_wim_id = db_wim["_admin"]["deployed"]["RO-account"] + wim_2_RO[wim_account] = RO_wim_id + return RO_wim_id + else: + return wim_account + def ip_profile_2_RO(ip_profile): RO_ip_profile = deepcopy((ip_profile)) if "dns-server" in RO_ip_profile: @@ -264,6 +297,7 @@ class NsLcm(LcmBase): # "name": ns_params["nsName"], # "description": ns_params.get("nsDescription"), "datacenter": vim_account_2_RO(ns_params["vimAccountId"]), + "wim_account": wim_account_2_RO(ns_params.get("wimAccountId")), # "scenario": ns_params["nsdId"], } if n2vc_key_list: @@ -385,6 +419,10 @@ class NsLcm(LcmBase): if "ip-profile" in vld_params: populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"), ip_profile_2_RO(vld_params["ip-profile"])) + + if "wimAccountId" in vld_params and vld_params["wimAccountId"] is not None: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "wim_account"), + wim_account_2_RO(vld_params["wimAccountId"])), if vld_params.get("vim-network-name"): RO_vld_sites = [] if isinstance(vld_params["vim-network-name"], dict): @@ -522,7 +560,7 @@ class NsLcm(LcmBase): continue vnfr_update = {} if vnf_RO.get("ip_address"): - db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"] + db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"].split(";")[0] elif not db_vnfr.get("ip-address"): raise LcmExceptionNoMgmtIP("ns member_vnf_index '{}' has no IP address".format(vnf_index)) @@ -537,7 +575,8 @@ class NsLcm(LcmBase): vdur_RO_count_index += 1 continue vdur["vim-id"] = vdur_RO.get("vim_vm_id") - vdur["ip-address"] = vdur_RO.get("ip_address") + if vdur_RO.get("ip_address"): + vdur["ip-address"] = vdur_RO["ip_address"].split(";")[0] vdur["vdu-id-ref"] = vdur_RO.get("vdu_osm_id") vdur["name"] = vdur_RO.get("vim_name") vdur["status"] = vdur_RO.get("status") @@ -589,7 +628,7 @@ class NsLcm(LcmBase): nslcmop_operation_state = None db_vnfrs = {} RO_descriptor_number = 0 # number of descriptors created at RO - descriptor_id_2_RO = {} # map between vnfd/nsd id to the id used at RO + vnf_index_2_RO_id = {} # map between vnfd/nsd id to the id used at RO n2vc_info = {} exc = None try: @@ -640,6 +679,10 @@ class NsLcm(LcmBase): db_nsr_update["detailed-status"] = "creating" db_nsr_update["operational-status"] = "init" + if not db_nsr["_admin"].get("deployed") or not db_nsr["_admin"]["deployed"].get("RO") or \ + not db_nsr["_admin"]["deployed"]["RO"].get("vnfd"): + populate_dict(db_nsr, ("_admin", "deployed", "RO", "vnfd"), []) + db_nsr_update["_admin.deployed.RO.vnfd"] = [] RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -648,26 +691,41 @@ class NsLcm(LcmBase): self.update_db_2("nsrs", nsr_id, db_nsr_update) # get vnfds, instantiate at RO - for vnfd_id, vnfd in db_vnfds.items(): + for c_vnf in nsd.get("constituent-vnfd", ()): + member_vnf_index = c_vnf["member-vnf-index"] + vnfd = db_vnfds_ref[c_vnf['vnfd-id-ref']] vnfd_ref = vnfd["id"] - step = db_nsr_update["detailed-status"] = "Creating vnfd={} at RO".format(vnfd_ref) + step = db_nsr_update["detailed-status"] = "Creating vnfd='{}' member-vnf-index='{}' at RO".format( + vnfd_ref, member_vnf_index) # self.logger.debug(logging_text + step) - vnfd_id_RO = "{}.{}.{}".format(nsr_id, RO_descriptor_number, vnfd_ref[:23]) - descriptor_id_2_RO[vnfd_ref] = vnfd_id_RO + vnfd_id_RO = "{}.{}.{}".format(nsr_id, RO_descriptor_number, member_vnf_index[:23]) + vnf_index_2_RO_id[member_vnf_index] = vnfd_id_RO RO_descriptor_number += 1 + # look position at deployed.RO.vnfd if not present it will be appended at the end + for index, vnf_deployed in enumerate(db_nsr["_admin"]["deployed"]["RO"]["vnfd"]): + if vnf_deployed["member-vnf-index"] == member_vnf_index: + break + else: + index = len(db_nsr["_admin"]["deployed"]["RO"]["vnfd"]) + db_nsr["_admin"]["deployed"]["RO"]["vnfd"].append(None) + # look if present + RO_update = {"member-vnf-index": member_vnf_index} vnfd_list = await RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO}) if vnfd_list: - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnfd_id)] = vnfd_list[0]["uuid"] - self.logger.debug(logging_text + "vnfd={} exists at RO. Using RO_id={}".format( - vnfd_ref, vnfd_list[0]["uuid"])) + RO_update["id"] = vnfd_list[0]["uuid"] + self.logger.debug(logging_text + "vnfd='{}' member-vnf-index='{}' exists at RO. Using RO_id={}". + format(vnfd_ref, member_vnf_index, vnfd_list[0]["uuid"])) else: - vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO) + vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO, db_vnfrs[c_vnf["member-vnf-index"]]. + get("additionalParamsForVnf"), nsr_id) desc = await RO.create("vnfd", descriptor=vnfd_RO) - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnfd_id)] = desc["uuid"] - self.logger.debug(logging_text + "vnfd={} created at RO. RO_id={}".format( - vnfd_ref, desc["uuid"])) + RO_update["id"] = desc["uuid"] + self.logger.debug(logging_text + "vnfd='{}' member-vnf-index='{}' created at RO. RO_id={}".format( + vnfd_ref, member_vnf_index, desc["uuid"])) + db_nsr_update["_admin.deployed.RO.vnfd.{}".format(index)] = RO_update + db_nsr["_admin"]["deployed"]["RO"]["vnfd"][index] = RO_update self.update_db_2("nsrs", nsr_id, db_nsr_update) # create nsd at RO @@ -676,7 +734,6 @@ class NsLcm(LcmBase): # self.logger.debug(logging_text + step) RO_osm_nsd_id = "{}.{}.{}".format(nsr_id, RO_descriptor_number, nsd_ref[:23]) - descriptor_id_2_RO[nsd_ref] = RO_osm_nsd_id RO_descriptor_number += 1 nsd_list = await RO.get_list("nsd", filter_by={"osm_id": RO_osm_nsd_id}) if nsd_list: @@ -689,8 +746,13 @@ class NsLcm(LcmBase): nsd_RO.pop("_id", None) nsd_RO.pop("_admin", None) for c_vnf in nsd_RO.get("constituent-vnfd", ()): - vnfd_id = c_vnf["vnfd-id-ref"] - c_vnf["vnfd-id-ref"] = descriptor_id_2_RO[vnfd_id] + member_vnf_index = c_vnf["member-vnf-index"] + c_vnf["vnfd-id-ref"] = vnf_index_2_RO_id[member_vnf_index] + for c_vld in nsd_RO.get("vld", ()): + for cp in c_vld.get("vnfd-connection-point-ref", ()): + member_vnf_index = cp["member-vnf-index-ref"] + cp["vnfd-id-ref"] = vnf_index_2_RO_id[member_vnf_index] + desc = await RO.create("nsd", descriptor=nsd_RO) db_nsr_update["_admin.nsState"] = "INSTANTIATED" db_nsr_update["_admin.deployed.RO.nsd_id"] = RO_nsd_uuid = desc["uuid"] @@ -761,7 +823,7 @@ class NsLcm(LcmBase): while time() <= start_deploy + self.total_deploy_timeout: desc = await RO.show("ns", RO_nsr_id) ns_status, ns_status_info = RO.check_ns_status(desc) - db_nsr_update["admin.deployed.RO.nsr_status"] = ns_status + db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status if ns_status == "ERROR": raise ROclient.ROClientException(ns_status_info) elif ns_status == "BUILD": @@ -791,12 +853,11 @@ class NsLcm(LcmBase): # The parameters we'll need to deploy a charm number_to_configure = 0 - def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, mgmt_ip_address, n2vc_info, - config_primitive=None): + def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, charm_params, n2vc_info): """An inner function to deploy the charm from either vnf or vdu vnf_index is mandatory. vdu_id can be None for a vnf configuration or the id for vdu configuration """ - if not mgmt_ip_address: + if not charm_params["rw_mgmt_ip"]: raise LcmException("vnfd/vdu has not management ip address to configure it") # Login to the VCA. # if number_to_configure == 0: @@ -818,11 +879,6 @@ class NsLcm(LcmBase): proxy_charm ) - # Setup the runtime parameters for this VNF - params = {'rw_mgmt_ip': mgmt_ip_address} - if config_primitive: - params["initial-config-primitive"] = config_primitive - # ns_name will be ignored in the current version of N2VC # but will be implemented for the next point release. model_name = "default" # TODO bug 585 nsr_id @@ -867,10 +923,10 @@ class NsLcm(LcmBase): application_name, # The application name vnfd, # The vnf descriptor charm_path, # Path to charm - params, # Runtime params, like mgmt ip + charm_params, # Runtime params, like mgmt ip {}, # for native charms only self.n2vc_callback, # Callback for status changes - n2vc_info, # Callback parameter + n2vc_info, # Callback parameter None, # Callback parameter (task) ) ) @@ -886,37 +942,42 @@ class NsLcm(LcmBase): vnf_index = str(c_vnf["member-vnf-index"]) vnfd = db_vnfds_ref[vnfd_id] + # Get additional parameters + vnfr_params = {} + if db_vnfrs[vnf_index].get("additionalParamsForVnf"): + vnfr_params = db_vnfrs[vnf_index]["additionalParamsForVnf"].copy() + for k, v in vnfr_params.items(): + if isinstance(v, str) and v.startswith("!!yaml "): + vnfr_params[k] = yaml.safe_load(v[7:]) + # Check if this VNF has a charm configuration vnf_config = vnfd.get("vnf-configuration") - if vnf_config and vnf_config.get("juju"): proxy_charm = vnf_config["juju"]["charm"] - config_primitive = None if proxy_charm: - if 'initial-config-primitive' in vnf_config: - config_primitive = vnf_config['initial-config-primitive'] + step = "connecting to N2VC to configure vnf {}".format(vnf_index) + vnfr_params["rw_mgmt_ip"] = db_vnfrs[vnf_index]["ip-address"] + charm_params = { + "user_values": vnfr_params, + "rw_mgmt_ip": db_vnfrs[vnf_index]["ip-address"], + "initial-config-primitive": vnf_config.get('initial-config-primitive') or {} + } # Login to the VCA. If there are multiple calls to login(), # subsequent calls will be a nop and return immediately. - step = "connecting to N2VC to configure vnf {}".format(vnf_index) await self.n2vc.login() - deploy_charm(vnf_index, None, None, None, db_vnfrs[vnf_index]["ip-address"], n2vc_info, - config_primitive) + deploy_charm(vnf_index, None, None, None, charm_params, n2vc_info) number_to_configure += 1 # Deploy charms for each VDU that supports one. for vdu_index, vdu in enumerate(get_iterable(vnfd, 'vdu')): vdu_config = vdu.get('vdu-configuration') proxy_charm = None - config_primitive = None if vdu_config and vdu_config.get("juju"): proxy_charm = vdu_config["juju"]["charm"] - if 'initial-config-primitive' in vdu_config: - config_primitive = vdu_config['initial-config-primitive'] - if proxy_charm: step = "connecting to N2VC to configure vdu {} from vnf {}".format(vdu["id"], vnf_index) await self.n2vc.login() @@ -925,8 +986,14 @@ class NsLcm(LcmBase): if vdur["vdu-id-ref"] != vdu["id"]: raise LcmException("Mismatch vdur {}, vdu {} at index {} for vnf {}" .format(vdur["vdu-id-ref"], vdu["id"], vdu_index, vnf_index)) + vnfr_params["rw_mgmt_ip"] = vdur["ip-address"] + charm_params = { + "user_values": vnfr_params, + "rw_mgmt_ip": vdur["ip-address"], + "initial-config-primitive": vdu_config.get('initial-config-primitive') or {} + } deploy_charm(vnf_index, vdu["id"], vdur.get("name"), vdur["count-index"], - vdur["ip-address"], n2vc_info, config_primitive) + charm_params, n2vc_info) number_to_configure += 1 db_nsr_update["operational-status"] = "running" @@ -943,7 +1010,7 @@ class NsLcm(LcmBase): self.update_db_2("nsrs", nsr_id, db_nsr_update) if db_nslcmop_update: self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - # TODO add a fake tast that set n2vc_event after some time + # TODO add a fake task that set n2vc_event after some time await n2vc_info["n2vc_event"].wait() n2vc_info["n2vc_event"].clear() all_active = True @@ -1041,7 +1108,8 @@ class NsLcm(LcmBase): if nslcmop_operation_state: try: await self.msg.aiowrite("ns", "instantiated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, - "operationState": nslcmop_operation_state}) + "operationState": nslcmop_operation_state}, + loop=self.loop) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) @@ -1087,6 +1155,7 @@ class NsLcm(LcmBase): db_nsr_update = {"_admin.nslcmop": nslcmop_id} db_nslcmop_update = {} nslcmop_operation_state = None + autoremove = False # autoremove after terminated try: step = "Getting nslcmop={} from db".format(nslcmop_id) db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) @@ -1213,19 +1282,21 @@ class NsLcm(LcmBase): self.logger.error(logging_text + failed_detail[-1]) RO_fail = True - if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("vnfd_id"): - for vnf_id, RO_vnfd_id in nsr_deployed["RO"]["vnfd_id"].items(): - if not RO_vnfd_id: + if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("vnfd"): + for index, vnf_deployed in enumerate(nsr_deployed["RO"]["vnfd"]): + if not vnf_deployed or not vnf_deployed["id"]: continue try: + RO_vnfd_id = vnf_deployed["id"] step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ - "Deleting vnfd={} at RO".format(vnf_id) + "Deleting member-vnf-index={} RO_vnfd_id={} from RO".format( + vnf_deployed["member-vnf-index"], RO_vnfd_id) await RO.delete("vnfd", RO_vnfd_id) self.logger.debug(logging_text + "RO_vnfd_id={} deleted".format(RO_vnfd_id)) - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnf_id)] = None + db_nsr_update["_admin.deployed.RO.vnfd.{}.id".format(index)] = None except ROclient.ROClientException as e: if e.http_code == 404: # not found - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnf_id)] = None + db_nsr_update["_admin.deployed.RO.vnfd.{}.id".format(index)] = None self.logger.debug(logging_text + "RO_vnfd_id={} already deleted ".format(RO_vnfd_id)) elif e.http_code == 409: # conflict failed_detail.append("RO_vnfd_id={} delete conflict: {}".format(RO_vnfd_id, e)) @@ -1259,18 +1330,6 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "; ".join(failed_detail) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() - elif db_nslcmop["operationParams"].get("autoremove"): - self.db.del_one("nsrs", {"_id": nsr_id}) - db_nsr = None - db_nsr_update.clear() - self.db.del_list("nslcmops", {"nsInstanceId": nsr_id}) - db_nslcmop = None - nslcmop_operation_state = "COMPLETED" - db_nslcmop_update.clear() - self.db.del_list("vnfrs", {"nsr-id-ref": nsr_id}) - self.db.set_list("pdus", {"_admin.usage.nsr_id": nsr_id}, - {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None}) - self.logger.debug(logging_text + "Delete from database") else: db_nsr_update["operational-status"] = "terminated" db_nsr_update["detailed-status"] = "Done" @@ -1278,6 +1337,8 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "Done" db_nslcmop_update["operationState"] = nslcmop_operation_state = "COMPLETED" db_nslcmop_update["statusEnteredTime"] = time() + if db_nslcmop["operationParams"].get("autoremove"): + autoremove = True except (ROclient.ROClientException, DbException) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) @@ -1304,71 +1365,104 @@ class NsLcm(LcmBase): if nslcmop_operation_state: try: await self.msg.aiowrite("ns", "terminated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, - "operationState": nslcmop_operation_state}) + "operationState": nslcmop_operation_state, + "autoremove": autoremove}, + loop=self.loop) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) self.logger.debug(logging_text + "Exit") self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_terminate") - async def _ns_execute_primitive(self, db_deployed, nsr_name, member_vnf_index, vdu_id, vdu_name, vdu_count_index, - primitive, primitive_params): + @staticmethod + def _map_primitive_params(primitive_desc, params, instantiation_params): + """ + Generates the params to be provided to charm before executing primitive. If user does not provide a parameter, + The default-value is used. If it is between < > it look for a value at instantiation_params + :param primitive_desc: portion of VNFD/NSD that describes primitive + :param params: Params provided by user + :param instantiation_params: Instantiation params provided by user + :return: a dictionary with the calculated params + """ + calculated_params = {} + for parameter in primitive_desc.get("parameter", ()): + param_name = parameter["name"] + if param_name in params: + calculated_params[param_name] = params[param_name] + elif "default-value" in parameter: + calculated_params[param_name] = parameter["default-value"] + if isinstance(parameter["default-value"], str) and parameter["default-value"].startswith("<") and \ + parameter["default-value"].endswith(">"): + if parameter["default-value"][1:-1] in instantiation_params: + calculated_params[param_name] = instantiation_params[parameter["default-value"][1:-1]] + else: + raise LcmException("Parameter {} needed to execute primitive {} not provided". + format(parameter["default-value"], primitive_desc["name"])) + else: + raise LcmException("Parameter {} needed to execute primitive {} not provided". + format(param_name, primitive_desc["name"])) - for vca_deployed in db_deployed["VCA"]: - if not vca_deployed: - continue - if member_vnf_index != vca_deployed["member-vnf-index"] or vdu_id != vca_deployed["vdu_id"]: - continue - if vdu_name and vdu_name != vca_deployed["vdu_name"]: - continue - if vdu_count_index and vdu_count_index != vca_deployed["vdu_count_index"]: - continue - break - else: - raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} is not deployed" - .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index)) - model_name = vca_deployed.get("model") - application_name = vca_deployed.get("application") - if not model_name or not application_name: - raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} has not model " - "or application name" .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index)) - if vca_deployed["operational-status"] != "active": - raise LcmException("charm for member_vnf_index={} vdu_id={} operational_status={} not 'active'".format( - member_vnf_index, vdu_id, vca_deployed["operational-status"])) - callback = None # self.n2vc_callback - callback_args = () # [db_nsr, db_nslcmop, member_vnf_index, None] - await self.n2vc.login() - task = asyncio.ensure_future( - self.n2vc.ExecutePrimitive( + if isinstance(calculated_params[param_name], (dict, list, tuple)): + calculated_params[param_name] = yaml.safe_dump(calculated_params[param_name], default_flow_style=True, + width=256) + elif isinstance(calculated_params[param_name], str) and calculated_params[param_name].startswith("!!yaml "): + calculated_params[param_name] = calculated_params[param_name][7:] + return calculated_params + + async def _ns_execute_primitive(self, db_deployed, member_vnf_index, vdu_id, vdu_name, vdu_count_index, + primitive, primitive_params): + start_primitive_time = time() + try: + for vca_deployed in db_deployed["VCA"]: + if not vca_deployed: + continue + if member_vnf_index != vca_deployed["member-vnf-index"] or vdu_id != vca_deployed["vdu_id"]: + continue + if vdu_name and vdu_name != vca_deployed["vdu_name"]: + continue + if vdu_count_index and vdu_count_index != vca_deployed["vdu_count_index"]: + continue + break + else: + raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} is not " + "deployed".format(member_vnf_index, vdu_id, vdu_name, vdu_count_index)) + model_name = vca_deployed.get("model") + application_name = vca_deployed.get("application") + if not model_name or not application_name: + raise LcmException("charm for member_vnf_index={} vdu_id={} vdu_name={} vdu_count_index={} has not " + "model or application name" .format(member_vnf_index, vdu_id, vdu_name, + vdu_count_index)) + if vca_deployed["operational-status"] != "active": + raise LcmException("charm for member_vnf_index={} vdu_id={} operational_status={} not 'active'".format( + member_vnf_index, vdu_id, vca_deployed["operational-status"])) + callback = None # self.n2vc_callback + callback_args = () # [db_nsr, db_nslcmop, member_vnf_index, None] + await self.n2vc.login() + primitive_id = await self.n2vc.ExecutePrimitive( model_name, application_name, - primitive, callback, + primitive, + callback, *callback_args, **primitive_params ) - ) - # task.add_done_callback(functools.partial(self.n2vc_callback, model_name, application_name, None, - # db_nsr, db_nslcmop, member_vnf_index)) - # self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "action:" + primitive, task) - # wait until completed with timeout - await asyncio.wait((task,), timeout=600) - - result = "FAILED" # by default - result_detail = "" - if task.cancelled(): - result_detail = "Task has been cancelled" - elif task.done(): - exc = task.exception() - if exc: - result_detail = str(exc) + while time() - start_primitive_time < self.timeout_primitive: + primitive_result_ = await self.n2vc.GetPrimitiveStatus(model_name, primitive_id) + if primitive_result_ == "running": + pass + elif primitive_result_ in ("completed", "failed"): + primitive_result = "COMPLETED" if primitive_result_ == "completed" else "FAILED" + detailed_result = await self.n2vc.GetPrimitiveOutput(model_name, primitive_id) + break + else: + detailed_result = "Invalid N2VC.GetPrimitiveStatus = {} obtained".format(primitive_result_) + primitive_result = "FAILED" + break + await asyncio.sleep(5) else: - # TODO revise with Adam if action is finished and ok when task is done or callback is needed - result = "COMPLETED" - result_detail = "Done" - else: # timeout - # TODO Should it be cancelled?!! - task.cancel() - result_detail = "timeout" - return result, result_detail + raise LcmException("timeout after {} seconds".format(self.timeout_primitive)) + return primitive_result, detailed_result + except (N2VCPrimitiveExecutionFailed, LcmException) as e: + return "FAILED", str(e) async def action(self, nsr_id, nslcmop_id): logging_text = "Task ns={} action={} ".format(nsr_id, nslcmop_id) @@ -1384,13 +1478,18 @@ class NsLcm(LcmBase): step = "Getting information from database" db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) + nsr_deployed = db_nsr["_admin"].get("deployed") - nsr_name = db_nsr["name"] vnf_index = db_nslcmop["operationParams"]["member_vnf_index"] vdu_id = db_nslcmop["operationParams"].get("vdu_id") vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index") vdu_name = db_nslcmop["operationParams"].get("vdu_name") + step = "Getting vnfr from database" + db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id}) + step = "Getting vnfd from database" + db_vnfd = self.db.get_one("vnfds", {"_id": db_vnfr["vnfd-id"]}) + # look if previous tasks in process task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id) if task_dependency: @@ -1408,12 +1507,34 @@ class NsLcm(LcmBase): db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"] self.update_db_2("nsrs", nsr_id, db_nsr_update) - # TODO check if ns is in a proper status primitive = db_nslcmop["operationParams"]["primitive"] primitive_params = db_nslcmop["operationParams"]["primitive_params"] - result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index, vdu_id, - vdu_name, vdu_count_index, primitive, - primitive_params) + + # look for primitive + config_primitive_desc = None + if vdu_id: + for vdu in get_iterable(db_vnfd, "vdu"): + if vdu_id == vdu["id"]: + for config_primitive in vdu.get("vdu-configuration", {}).get("config-primitive", ()): + if config_primitive["name"] == primitive: + config_primitive_desc = config_primitive + break + for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): + if config_primitive["name"] == primitive: + config_primitive_desc = config_primitive + break + if not config_primitive_desc: + raise LcmException("Primitive {} not found at vnf-configuration:config-primitive or vdu:" + "vdu-configuration:config-primitive".format(primitive)) + + vnfr_params = {} + if db_vnfr.get("additionalParamsForVnf"): + vnfr_params.update(db_vnfr["additionalParamsForVnf"]) + + # TODO check if ns is in a proper status + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, vdu_id, vdu_name, vdu_count_index, primitive, + self._map_primitive_params(config_primitive_desc, primitive_params, vnfr_params)) db_nslcmop_update["detailed-status"] = result_detail db_nslcmop_update["operationState"] = nslcmop_operation_state = result db_nslcmop_update["statusEnteredTime"] = time() @@ -1446,7 +1567,8 @@ class NsLcm(LcmBase): if nslcmop_operation_state: try: await self.msg.aiowrite("ns", "actioned", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, - "operationState": nslcmop_operation_state}) + "operationState": nslcmop_operation_state}, + loop=self.loop) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) self.logger.debug(logging_text + "Exit") @@ -1472,7 +1594,7 @@ class NsLcm(LcmBase): db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) step = "Getting nsr from database" db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) - nsr_name = db_nsr["name"] + old_operational_status = db_nsr["operational-status"] old_config_status = db_nsr["config-status"] @@ -1595,27 +1717,26 @@ class NsLcm(LcmBase): vnf_config_primitive = scaling_config_action["vnf-config-primitive-name-ref"] step = db_nslcmop_update["detailed-status"] = \ "executing pre-scale scaling-config-action '{}'".format(vnf_config_primitive) + # look for primitive - primitive_params = {} for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): if config_primitive["name"] == vnf_config_primitive: - for parameter in config_primitive.get("parameter", ()): - if 'default-value' in parameter and \ - parameter['default-value'] == "": - primitive_params[parameter["name"]] = yaml.safe_dump(vdu_scaling_info, - default_flow_style=True, - width=256) break else: raise LcmException( "Invalid vnfd descriptor at scaling-group-descriptor[name='{}']:scaling-config-action" - "[vnf-config-primitive-name-ref='{}'] does not match any vnf-cnfiguration:config-" + "[vnf-config-primitive-name-ref='{}'] does not match any vnf-configuration:config-" "primitive".format(scaling_group, config_primitive)) + + vnfr_params = {"": vdu_scaling_info} + if db_vnfr.get("additionalParamsForVnf"): + vnfr_params.update(db_vnfr["additionalParamsForVnf"]) + scale_process = "VCA" db_nsr_update["config-status"] = "configuring pre-scaling" - result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index, - None, None, None, vnf_config_primitive, - primitive_params) + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, + self._map_primitive_params(config_primitive, {}, vnfr_params)) self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( vnf_config_primitive, result, result_detail)) if result == "FAILED": @@ -1716,16 +1837,14 @@ class NsLcm(LcmBase): vnf_config_primitive = scaling_config_action["vnf-config-primitive-name-ref"] step = db_nslcmop_update["detailed-status"] = \ "executing post-scale scaling-config-action '{}'".format(vnf_config_primitive) + + vnfr_params = {"": vdu_scaling_info} + if db_vnfr.get("additionalParamsForVnf"): + vnfr_params.update(db_vnfr["additionalParamsForVnf"]) + # look for primitive - primitive_params = {} for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): if config_primitive["name"] == vnf_config_primitive: - for parameter in config_primitive.get("parameter", ()): - if 'default-value' in parameter and \ - parameter['default-value'] == "": - primitive_params[parameter["name"]] = yaml.safe_dump(vdu_scaling_info, - default_flow_style=True, - width=256) break else: raise LcmException("Invalid vnfd descriptor at scaling-group-descriptor[name='{}']:" @@ -1735,9 +1854,9 @@ class NsLcm(LcmBase): scale_process = "VCA" db_nsr_update["config-status"] = "configuring post-scaling" - result, result_detail = await self._ns_execute_primitive(nsr_deployed, nsr_name, vnf_index, - None, None, None, vnf_config_primitive, - primitive_params) + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, + self._map_primitive_params(config_primitive, {}, vnfr_params)) self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( vnf_config_primitive, result, result_detail)) if result == "FAILED": @@ -1790,7 +1909,8 @@ class NsLcm(LcmBase): if nslcmop_operation_state: try: await self.msg.aiowrite("ns", "scaled", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, - "operationState": nslcmop_operation_state}) + "operationState": nslcmop_operation_state}, + loop=self.loop) # if cooldown_time: # await asyncio.sleep(cooldown_time) # await self.msg.aiowrite("ns","scaled-cooldown-time", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id})