X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=98c9968211c2349811b016187aea4be4c0fee12c;hb=1674de87bdfcd8548910dd379a486749daf29f5c;hp=d54187dce5d0e9319c84332d8bcac1cdf321f7ae;hpb=25ec7730065edeb0a8ade17a426fc9d6b21e6c30;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index d54187d..98c9968 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -1,29 +1,77 @@ -#!/usr/bin/python3 # -*- coding: utf-8 -*- +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + import asyncio import yaml 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, LcmBase +from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase -from osm_common.dbbase import DbException, deep_update +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 deepcopy +from copy import copy, deepcopy from http import HTTPStatus from time import time - +from uuid import uuid4 __author__ = "Alfonso Tierno" +def get_iterable(in_dict, in_key): + """ + Similar to .get(), but if value is None, False, ..., An empty tuple is returned instead + :param in_dict: a dictionary + :param in_key: the key to look for at in_dict + :return: in_dict[in_var] or () if it is None or not present + """ + if not in_dict.get(in_key): + return () + return in_dict[in_key] + + +def populate_dict(target_dict, key_list, value): + """ + Upate target_dict creating nested dictionaries with the key_list. Last key_list item is asigned the value. + Example target_dict={K: J}; key_list=[a,b,c]; target_dict will be {K: J, a: {b: {c: value}}} + :param target_dict: dictionary to be changed + :param key_list: list of keys to insert at target_dict + :param value: + :return: None + """ + for key in key_list[0:-1]: + if key not in target_dict: + target_dict[key] = {} + target_dict = target_dict[key] + target_dict[key_list[-1]] = 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 = 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): """ @@ -53,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["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): """ @@ -109,7 +172,7 @@ class NsLcm(LcmBase): - removing, - removed :param message: detailed message error - :param n2vc_info dictionary with information shared with instantiate task. Contains: + :param n2vc_info: dictionary with information shared with instantiate task. It contains: nsr_id: nslcmop_id: lcmOperationType: currently "instantiate" @@ -128,39 +191,42 @@ class NsLcm(LcmBase): n2vc_event = n2vc_info["n2vc_event"] logging_text = "Task ns={} {}={} [n2vc_callback] application={}".format(nsr_id, ns_operation, nslcmop_id, application_name) - vca_deployed = deployed.get(application_name) - if not vca_deployed: + for vca_index, vca_deployed in enumerate(deployed): + if not vca_deployed: + continue + if model_name == vca_deployed["model"] and application_name == vca_deployed["application"]: + break + else: self.logger.error(logging_text + " Not present at nsr._admin.deployed.VCA") return - if task: if task.cancelled(): self.logger.debug(logging_text + " task Cancelled") vca_deployed['operational-status'] = "error" - db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = "error" + db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = "error" vca_deployed['detailed-status'] = "Task Cancelled" - db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = "Task Cancelled" + db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = "Task Cancelled" elif task.done(): exc = task.exception() if exc: self.logger.error(logging_text + " task Exception={}".format(exc)) vca_deployed['operational-status'] = "error" - db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = "error" + db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = "error" vca_deployed['detailed-status'] = str(exc) - db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = str(exc) + db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = str(exc) else: self.logger.debug(logging_text + " task Done") # task is Done, but callback is still ongoing. So ignore return elif status: - self.logger.debug(logging_text + " Enter status={}".format(status)) + self.logger.debug(logging_text + " Enter status={} message={}".format(status, message)) if vca_deployed['operational-status'] == status: return # same status, ignore vca_deployed['operational-status'] = status - db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(application_name)] = status + db_nsr_update["_admin.deployed.VCA.{}.operational-status".format(vca_index)] = status vca_deployed['detailed-status'] = str(message) - db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(application_name)] = str(message) + db_nsr_update["_admin.deployed.VCA.{}.detailed-status".format(vca_index)] = str(message) else: self.logger.critical(logging_text + " Enter with bad parameters", exc_info=True) return @@ -169,13 +235,17 @@ class NsLcm(LcmBase): except Exception as e: self.logger.critical(logging_text + " Exception {}".format(e), exc_info=True) - def ns_params_2_RO(self, ns_params, nsd, vnfd_dict): + def ns_params_2_RO(self, ns_params, nsd, vnfd_dict, n2vc_key_list): """ - Creates a RO ns descriptor from OSM ns_instantite params + Creates a RO ns descriptor from OSM ns_instantiate params :param ns_params: OSM instantiate params :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 def vim_account_2_RO(vim_account): if vim_account in vim_2_RO: @@ -189,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: @@ -212,187 +297,321 @@ 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"], - "vnfs": {}, - "networks": {}, } + if n2vc_key_list: + for vnfd_ref, vnfd in vnfd_dict.items(): + vdu_needed_access = [] + mgmt_cp = None + if vnfd.get("vnf-configuration"): + if vnfd.get("mgmt-interface"): + if vnfd["mgmt-interface"].get("vdu-id"): + vdu_needed_access.append(vnfd["mgmt-interface"]["vdu-id"]) + elif vnfd["mgmt-interface"].get("cp"): + mgmt_cp = vnfd["mgmt-interface"]["cp"] + + for vdu in vnfd.get("vdu", ()): + if vdu.get("vdu-configuration"): + vdu_needed_access.append(vdu["id"]) + elif mgmt_cp: + for vdu_interface in vdu.get("interface"): + if vdu_interface.get("external-connection-point-ref") and \ + vdu_interface["external-connection-point-ref"] == mgmt_cp: + vdu_needed_access.append(vdu["id"]) + mgmt_cp = None + break + + if vdu_needed_access: + for vnf_member in nsd.get("constituent-vnfd"): + if vnf_member["vnfd-id-ref"] != vnfd_ref: + continue + for vdu in vdu_needed_access: + populate_dict(RO_ns_params, + ("vnfs", vnf_member["member-vnf-index"], "vdus", vdu, "mgmt_keys"), + n2vc_key_list) + if ns_params.get("vduImage"): RO_ns_params["vduImage"] = ns_params["vduImage"] - if ns_params.get("ssh-authorized-key"): - RO_ns_params["cloud-config"] = {"key-pairs": ns_params["ssh-authorized-key"]} - if ns_params.get("vnf"): - for vnf_params in ns_params["vnf"]: - for constituent_vnfd in nsd["constituent-vnfd"]: - if constituent_vnfd["member-vnf-index"] == vnf_params["member-vnf-index"]: - vnf_descriptor = vnfd_dict[constituent_vnfd["vnfd-id-ref"]] - break - else: - raise LcmException("Invalid instantiate parameter vnf:member-vnf-index={} is not present at nsd:" - "constituent-vnfd".format(vnf_params["member-vnf-index"])) - RO_vnf = {"vdus": {}, "networks": {}} - if vnf_params.get("vimAccountId"): - RO_vnf["datacenter"] = vim_account_2_RO(vnf_params["vimAccountId"]) - if vnf_params.get("vdu"): - for vdu_params in vnf_params["vdu"]: - RO_vnf["vdus"][vdu_params["id"]] = {} - if vdu_params.get("volume"): - RO_vnf["vdus"][vdu_params["id"]]["devices"] = {} - for volume_params in vdu_params["volume"]: - RO_vnf["vdus"][vdu_params["id"]]["devices"][volume_params["name"]] = {} - if volume_params.get("vim-volume-id"): - RO_vnf["vdus"][vdu_params["id"]]["devices"][volume_params["name"]]["vim_id"] = \ - volume_params["vim-volume-id"] - if vdu_params.get("interface"): - RO_vnf["vdus"][vdu_params["id"]]["interfaces"] = {} - for interface_params in vdu_params["interface"]: - RO_interface = {} - RO_vnf["vdus"][vdu_params["id"]]["interfaces"][interface_params["name"]] = RO_interface - if interface_params.get("ip-address"): - RO_interface["ip_address"] = interface_params["ip-address"] - if interface_params.get("mac-address"): - RO_interface["mac_address"] = interface_params["mac-address"] - if interface_params.get("floating-ip-required"): - RO_interface["floating-ip"] = interface_params["floating-ip-required"] - if vnf_params.get("internal-vld"): - for internal_vld_params in vnf_params["internal-vld"]: - RO_vnf["networks"][internal_vld_params["name"]] = {} - if internal_vld_params.get("vim-network-name"): - RO_vnf["networks"][internal_vld_params["name"]]["vim-network-name"] = \ - internal_vld_params["vim-network-name"] - if internal_vld_params.get("ip-profile"): - RO_vnf["networks"][internal_vld_params["name"]]["ip-profile"] = \ - ip_profile_2_RO(internal_vld_params["ip-profile"]) - if internal_vld_params.get("internal-connection-point"): - for icp_params in internal_vld_params["internal-connection-point"]: - # look for interface - iface_found = False - for vdu_descriptor in vnf_descriptor["vdu"]: - for vdu_interface in vdu_descriptor["interface"]: - if vdu_interface.get("internal-connection-point-ref") == icp_params["id-ref"]: - RO_interface_update = {} - if icp_params.get("ip-address"): - RO_interface_update["ip_address"] = icp_params["ip-address"] - if icp_params.get("mac-address"): - RO_interface_update["mac_address"] = icp_params["mac-address"] - if RO_interface_update: - RO_vnf_update = {"vdus": {vdu_descriptor["id"]: { - "interfaces": {vdu_interface["name"]: RO_interface_update}}}} - deep_update(RO_vnf, RO_vnf_update) - iface_found = True - break - if iface_found: - break - else: - raise LcmException("Invalid instantiate parameter vnf:member-vnf-index[{}]:" - "internal-vld:id-ref={} is not present at vnfd:internal-" - "connection-point".format(vnf_params["member-vnf-index"], - icp_params["id-ref"])) - - if not RO_vnf["vdus"]: - del RO_vnf["vdus"] - if not RO_vnf["networks"]: - del RO_vnf["networks"] - if RO_vnf: - RO_ns_params["vnfs"][vnf_params["member-vnf-index"]] = RO_vnf - if ns_params.get("vld"): - for vld_params in ns_params["vld"]: - RO_vld = {} - if "ip-profile" in vld_params: - RO_vld["ip-profile"] = ip_profile_2_RO(vld_params["ip-profile"]) - if "vim-network-name" in vld_params: - RO_vld["sites"] = [] - if isinstance(vld_params["vim-network-name"], dict): - for vim_account, vim_net in vld_params["vim-network-name"].items(): - RO_vld["sites"].append({ - "netmap-use": vim_net, - "datacenter": vim_account_2_RO(vim_account) - }) - else: # isinstance str - RO_vld["sites"].append({"netmap-use": vld_params["vim-network-name"]}) - if "vnfd-connection-point-ref" in vld_params: - for cp_params in vld_params["vnfd-connection-point-ref"]: - # look for interface - for constituent_vnfd in nsd["constituent-vnfd"]: - if constituent_vnfd["member-vnf-index"] == cp_params["member-vnf-index-ref"]: - vnf_descriptor = vnfd_dict[constituent_vnfd["vnfd-id-ref"]] + if ns_params.get("ssh_keys"): + RO_ns_params["cloud-config"] = {"key-pairs": ns_params["ssh_keys"]} + for vnf_params in get_iterable(ns_params, "vnf"): + for constituent_vnfd in nsd["constituent-vnfd"]: + if constituent_vnfd["member-vnf-index"] == vnf_params["member-vnf-index"]: + vnf_descriptor = vnfd_dict[constituent_vnfd["vnfd-id-ref"]] + break + else: + raise LcmException("Invalid instantiate parameter vnf:member-vnf-index={} is not present at nsd:" + "constituent-vnfd".format(vnf_params["member-vnf-index"])) + if vnf_params.get("vimAccountId"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "datacenter"), + vim_account_2_RO(vnf_params["vimAccountId"])) + + for vdu_params in get_iterable(vnf_params, "vdu"): + # TODO feature 1417: check that this VDU exist and it is not a PDU + if vdu_params.get("volume"): + for volume_params in vdu_params["volume"]: + if volume_params.get("vim-volume-id"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_params["id"], "devices", volume_params["name"], "vim_id"), + volume_params["vim-volume-id"]) + if vdu_params.get("interface"): + for interface_params in vdu_params["interface"]: + if interface_params.get("ip-address"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_params["id"], "interfaces", interface_params["name"], + "ip_address"), + interface_params["ip-address"]) + if interface_params.get("mac-address"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_params["id"], "interfaces", interface_params["name"], + "mac_address"), + interface_params["mac-address"]) + if interface_params.get("floating-ip-required"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_params["id"], "interfaces", interface_params["name"], + "floating-ip"), + interface_params["floating-ip-required"]) + + for internal_vld_params in get_iterable(vnf_params, "internal-vld"): + if internal_vld_params.get("vim-network-name"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", + internal_vld_params["name"], "vim-network-name"), + internal_vld_params["vim-network-name"]) + if internal_vld_params.get("vim-network-id"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", + internal_vld_params["name"], "vim-network-id"), + internal_vld_params["vim-network-id"]) + if internal_vld_params.get("ip-profile"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", + internal_vld_params["name"], "ip-profile"), + ip_profile_2_RO(internal_vld_params["ip-profile"])) + + for icp_params in get_iterable(internal_vld_params, "internal-connection-point"): + # look for interface + iface_found = False + for vdu_descriptor in vnf_descriptor["vdu"]: + for vdu_interface in vdu_descriptor["interface"]: + if vdu_interface.get("internal-connection-point-ref") == icp_params["id-ref"]: + if icp_params.get("ip-address"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_descriptor["id"], "interfaces", + vdu_interface["name"], "ip_address"), + icp_params["ip-address"]) + + if icp_params.get("mac-address"): + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "vdus", + vdu_descriptor["id"], "interfaces", + vdu_interface["name"], "mac_address"), + icp_params["mac-address"]) + iface_found = True break - else: - raise LcmException( - "Invalid instantiate parameter vld:vnfd-connection-point-ref:member-vnf-index-ref={} " - "is not present at nsd:constituent-vnfd".format(cp_params["member-vnf-index-ref"])) - match_cp = False - for vdu_descriptor in vnf_descriptor["vdu"]: - for interface_descriptor in vdu_descriptor["interface"]: - if interface_descriptor.get("external-connection-point-ref") == \ - cp_params["vnfd-connection-point-ref"]: - match_cp = True - break - if match_cp: + if iface_found: + break + else: + raise LcmException("Invalid instantiate parameter vnf:member-vnf-index[{}]:" + "internal-vld:id-ref={} is not present at vnfd:internal-" + "connection-point".format(vnf_params["member-vnf-index"], + icp_params["id-ref"])) + + for vld_params in get_iterable(ns_params, "vld"): + 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): + for vim_account, vim_net in vld_params["vim-network-name"].items(): + RO_vld_sites.append({ + "netmap-use": vim_net, + "datacenter": vim_account_2_RO(vim_account) + }) + else: # isinstance str + RO_vld_sites.append({"netmap-use": vld_params["vim-network-name"]}) + if RO_vld_sites: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites) + if vld_params.get("vim-network-id"): + RO_vld_sites = [] + if isinstance(vld_params["vim-network-id"], dict): + for vim_account, vim_net in vld_params["vim-network-id"].items(): + RO_vld_sites.append({ + "netmap-use": vim_net, + "datacenter": vim_account_2_RO(vim_account) + }) + else: # isinstance str + RO_vld_sites.append({"netmap-use": vld_params["vim-network-id"]}) + if RO_vld_sites: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites) + if "vnfd-connection-point-ref" in vld_params: + for cp_params in vld_params["vnfd-connection-point-ref"]: + # look for interface + for constituent_vnfd in nsd["constituent-vnfd"]: + if constituent_vnfd["member-vnf-index"] == cp_params["member-vnf-index-ref"]: + vnf_descriptor = vnfd_dict[constituent_vnfd["vnfd-id-ref"]] + break + else: + raise LcmException( + "Invalid instantiate parameter vld:vnfd-connection-point-ref:member-vnf-index-ref={} " + "is not present at nsd:constituent-vnfd".format(cp_params["member-vnf-index-ref"])) + match_cp = False + for vdu_descriptor in vnf_descriptor["vdu"]: + for interface_descriptor in vdu_descriptor["interface"]: + if interface_descriptor.get("external-connection-point-ref") == \ + cp_params["vnfd-connection-point-ref"]: + match_cp = True break - else: - raise LcmException( - "Invalid instantiate parameter vld:vnfd-connection-point-ref:member-vnf-index-ref={}:" - "vnfd-connection-point-ref={} is not present at vnfd={}".format( - cp_params["member-vnf-index-ref"], - cp_params["vnfd-connection-point-ref"], - vnf_descriptor["id"])) - RO_cp_params = {} - if cp_params.get("ip-address"): - RO_cp_params["ip_address"] = cp_params["ip-address"] - if cp_params.get("mac-address"): - RO_cp_params["mac_address"] = cp_params["mac-address"] - if RO_cp_params: - RO_vnf_params = { - cp_params["member-vnf-index-ref"]: { - "vdus": { - vdu_descriptor["id"]: { - "interfaces": { - interface_descriptor["name"]: RO_cp_params - } - } - } - } - } - deep_update(RO_ns_params["vnfs"], RO_vnf_params) - if RO_vld: - RO_ns_params["networks"][vld_params["name"]] = RO_vld + if match_cp: + break + else: + raise LcmException( + "Invalid instantiate parameter vld:vnfd-connection-point-ref:member-vnf-index-ref={}:" + "vnfd-connection-point-ref={} is not present at vnfd={}".format( + cp_params["member-vnf-index-ref"], + cp_params["vnfd-connection-point-ref"], + vnf_descriptor["id"])) + if cp_params.get("ip-address"): + populate_dict(RO_ns_params, ("vnfs", cp_params["member-vnf-index-ref"], "vdus", + vdu_descriptor["id"], "interfaces", + interface_descriptor["name"], "ip_address"), + cp_params["ip-address"]) + if cp_params.get("mac-address"): + populate_dict(RO_ns_params, ("vnfs", cp_params["member-vnf-index-ref"], "vdus", + vdu_descriptor["id"], "interfaces", + interface_descriptor["name"], "mac_address"), + cp_params["mac-address"]) return RO_ns_params + def scale_vnfr(self, db_vnfr, vdu_create=None, vdu_delete=None): + # make a copy to do not change + vdu_create = copy(vdu_create) + vdu_delete = copy(vdu_delete) + + vdurs = db_vnfr.get("vdur") + if vdurs is None: + vdurs = [] + vdu_index = len(vdurs) + while vdu_index: + vdu_index -= 1 + vdur = vdurs[vdu_index] + if vdur.get("pdu-type"): + continue + vdu_id_ref = vdur["vdu-id-ref"] + if vdu_create and vdu_create.get(vdu_id_ref): + for index in range(0, vdu_create[vdu_id_ref]): + vdur = deepcopy(vdur) + vdur["_id"] = str(uuid4()) + vdur["count-index"] += 1 + vdurs.insert(vdu_index+1+index, vdur) + del vdu_create[vdu_id_ref] + if vdu_delete and vdu_delete.get(vdu_id_ref): + del vdurs[vdu_index] + vdu_delete[vdu_id_ref] -= 1 + if not vdu_delete[vdu_id_ref]: + del vdu_delete[vdu_id_ref] + # check all operations are done + if vdu_create or vdu_delete: + raise LcmException("Error scaling OUT VNFR for {}. There is not any existing vnfr. Scaled to 0?".format( + vdu_create)) + if vdu_delete: + raise LcmException("Error scaling IN VNFR for {}. There is not any existing vnfr. Scaled to 0?".format( + vdu_delete)) + + vnfr_update = {"vdur": vdurs} + db_vnfr["vdur"] = vdurs + self.update_db_2("vnfrs", db_vnfr["_id"], vnfr_update) + + def ns_update_nsr(self, ns_update_nsr, db_nsr, nsr_desc_RO): + """ + Updates database nsr with the RO info for the created vld + :param ns_update_nsr: dictionary to be filled with the updated info + :param db_nsr: content of db_nsr. This is also modified + :param nsr_desc_RO: nsr descriptor from RO + :return: Nothing, LcmException is raised on errors + """ + + for vld_index, vld in enumerate(get_iterable(db_nsr, "vld")): + for net_RO in get_iterable(nsr_desc_RO, "nets"): + if vld["id"] != net_RO.get("ns_net_osm_id"): + continue + vld["vim-id"] = net_RO.get("vim_net_id") + vld["name"] = net_RO.get("vim_name") + vld["status"] = net_RO.get("status") + vld["status-detailed"] = net_RO.get("error_msg") + ns_update_nsr["vld.{}".format(vld_index)] = vld + break + else: + raise LcmException("ns_update_nsr: Not found vld={} at RO info".format(vld["id"])) + def ns_update_vnfr(self, db_vnfrs, nsr_desc_RO): """ Updates database vnfr with the RO info, e.g. ip_address, vim_id... Descriptor db_vnfrs is also updated - :param db_vnfrs: - :param nsr_desc_RO: - :return: + :param db_vnfrs: dictionary with member-vnf-index: vnfr-content + :param nsr_desc_RO: nsr descriptor from RO + :return: Nothing, LcmException is raised on errors """ for vnf_index, db_vnfr in db_vnfrs.items(): for vnf_RO in nsr_desc_RO["vnfs"]: - if vnf_RO["member_vnf_index"] == vnf_index: - vnfr_update = {} - db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO.get("ip_address") - vdur_list = [] - for vdur_RO in vnf_RO.get("vms", ()): - vdur = { - "vim-id": vdur_RO.get("vim_vm_id"), - "ip-address": vdur_RO.get("ip_address"), - "vdu-id-ref": vdur_RO.get("vdu_osm_id"), - "name": vdur_RO.get("vim_name"), - "status": vdur_RO.get("status"), - "status-detailed": vdur_RO.get("error_msg"), - "interfaces": [] - } + if vnf_RO["member_vnf_index"] != vnf_index: + continue + vnfr_update = {} + if vnf_RO.get("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)) + + for vdu_index, vdur in enumerate(get_iterable(db_vnfr, "vdur")): + vdur_RO_count_index = 0 + if vdur.get("pdu-type"): + continue + for vdur_RO in get_iterable(vnf_RO, "vms"): + if vdur["vdu-id-ref"] != vdur_RO["vdu_osm_id"]: + continue + if vdur["count-index"] != vdur_RO_count_index: + vdur_RO_count_index += 1 + continue + vdur["vim-id"] = vdur_RO.get("vim_vm_id") + 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") + vdur["status-detailed"] = vdur_RO.get("error_msg") + for ifacer in get_iterable(vdur, "interfaces"): + for interface_RO in get_iterable(vdur_RO, "interfaces"): + if ifacer["name"] == interface_RO.get("internal_name"): + ifacer["ip-address"] = interface_RO.get("ip_address") + ifacer["mac-address"] = interface_RO.get("mac_address") + break + else: + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} interface={} " + "at RO info".format(vnf_index, vdur["vdu-id-ref"], ifacer["name"])) + vnfr_update["vdur.{}".format(vdu_index)] = vdur + break + else: + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} count_index={} at " + "RO info".format(vnf_index, vdur["vdu-id-ref"], vdur["count-index"])) + + for vld_index, vld in enumerate(get_iterable(db_vnfr, "vld")): + for net_RO in get_iterable(nsr_desc_RO, "nets"): + if vld["id"] != net_RO.get("vnf_net_osm_id"): + continue + vld["vim-id"] = net_RO.get("vim_net_id") + vld["name"] = net_RO.get("vim_name") + vld["status"] = net_RO.get("status") + vld["status-detailed"] = net_RO.get("error_msg") + vnfr_update["vld.{}".format(vld_index)] = vld + break + else: + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vld={} at RO info".format( + vnf_index, vld["id"])) - for interface_RO in vdur_RO.get("interfaces", ()): - vdur["interfaces"].append({ - "ip-address": interface_RO.get("ip_address"), - "mac-address": interface_RO.get("mac_address"), - "name": interface_RO.get("internal_name"), - }) - vdur_list.append(vdur) - db_vnfr["vdur"] = vnfr_update["vdur"] = vdur_list - self.update_db_2("vnfrs", db_vnfr["_id"], vnfr_update) - break + self.update_db_2("vnfrs", db_vnfr["_id"], vnfr_update) + break else: raise LcmException("ns_update_vnfr: Not found member_vnf_index={} at RO info".format(vnf_index)) @@ -401,6 +620,7 @@ class NsLcm(LcmBase): logging_text = "Task ns={} instantiate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") # get all needed from database + start_deploy = time() db_nsr = None db_nslcmop = None db_nsr_update = {"_admin.nslcmop": nslcmop_id} @@ -408,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: @@ -416,7 +636,7 @@ class NsLcm(LcmBase): db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) step = "Getting nsr={} from db".format(nsr_id) db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) - ns_params = db_nsr.get("instantiate_params") + ns_params = db_nslcmop.get("operationParams") nsd = db_nsr["nsd"] nsr_name = db_nsr["name"] # TODO short-name?? @@ -431,78 +651,112 @@ class NsLcm(LcmBase): if pending: raise LcmException("Timeout waiting related tasks to be completed") - needed_vnfd = {} - vnfr_filter = {"nsr-id-ref": nsr_id, "member-vnf-index-ref": None} - for c_vnf in nsd["constituent-vnfd"]: - vnfd_id = c_vnf["vnfd-id-ref"] - vnfr_filter["member-vnf-index-ref"] = c_vnf["member-vnf-index"] - step = "Getting vnfr={} of nsr={} from db".format(c_vnf["member-vnf-index"], nsr_id) - db_vnfrs[c_vnf["member-vnf-index"]] = self.db.get_one("vnfrs", vnfr_filter) - if vnfd_id not in needed_vnfd: - step = "Getting vnfd={} from db".format(vnfd_id) - needed_vnfd[vnfd_id] = self.db.get_one("vnfds", {"id": vnfd_id}) - - nsr_lcm = db_nsr["_admin"].get("deployed") - if not nsr_lcm: - nsr_lcm = db_nsr["_admin"]["deployed"] = { - "id": nsr_id, - "RO": {"vnfd_id": {}, "nsd_id": None, "nsr_id": None, "nsr_status": "SCHEDULED"}, - "nsr_ip": {}, - "VCA": {}, - } + step = "Getting vnfrs from db" + db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) + db_vnfds_ref = {} + db_vnfds = {} + for vnfr in db_vnfrs_list: + db_vnfrs[vnfr["member-vnf-index-ref"]] = vnfr + vnfd_id = vnfr["vnfd-id"] + vnfd_ref = vnfr["vnfd-ref"] + if vnfd_id not in db_vnfds: + step = "Getting vnfd={} id='{}' from db".format(vnfd_id, vnfd_ref) + vnfd = self.db.get_one("vnfds", {"_id": vnfd_id}) + db_vnfds_ref[vnfd_ref] = vnfd + db_vnfds[vnfd_id] = vnfd + + # Get or generates the _admin.deployed,VCA list + vca_deployed_list = None + if db_nsr["_admin"].get("deployed"): + vca_deployed_list = db_nsr["_admin"]["deployed"].get("VCA") + if vca_deployed_list is None: + vca_deployed_list = [] + db_nsr_update["_admin.deployed.VCA"] = vca_deployed_list + elif isinstance(vca_deployed_list, dict): + # maintain backward compatibility. Change a dict to list at database + vca_deployed_list = list(vca_deployed_list.values()) + db_nsr_update["_admin.deployed.VCA"] = vca_deployed_list + 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) + # set state to INSTANTIATED. When instantiated NBI will not delete directly + db_nsr_update["_admin.nsState"] = "INSTANTIATED" + self.update_db_2("nsrs", nsr_id, db_nsr_update) + # get vnfds, instantiate at RO - for vnfd_id, vnfd in needed_vnfd.items(): - step = db_nsr_update["detailed-status"] = "Creating vnfd={} at RO".format(vnfd_id) + 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='{}' 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_id[:23]) - descriptor_id_2_RO[vnfd_id] = 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_id, 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"] - db_nsr_update["_admin.nsState"] = "INSTANTIATED" - self.logger.debug(logging_text + "vnfd={} created at RO. RO_id={}".format( - vnfd_id, 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 - nsd_id = nsd["id"] - step = db_nsr_update["detailed-status"] = "Creating nsd={} at RO".format(nsd_id) + nsd_ref = nsd["id"] + step = db_nsr_update["detailed-status"] = "Creating nsd={} at RO".format(nsd_ref) # self.logger.debug(logging_text + step) - RO_osm_nsd_id = "{}.{}.{}".format(nsr_id, RO_descriptor_number, nsd_id[:23]) - descriptor_id_2_RO[nsd_id] = RO_osm_nsd_id + RO_osm_nsd_id = "{}.{}.{}".format(nsr_id, RO_descriptor_number, nsd_ref[:23]) RO_descriptor_number += 1 nsd_list = await RO.get_list("nsd", filter_by={"osm_id": RO_osm_nsd_id}) if nsd_list: db_nsr_update["_admin.deployed.RO.nsd_id"] = RO_nsd_uuid = nsd_list[0]["uuid"] self.logger.debug(logging_text + "nsd={} exists at RO. Using RO_id={}".format( - nsd_id, RO_nsd_uuid)) + nsd_ref, RO_nsd_uuid)) else: nsd_RO = deepcopy(nsd) nsd_RO["id"] = RO_osm_nsd_id nsd_RO.pop("_id", None) nsd_RO.pop("_admin", None) - for c_vnf in nsd_RO["constituent-vnfd"]: - vnfd_id = c_vnf["vnfd-id-ref"] - c_vnf["vnfd-id-ref"] = descriptor_id_2_RO[vnfd_id] + for c_vnf in nsd_RO.get("constituent-vnfd", ()): + 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"] - self.logger.debug(logging_text + "nsd={} created at RO. RO_id={}".format(nsd_id, RO_nsd_uuid)) + self.logger.debug(logging_text + "nsd={} created at RO. RO_id={}".format(nsd_ref, RO_nsd_uuid)) self.update_db_2("nsrs", nsr_id, db_nsr_update) # Crate ns at RO @@ -546,11 +800,10 @@ class NsLcm(LcmBase): await asyncio.wait(task_dependency, timeout=3600) step = db_nsr_update["detailed-status"] = "Checking instantiation parameters" - RO_ns_params = self.ns_params_2_RO(ns_params, nsd, needed_vnfd) + # feature 1429. Add n2vc public key to needed VMs n2vc_key = await self.n2vc.GetPublicKey() - RO_ns_params["mgmt_keys"] = [n2vc_key] - # TODO feature 1429. Add this option only to VMs with configuration and no password + RO_ns_params = self.ns_params_2_RO(ns_params, nsd, db_vnfds_ref, [n2vc_key]) step = db_nsr_update["detailed-status"] = "Creating ns at RO" desc = await RO.create("ns", descriptor=RO_ns_params, @@ -562,54 +815,37 @@ class NsLcm(LcmBase): self.logger.debug(logging_text + "ns created at RO. RO_id={}".format(desc["uuid"])) self.update_db_2("nsrs", nsr_id, db_nsr_update) - # update VNFR vimAccount - step = "Updating VNFR vimAcccount" - for vnf_index, vnfr in db_vnfrs.items(): - if vnfr.get("vim-account-id"): - continue - vnfr_update = {"vim-account-id": db_nsr["instantiate_params"]["vimAccountId"]} - if db_nsr["instantiate_params"].get("vnf"): - for vnf_params in db_nsr["instantiate_params"]["vnf"]: - if vnf_params.get("member-vnf-index") == vnf_index: - if vnf_params.get("vimAccountId"): - vnfr_update["vim-account-id"] = vnf_params.get("vimAccountId") - break - self.update_db_2("vnfrs", vnfr["_id"], vnfr_update) - # wait until NS is ready step = ns_status_detailed = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id) detailed_status_old = None self.logger.debug(logging_text + step) - deployment_timeout = 2 * 3600 # Two hours - while deployment_timeout > 0: + 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": detailed_status = ns_status_detailed + "; {}".format(ns_status_info) elif ns_status == "ACTIVE": - step = detailed_status = "Waiting for management IP address reported by the VIM" + step = detailed_status = "Waiting for management IP address reported by the VIM. Updating VNFRs" try: - nsr_lcm["nsr_ip"] = RO.get_ns_vnf_info(desc) + self.ns_update_vnfr(db_vnfrs, desc) break - except ROclient.ROClientException as e: - if e.http_code != 409: # IP address is not ready return code is 409 CONFLICT - raise e + except LcmExceptionNoMgmtIP: + pass else: assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) if detailed_status != detailed_status_old: detailed_status_old = db_nsr_update["detailed-status"] = detailed_status self.update_db_2("nsrs", nsr_id, db_nsr_update) await asyncio.sleep(5, loop=self.loop) - deployment_timeout -= 5 - if deployment_timeout <= 0: + else: # total_deploy_timeout raise ROclient.ROClientException("Timeout waiting ns to be ready") - step = "Updating VNFRs" - self.ns_update_vnfr(db_vnfrs, desc) + step = "Updating NSR" + self.ns_update_nsr(db_nsr_update, db_nsr, desc) db_nsr["detailed-status"] = "Configuring vnfr" self.update_db_2("nsrs", nsr_id, db_nsr_update) @@ -617,11 +853,11 @@ class NsLcm(LcmBase): # The parameters we'll need to deploy a charm number_to_configure = 0 - def deploy(vnf_index, vdu_id, 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: @@ -643,25 +879,21 @@ 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' - vdu_id_text = "vnfd" + model_name = "default" # TODO bug 585 nsr_id if vdu_id: - vdu_id_text = vdu_id - application_name = self.n2vc.FormatApplicationName( - nsr_name, - vnf_index, - vdu_id_text - ) - if not nsr_lcm.get("VCA"): - nsr_lcm["VCA"] = {} - nsr_lcm["VCA"][application_name] = db_nsr_update["_admin.deployed.VCA.{}".format(application_name)] = { + vdu_id_text = vdu_id + "-" + else: + vdu_id_text = "-" + application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index, vdu_id_text) + + vca_index = len(vca_deployed_list) + # trunk name and add two char index at the end to ensure that it is unique. It is assumed no more than + # 26*26 charm in the same NS + application_name = application_name[0:48] + application_name += chr(97 + vca_index // 26) + chr(97 + vca_index % 26) + vca_deployed_ = { "member-vnf-index": vnf_index, "vdu_id": vdu_id, "model": model_name, @@ -669,7 +901,11 @@ class NsLcm(LcmBase): "operational-status": "init", "detailed-status": "", "vnfd_id": vnfd_id, + "vdu_name": vdu_name, + "vdu_count_index": vdu_count_index, } + vca_deployed_list.append(vca_deployed_) + db_nsr_update["_admin.deployed.VCA.{}".format(vca_index)] = vca_deployed_ self.update_db_2("nsrs", nsr_id, db_nsr_update) self.logger.debug("Task create_ns={} Passing artifacts path '{}' for {}".format(nsr_id, charm_path, @@ -679,7 +915,7 @@ class NsLcm(LcmBase): n2vc_info["nslcmop_id"] = nslcmop_id n2vc_info["n2vc_event"] = asyncio.Event(loop=self.loop) n2vc_info["lcmOperationType"] = "instantiate" - n2vc_info["deployed"] = nsr_lcm["VCA"] + n2vc_info["deployed"] = vca_deployed_list n2vc_info["db_update"] = db_nsr_update task = asyncio.ensure_future( self.n2vc.DeployCharms( @@ -687,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) ) ) @@ -701,49 +937,64 @@ class NsLcm(LcmBase): step = "Looking for needed vnfd to configure" self.logger.debug(logging_text + step) - for c_vnf in nsd["constituent-vnfd"]: + for c_vnf in get_iterable(nsd, "constituent-vnfd"): vnfd_id = c_vnf["vnfd-id-ref"] vnf_index = str(c_vnf["member-vnf-index"]) - vnfd = needed_vnfd[vnfd_id] + 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(vnf_index, 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. - vdu_index = 0 - for vdu in vnfd['vdu']: + 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() - deploy(vnf_index, vdu["id"], db_vnfrs[vnf_index]["vdur"][vdu_index]["ip-address"], - n2vc_info, config_primitive) + vdur = db_vnfrs[vnf_index]["vdur"][vdu_index] + # TODO for the moment only first vdu_id contains a charm deployed + 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"], + charm_params, n2vc_info) number_to_configure += 1 - vdu_index += 1 db_nsr_update["operational-status"] = "running" configuration_failed = False @@ -754,30 +1005,43 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = old_status # wait until all are configured. - while True: + while time() <= start_deploy + self.total_deploy_timeout: if db_nsr_update: 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 task that set n2vc_event after some time await n2vc_info["n2vc_event"].wait() n2vc_info["n2vc_event"].clear() all_active = True status_map = {} n2vc_error_text = [] # contain text error list. If empty no one is in error status - for _, vca_info in nsr_lcm["VCA"].items(): - vca_status = vca_info["operational-status"] + now = time() + for vca_deployed in vca_deployed_list: + vca_status = vca_deployed["operational-status"] if vca_status not in status_map: # Initialize it status_map[vca_status] = 0 status_map[vca_status] += 1 - if vca_status != "active": - all_active = False + if vca_status == "active": + vca_deployed.pop("time_first_error", None) + vca_deployed.pop("status_first_error", None) + continue + + all_active = False if vca_status in ("error", "blocked"): - n2vc_error_text.append( - "member_vnf_index={} vdu_id={} {}: {}".format(vca_info["member-vnf-index"], - vca_info["vdu_id"], vca_status, - vca_info["detailed-status"])) + vca_deployed["detailed-status-error"] = vca_deployed["detailed-status"] + # if not first time in this status error + if not vca_deployed.get("time_first_error"): + vca_deployed["time_first_error"] = now + continue + if vca_deployed.get("time_first_error") and \ + now <= vca_deployed["time_first_error"] + self.timeout_vca_on_error: + n2vc_error_text.append("member_vnf_index={} vdu_id={} {}: {}" + .format(vca_deployed["member-vnf-index"], + vca_deployed["vdu_id"], vca_status, + vca_deployed["detailed-status-error"])) if all_active: break @@ -801,6 +1065,8 @@ class NsLcm(LcmBase): db_nsr_update["detailed-status"] = cs db_nslcmop_update["detailed-status"] = cs old_status = cs + else: # total_deploy_timeout + raise LcmException("Timeout waiting ns to be configured") if not configuration_failed: # all is done @@ -831,21 +1097,53 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() - if db_nsr: - db_nsr_update["_admin.nslcmop"] = None - self.update_db_2("nsrs", nsr_id, db_nsr_update) - if db_nslcmop_update: - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + try: + if db_nsr: + db_nsr_update["_admin.nslcmop"] = None + self.update_db_2("nsrs", nsr_id, db_nsr_update) + if db_nslcmop_update: + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + except DbException as e: + self.logger.error(logging_text + "Cannot update database: {}".format(e)) 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)) self.logger.debug(logging_text + "Exit") self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_instantiate") + async def _destroy_charm(self, model, application): + """ + Order N2VC destroy a charm + :param model: + :param application: + :return: True if charm does not exist. False if it exist + """ + if not await self.n2vc.HasApplication(model, application): + return True # Already removed + await self.n2vc.RemoveCharms(model, application) + return False + + async def _wait_charm_destroyed(self, model, application, timeout): + """ + Wait until charm does not exist + :param model: + :param application: + :param timeout: + :return: True if not exist, False if timeout + """ + while True: + if not await self.n2vc.HasApplication(model, application): + return True + if timeout < 0: + return False + await asyncio.sleep(10) + timeout -= 10 + async def terminate(self, nsr_id, nslcmop_id): logging_text = "Task ns={} terminate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") @@ -853,51 +1151,45 @@ class NsLcm(LcmBase): db_nslcmop = None exc = None failed_detail = [] # annotates all failed error messages - vca_task_list = [] - vca_task_dict = {} + vca_time_destroy = None # time of where destroy charm order 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}) step = "Getting nsr={} from db".format(nsr_id) db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) # nsd = db_nsr["nsd"] - nsr_lcm = deepcopy(db_nsr["_admin"].get("deployed")) + nsr_deployed = deepcopy(db_nsr["_admin"].get("deployed")) if db_nsr["_admin"]["nsState"] == "NOT_INSTANTIATED": return - # TODO ALF remove - # db_vim = self.db.get_one("vim_accounts", {"_id": db_nsr["datacenter"]}) # #TODO check if VIM is creating and wait # RO_vim_id = db_vim["_admin"]["deployed"]["RO"] db_nsr_update["operational-status"] = "terminating" db_nsr_update["config-status"] = "terminating" - if nsr_lcm and nsr_lcm.get("VCA"): + if nsr_deployed and nsr_deployed.get("VCA"): try: step = "Scheduling configuration charms removing" db_nsr_update["detailed-status"] = "Deleting charms" self.logger.debug(logging_text + step) self.update_db_2("nsrs", nsr_id, db_nsr_update) - for application_name, deploy_info in nsr_lcm["VCA"].items(): - if deploy_info: # TODO it would be desirable having a and deploy_info.get("deployed"): - task = asyncio.ensure_future( - self.n2vc.RemoveCharms( - deploy_info['model'], - application_name, - # self.n2vc_callback, - # db_nsr, - # db_nslcmop, - ) - ) - vca_task_list.append(task) - vca_task_dict[application_name] = task - # task.add_done_callback(functools.partial(self.n2vc_callback, deploy_info['model'], - # deploy_info['application'], None, db_nsr, - # db_nslcmop, vnf_index)) - self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "delete_charm:" + application_name, task) + # for backward compatibility + if isinstance(nsr_deployed["VCA"], dict): + nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values()) + db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"] + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + for vca_index, vca_deployed in enumerate(nsr_deployed["VCA"]): + if vca_deployed: + if await self._destroy_charm(vca_deployed['model'], vca_deployed["application"]): + vca_deployed.clear() + db_nsr["_admin.deployed.VCA.{}".format(vca_index)] = None + else: + vca_time_destroy = time() except Exception as e: self.logger.debug(logging_text + "Failed while deleting charms: {}".format(e)) @@ -907,12 +1199,14 @@ class NsLcm(LcmBase): # Delete ns RO_nsr_id = RO_delete_action = None - if nsr_lcm and nsr_lcm.get("RO"): - RO_nsr_id = nsr_lcm["RO"].get("nsr_id") - RO_delete_action = nsr_lcm["RO"].get("nsr_delete_action_id") + if nsr_deployed and nsr_deployed.get("RO"): + RO_nsr_id = nsr_deployed["RO"].get("nsr_id") + RO_delete_action = nsr_deployed["RO"].get("nsr_delete_action_id") try: if RO_nsr_id: step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = "Deleting ns at RO" + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + self.update_db_2("nsrs", nsr_id, db_nsr_update) self.logger.debug(logging_text + step) desc = await RO.delete("ns", RO_nsr_id) RO_delete_action = desc["action_id"] @@ -921,7 +1215,8 @@ class NsLcm(LcmBase): db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED" if RO_delete_action: # wait until NS is deleted from VIM - step = detailed_status = "Waiting ns deleted from VIM. RO_id={}".format(RO_nsr_id) + step = detailed_status = "Waiting ns deleted from VIM. RO_id={} RO_delete_action={}".\ + format(RO_nsr_id, RO_delete_action) detailed_status_old = None self.logger.debug(logging_text + step) @@ -935,14 +1230,18 @@ class NsLcm(LcmBase): elif ns_status == "BUILD": detailed_status = step + "; {}".format(ns_status_info) elif ns_status == "ACTIVE": + db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = None + db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED" break else: assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) - await asyncio.sleep(5, loop=self.loop) - delete_timeout -= 5 if detailed_status != detailed_status_old: - detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status + detailed_status_old = db_nslcmop_update["detailed-status"] = \ + db_nsr_update["detailed-status"] = detailed_status self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + self.update_db_2("nsrs", nsr_id, db_nsr_update) + await asyncio.sleep(5, loop=self.loop) + delete_timeout -= 5 else: # delete_timeout <= 0: raise ROclient.ROClientException("Timeout waiting ns deleted from VIM") @@ -950,6 +1249,7 @@ class NsLcm(LcmBase): if e.http_code == 404: # not found db_nsr_update["_admin.deployed.RO.nsr_id"] = None db_nsr_update["_admin.deployed.RO.nsr_status"] = "DELETED" + db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = None self.logger.debug(logging_text + "RO_ns_id={} already deleted".format(RO_nsr_id)) elif e.http_code == 409: # conflict failed_detail.append("RO_ns_id={} delete conflict: {}".format(RO_nsr_id, e)) @@ -961,8 +1261,8 @@ class NsLcm(LcmBase): RO_fail = True # Delete nsd - if not RO_fail and nsr_lcm and nsr_lcm.get("RO") and nsr_lcm["RO"].get("nsd_id"): - RO_nsd_id = nsr_lcm["RO"]["nsd_id"] + if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("nsd_id"): + RO_nsd_id = nsr_deployed["RO"]["nsd_id"] try: step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ "Deleting nsd at RO" @@ -982,19 +1282,21 @@ class NsLcm(LcmBase): self.logger.error(logging_text + failed_detail[-1]) RO_fail = True - if not RO_fail and nsr_lcm and nsr_lcm.get("RO") and nsr_lcm["RO"].get("vnfd_id"): - for vnf_id, RO_vnfd_id in nsr_lcm["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)) @@ -1003,25 +1305,23 @@ class NsLcm(LcmBase): failed_detail.append("RO_vnfd_id={} delete error: {}".format(RO_vnfd_id, e)) self.logger.error(logging_text + failed_detail[-1]) - if vca_task_list: - db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ + # wait until charm deleted + if vca_time_destroy: + db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = step = \ "Waiting for deletion of configuration charms" self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) self.update_db_2("nsrs", nsr_id, db_nsr_update) - await asyncio.wait(vca_task_list, timeout=300) - for application_name, task in vca_task_dict.items(): - if task.cancelled(): - failed_detail.append("VCA[{}] Deletion has been cancelled".format(application_name)) - elif task.done(): - exc = task.exception() - if exc: - failed_detail.append("VCA[{}] Deletion exception: {}".format(application_name, exc)) + for vca_index, vca_deployed in enumerate(nsr_deployed["VCA"]): + if not vca_deployed: + continue + step = "Waiting for deletion of charm application_name={}".format(vca_deployed["application"]) + timeout = self.timeout_charm_delete - int(time() - vca_time_destroy) + if not await self._wait_charm_destroyed(vca_deployed['model'], vca_deployed["application"], + timeout): + failed_detail.append("VCA[application_name={}] Deletion timeout".format( + vca_deployed["application"])) else: - db_nsr_update["_admin.deployed.VCA.{}".format(application_name)] = None - else: # timeout - # TODO Should it be cancelled?!! - task.cancel() - failed_detail.append("VCA[{}] Deletion timeout".format(application_name)) + db_nsr["_admin.deployed.VCA.{}".format(vca_index)] = None if failed_detail: self.logger.error(logging_text + " ;".join(failed_detail)) @@ -1030,14 +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_update.clear() - self.db.del_list("nslcmops", {"nsInstanceId": nsr_id}) - nslcmop_operation_state = "COMPLETED" - db_nslcmop_update.clear() - self.db.del_list("vnfrs", {"nsr-id-ref": nsr_id}) - self.logger.debug(logging_text + "Delete from database") else: db_nsr_update["operational-status"] = "terminated" db_nsr_update["detailed-status"] = "Done" @@ -1045,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)) @@ -1060,76 +1354,115 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() - if db_nslcmop_update: - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - if db_nsr: - db_nsr_update["_admin.nslcmop"] = None - self.update_db_2("nsrs", nsr_id, db_nsr_update) + try: + if db_nslcmop and db_nslcmop_update: + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + if db_nsr: + db_nsr_update["_admin.nslcmop"] = None + self.update_db_2("nsrs", nsr_id, db_nsr_update) + except DbException as e: + self.logger.error(logging_text + "Cannot update database: {}".format(e)) 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, primitive, primitive_params): - - vdu_id_text = "vnfd" - if vdu_id: - vdu_id_text = vdu_id - application_name = self.n2vc.FormatApplicationName( - nsr_name, - member_vnf_index, - vdu_id_text - ) - vca_deployed = db_deployed["VCA"].get(application_name) - if not vca_deployed: - raise LcmException("charm for member_vnf_index={} vdu_id={} is not deployed".format(member_vnf_index, - vdu_id)) - 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={} is not properly deployed".format(member_vnf_index)) - if vca_deployed["operational-status"] != "active": - raise LcmException("charm for member_vnf_index={} operational_status={} not 'active'".format( - member_vnf_index, 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( + @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"])) + + 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) @@ -1145,10 +1478,17 @@ 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_lcm = db_nsr["_admin"].get("deployed") - nsr_name = db_nsr["name"] + + nsr_deployed = db_nsr["_admin"].get("deployed") 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) @@ -1161,11 +1501,40 @@ class NsLcm(LcmBase): if pending: raise LcmException("Timeout waiting related tasks to be completed") - # TODO check if ns is in a proper status + # for backward compatibility + if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict): + nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values()) + db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"] + self.update_db_2("nsrs", nsr_id, db_nsr_update) + primitive = db_nslcmop["operationParams"]["primitive"] primitive_params = db_nslcmop["operationParams"]["primitive_params"] - result, result_detail = await self._ns_execute_primitive(nsr_lcm, nsr_name, vnf_index, vdu_id, 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() @@ -1186,16 +1555,20 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() - if db_nslcmop_update: - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - if db_nsr: - db_nsr_update["_admin.nslcmop"] = None - self.update_db_2("nsrs", nsr_id, db_nsr_update) + try: + if db_nslcmop_update: + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + if db_nsr: + db_nsr_update["_admin.nslcmop"] = None + self.update_db_2("nsrs", nsr_id, db_nsr_update) + except DbException as e: + self.logger.error(logging_text + "Cannot update database: {}".format(e)) self.logger.debug(logging_text + "Exit") 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") @@ -1215,11 +1588,13 @@ class NsLcm(LcmBase): scale_process = None old_operational_status = "" old_config_status = "" + vnfr_scaled = False try: step = "Getting nslcmop from database" 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}) + old_operational_status = db_nsr["operational-status"] old_config_status = db_nsr["config-status"] @@ -1237,13 +1612,19 @@ class NsLcm(LcmBase): step = "Parsing scaling parameters" db_nsr_update["operational-status"] = "scaling" self.update_db_2("nsrs", nsr_id, db_nsr_update) - nsr_lcm = db_nsr["_admin"].get("deployed") - RO_nsr_id = nsr_lcm["RO"]["nsr_id"] + nsr_deployed = db_nsr["_admin"].get("deployed") + RO_nsr_id = nsr_deployed["RO"]["nsr_id"] vnf_index = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["member-vnf-index"] scaling_group = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"] scaling_type = db_nslcmop["operationParams"]["scaleVnfData"]["scaleVnfType"] # scaling_policy = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"].get("scaling-policy") + # for backward compatibility + if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict): + nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values()) + db_nsr_update["_admin.deployed.VCA"] = nsr_deployed["VCA"] + self.update_db_2("nsrs", nsr_id, db_nsr_update) + 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" @@ -1293,11 +1674,12 @@ class NsLcm(LcmBase): vdu_scaling_info["vdu-create"][vdu_scale_info["vdu-id-ref"]] = vdu_scale_info.get("count", 1) elif scaling_type == "SCALE_IN": # count if min-instance-count is reached + min_instance_count = 0 if "min-instance-count" in scaling_descriptor and scaling_descriptor["min-instance-count"] is not None: min_instance_count = int(scaling_descriptor["min-instance-count"]) - if nb_scale_op <= min_instance_count: - raise LcmException("reached the limit of {} (min-instance-count) scaling-in operations for the " - "scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group)) + if nb_scale_op <= min_instance_count: + raise LcmException("reached the limit of {} (min-instance-count) scaling-in operations for the " + "scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group)) nb_scale_op = nb_scale_op - 1 vdu_scaling_info["scaling_direction"] = "IN" vdu_scaling_info["vdu-delete"] = {} @@ -1307,10 +1689,12 @@ class NsLcm(LcmBase): vdu_scaling_info["vdu-delete"][vdu_scale_info["vdu-id-ref"]] = vdu_scale_info.get("count", 1) # update VDU_SCALING_INFO with the VDUs to delete ip_addresses + vdu_create = vdu_scaling_info.get("vdu-create") + vdu_delete = copy(vdu_scaling_info.get("vdu-delete")) if vdu_scaling_info["scaling_direction"] == "IN": for vdur in reversed(db_vnfr["vdur"]): - if vdu_scaling_info["vdu-delete"].get(vdur["vdu-id-ref"]): - vdu_scaling_info["vdu-delete"][vdur["vdu-id-ref"]] -= 1 + if vdu_delete.get(vdur["vdu-id-ref"]): + vdu_delete[vdur["vdu-id-ref"]] -= 1 vdu_scaling_info["vdu"].append({ "name": vdur["name"], "vdu_id": vdur["vdu-id-ref"], @@ -1322,7 +1706,7 @@ class NsLcm(LcmBase): "ip_address": interface["ip-address"], "mac_address": interface.get("mac-address"), }) - del vdu_scaling_info["vdu-delete"] + vdu_delete = vdu_scaling_info.pop("vdu-delete") # execute primitive service PRE-SCALING step = "Executing pre-scale vnf-config-primitive" @@ -1333,26 +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_lcm, vnf_index, - 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": @@ -1399,14 +1783,18 @@ class NsLcm(LcmBase): elif ns_status == "BUILD": detailed_status = step + "; {}".format(ns_status_info) elif ns_status == "ACTIVE": - step = detailed_status = "Waiting for management IP address reported by the VIM" + step = detailed_status = \ + "Waiting for management IP address reported by the VIM. Updating VNFRs" + if not vnfr_scaled: + self.scale_vnfr(db_vnfr, vdu_create=vdu_create, vdu_delete=vdu_delete) + vnfr_scaled = True try: desc = await RO.show("ns", RO_nsr_id) - nsr_lcm["nsr_ip"] = RO.get_ns_vnf_info(desc) + # nsr_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc) + self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc) break - except ROclient.ROClientException as e: - if e.http_code != 409: # IP address is not ready return code is 409 CONFLICT - raise e + except LcmExceptionNoMgmtIP: + pass else: assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) if detailed_status != detailed_status_old: @@ -1418,9 +1806,6 @@ class NsLcm(LcmBase): if deployment_timeout <= 0: raise ROclient.ROClientException("Timeout waiting ns to be ready") - step = "Updating VNFRs" - self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc) - # update VDU_SCALING_INFO with the obtained ip_addresses if vdu_scaling_info["scaling_direction"] == "OUT": for vdur in reversed(db_vnfr["vdur"]): @@ -1452,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='{}']:" @@ -1471,8 +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_lcm, vnf_index, - 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": @@ -1514,15 +1898,19 @@ class NsLcm(LcmBase): db_nsr_update["operational-status"] = "failed" db_nsr_update["detailed-status"] = "FAILED scaling nslcmop={} {}: {}".format(nslcmop_id, step, exc) - if db_nslcmop_update: - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - if db_nsr: - db_nsr_update["_admin.nslcmop"] = None - self.update_db_2("nsrs", nsr_id, db_nsr_update) + try: + if db_nslcmop and db_nslcmop_update: + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + if db_nsr: + db_nsr_update["_admin.nslcmop"] = None + self.update_db_2("nsrs", nsr_id, db_nsr_update) + except DbException as e: + self.logger.error(logging_text + "Cannot update database: {}".format(e)) 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})