X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=ce5dcf3fa1715567c02d1d87254dec2a6fefb02f;hb=73d8bd00fd53c8864fa0803f2ae48e93fb06c791;hp=d7277e7f1b5e125e1834e5118cf12cc9d6d6474d;hpb=12650ecdd976edea3b425603398fa1661a455a24;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index d7277e7..ce5dcf3 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -20,16 +20,16 @@ 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, LcmExceptionNoMgmtIP, LcmBase +from osm_lcm import ROclient +from osm_lcm.lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase from osm_common.dbbase import DbException from osm_common.fsbase import FsException -from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed + +from n2vc.n2vc_juju_conn import N2VCJujuConnector from copy import copy, deepcopy from http import HTTPStatus @@ -53,7 +53,7 @@ def get_iterable(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. + Update 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 @@ -67,11 +67,30 @@ def populate_dict(target_dict, key_list, value): target_dict[key_list[-1]] = value +def deep_get(target_dict, key_list): + """ + Get a value from target_dict entering in the nested keys. If keys does not exist, it returns None + Example target_dict={a: {b: 5}}; key_list=[a,b] returns 5; both key_list=[a,b,c] and key_list=[f,h] return None + :param target_dict: dictionary to be read + :param key_list: list of keys to read from target_dict + :return: The wanted value if exist, None otherwise + """ + for key in key_list: + if not isinstance(target_dict, dict) or key not in target_dict: + return None + target_dict = target_dict[key] + return target_dict + + 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 + total_deploy_timeout = 2 * 3600 # global timeout for deployment + timeout_charm_delete = 10 * 60 + timeout_primitive = 10 * 60 # timeout for primitive execution + + SUBOPERATION_STATUS_NOT_FOUND = -1 + SUBOPERATION_STATUS_NEW = -2 + SUBOPERATION_STATUS_SKIP = -3 def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop): """ @@ -79,28 +98,64 @@ class NsLcm(LcmBase): :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', :return: None """ - # logging - self.logger = logging.getLogger('lcm.ns') + super().__init__( + db=db, + msg=msg, + fs=fs, + logger=logging.getLogger('lcm.ns') + ) + self.loop = loop self.lcm_tasks = lcm_tasks - - super().__init__(db, msg, fs, self.logger) - self.ro_config = ro_config - - self.n2vc = N2VC( + self.vca_config = vca_config + if 'pubkey' in self.vca_config: + self.vca_config['public_key'] = self.vca_config['pubkey'] + if 'cacert' in self.vca_config: + self.vca_config['ca_cert'] = self.vca_config['cacert'] + + # create N2VC connector + self.n2vc = N2VCJujuConnector( + db=self.db, + fs=self.fs, log=self.logger, - server=vca_config['host'], - port=vca_config['port'], - user=vca_config['user'], - secret=vca_config['secret'], - # TODO: This should point to the base folder where charms are stored, - # if there is a common one (like object storage). Otherwise, leave - # it unset and pass it via DeployCharms - # artifacts=vca_config[''], - artifacts=None, + loop=self.loop, + url='{}:{}'.format(self.vca_config['host'], self.vca_config['port']), + username=self.vca_config.get('user', None), + vca_config=self.vca_config, + on_update_db=self._on_update_n2vc_db + # TODO + # New N2VC argument + # api_proxy=vca_config.get('apiproxy') ) + # create RO client + self.RO = ROclient.ROClient(self.loop, **self.ro_config) + + def _on_update_n2vc_db(self, table, filter, path, updated_data): + + self.logger.debug('_on_update_n2vc_db(table={}, filter={}, path={}, updated_data={})' + .format(table, filter, path, updated_data)) + + # write NS status to database + # try: + # # nsrs_id = filter.get('_id') + # # get ns record + # nsr = self.db.get_one(table=table, q_filter=filter) + # # get VCA deployed list + # vca_list = deep_get(target_dict=nsr, key_list=('_admin', 'deployed', 'VCA')) + # # get RO deployed + # ro_list = deep_get(target_dict=nsr, key_list=('_admin', 'deployed', 'RO')) + # for vca in vca_list: + # status = vca.get('status') + # detailed_status = vca.get('detailed-status') + # for ro in ro_list: + # pass + # + # except Exception as e: + # self.logger.error('_on_update_n2vc_db(table={},filter={},path={},updated_data={}) Error updating db: {}' + # .format(table, filter, path, updated_data, e)) + 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 @@ -157,84 +212,6 @@ class NsLcm(LcmBase): 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): - """ - Callback both for charm status change and task completion - :param model_name: Charm model name - :param application_name: Charm application name - :param status: Can be - - blocked: The unit needs manual intervention - - maintenance: The unit is actively deploying/configuring - - waiting: The unit is waiting for another charm to be ready - - active: The unit is deployed, configured, and ready - - error: The charm has failed and needs attention. - - terminated: The charm has been destroyed - - removing, - - removed - :param message: detailed message error - :param n2vc_info: dictionary with information shared with instantiate task. It contains: - nsr_id: - nslcmop_id: - lcmOperationType: currently "instantiate" - deployed: dictionary with {: {operational-status: , detailed-status: }} - db_update: dictionary to be filled with the changes to be wrote to database with format key.key.key: value - n2vc_event: event used to notify instantiation task that some change has been produced - :param task: None for charm status change, or task for completion task callback - :return: - """ - try: - nsr_id = n2vc_info["nsr_id"] - deployed = n2vc_info["deployed"] - db_nsr_update = n2vc_info["db_update"] - nslcmop_id = n2vc_info["nslcmop_id"] - ns_operation = n2vc_info["lcmOperationType"] - n2vc_event = n2vc_info["n2vc_event"] - logging_text = "Task ns={} {}={} [n2vc_callback] application={}".format(nsr_id, ns_operation, nslcmop_id, - application_name) - 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(vca_index)] = "error" - vca_deployed['detailed-status'] = "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(vca_index)] = "error" - vca_deployed['detailed-status'] = 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={} 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(vca_index)] = status - vca_deployed['detailed-status'] = 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 - # wake up instantiate task - n2vc_event.set() - 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, n2vc_key_list): """ Creates a RO ns descriptor from OSM ns_instantiate params @@ -242,6 +219,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 @@ -258,6 +236,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: @@ -281,38 +274,43 @@ 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: - 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"): + + n2vc_key_list = n2vc_key_list or [] + for vnfd_ref, vnfd in vnfd_dict.items(): + vdu_needed_access = [] + mgmt_cp = None + if vnfd.get("vnf-configuration"): + ssh_required = deep_get(vnfd, ("vnf-configuration", "config-access", "ssh-access", "required")) + if ssh_required and 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"): + ssh_required = deep_get(vdu, ("vdu-configuration", "config-access", "ssh-access", "required")) + if ssh_required: 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 + 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 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"] @@ -402,6 +400,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): @@ -426,6 +428,12 @@ class NsLcm(LcmBase): 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 vld_params.get("ns-net"): + if isinstance(vld_params["ns-net"], dict): + for vld_id, instance_scenario_id in vld_params["ns-net"].items(): + RO_vld_ns_net = {"instance_scenario_id": instance_scenario_id, "osm_id": vld_id} + if RO_vld_ns_net: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "use-network"), RO_vld_ns_net) if "vnfd-connection-point-ref" in vld_params: for cp_params in vld_params["vnfd-connection-point-ref"]: # look for interface @@ -539,7 +547,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)) @@ -554,7 +562,10 @@ 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] + else: + vdur["ip-address"] = None vdur["vdu-id-ref"] = vdur_RO.get("vdu_osm_id") vdur["name"] = vdur_RO.get("vim_name") vdur["status"] = vdur_RO.get("status") @@ -567,12 +578,13 @@ class NsLcm(LcmBase): 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"])) + "from VIM 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"])) + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} count_index={} from " + "VIM 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"): @@ -585,468 +597,685 @@ class NsLcm(LcmBase): vnfr_update["vld.{}".format(vld_index)] = vld break else: - raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vld={} at RO info".format( + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vld={} from VIM info".format( vnf_index, vld["id"])) 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)) + raise LcmException("ns_update_vnfr: Not found member_vnf_index={} from VIM info".format(vnf_index)) + + async def instantiate_RO(self, logging_text, nsr_id, nsd, db_nsr, + db_nslcmop, db_vnfrs, db_vnfds_ref, n2vc_key_list): + + db_nsr_update = {} + RO_descriptor_number = 0 # number of descriptors created at RO + vnf_index_2_RO_id = {} # map between vnfd/nsd id to the id used at RO + start_deploy = time() + ns_params = db_nslcmop.get("operationParams") + + # deploy RO + + # get vnfds, instantiate at RO + 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, 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 self.RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO}) + if vnfd_list: + 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, db_vnfrs[c_vnf["member-vnf-index"]]. + get("additionalParamsForVnf"), nsr_id) + desc = await self.RO.create("vnfd", descriptor=vnfd_RO) + 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_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_ref[:23]) + RO_descriptor_number += 1 + nsd_list = await self.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_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.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 self.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_ref, RO_nsd_uuid)) + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + # Crate ns at RO + # if present use it unless in error status + RO_nsr_id = deep_get(db_nsr, ("_admin", "deployed", "RO", "nsr_id")) + if RO_nsr_id: + try: + step = db_nsr_update["detailed-status"] = "Looking for existing ns at RO" + # self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) + desc = await self.RO.show("ns", RO_nsr_id) + except ROclient.ROClientException as e: + if e.http_code != HTTPStatus.NOT_FOUND: + raise + RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None + if RO_nsr_id: + ns_status, ns_status_info = self.RO.check_ns_status(desc) + db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status + if ns_status == "ERROR": + step = db_nsr_update["detailed-status"] = "Deleting ns at RO. RO_ns_id={}".format(RO_nsr_id) + self.logger.debug(logging_text + step) + await self.RO.delete("ns", RO_nsr_id) + RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None + if not RO_nsr_id: + step = db_nsr_update["detailed-status"] = "Checking dependencies" + # self.logger.debug(logging_text + step) + + # check if VIM is creating and wait look if previous tasks in process + task_name, task_dependency = self.lcm_tasks.lookfor_related("vim_account", ns_params["vimAccountId"]) + if task_dependency: + step = "Waiting for related tasks to be completed: {}".format(task_name) + self.logger.debug(logging_text + step) + await asyncio.wait(task_dependency, timeout=3600) + if ns_params.get("vnf"): + for vnf in ns_params["vnf"]: + if "vimAccountId" in vnf: + task_name, task_dependency = self.lcm_tasks.lookfor_related("vim_account", + vnf["vimAccountId"]) + if task_dependency: + step = "Waiting for related tasks to be completed: {}".format(task_name) + self.logger.debug(logging_text + step) + 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, db_vnfds_ref, n2vc_key_list) + + step = db_nsr_update["detailed-status"] = "Deploying ns at VIM" + desc = await self.RO.create("ns", descriptor=RO_ns_params, name=db_nsr["name"], scenario=RO_nsd_uuid) + RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = desc["uuid"] + db_nsr_update["_admin.nsState"] = "INSTANTIATED" + db_nsr_update["_admin.deployed.RO.nsr_status"] = "BUILD" + self.logger.debug(logging_text + "ns created at RO. RO_id={}".format(desc["uuid"])) + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + # wait until NS is ready + step = ns_status_detailed = detailed_status = "Waiting VIM to deploy ns. RO_ns_id={}".format(RO_nsr_id) + detailed_status_old = None + self.logger.debug(logging_text + step) + + while time() <= start_deploy + self.total_deploy_timeout: + desc = await self.RO.show("ns", RO_nsr_id) + ns_status, ns_status_info = self.RO.check_ns_status(desc) + 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. Updating VNFRs" + try: + self.ns_update_vnfr(db_vnfrs, desc) + break + 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) + else: # total_deploy_timeout + raise ROclient.ROClientException("Timeout waiting ns to be ready") + + step = "Updating NSR" + self.ns_update_nsr(db_nsr_update, db_nsr, desc) + + db_nsr_update["operational-status"] = "running" + db_nsr["detailed-status"] = "Deployed at VIM" + db_nsr_update["detailed-status"] = "Deployed at VIM" + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + step = "Deployed at VIM" + self.logger.debug(logging_text + step) + + # wait for ip addres at RO, and optionally, insert public key in virtual machine + # returns IP address + async def insert_key_ro(self, logging_text, nsr_id, vnfr_id, vdu_id, vdu_index, pub_key=None, user=None): + + ro_nsr_id = None + ip_address = None + nb_tries = 0 + target_vdu_id = None + + while True: + + await asyncio.sleep(10, loop=self.loop) + # wait until NS is deployed at RO + if not ro_nsr_id: + db_nsrs = self.db.get_one("nsrs", {"_id": nsr_id}) + ro_nsr_id = deep_get(db_nsrs, ("_admin", "deployed", "RO", "nsr_id")) + if not ro_nsr_id: + continue + + # get ip address + if not target_vdu_id: + db_vnfr = self.db.get_one("vnfrs", {"_id": vnfr_id}) + if not vdu_id: + ip_address = db_vnfr.get("ip-address") + if not ip_address: + continue + for vdur in get_iterable(db_vnfr, "vdur"): + if (vdur["vdu-id-ref"] == vdu_id and vdur["count-index"] == vdu_index) or \ + (ip_address and vdur.get("ip-address") == ip_address): + if vdur["status"] == "ACTIVE": + target_vdu_id = vdur["vdu-id-ref"] + elif vdur["status"] == "ERROR": + raise LcmException("Cannot inject ssh-key because target VM is in error state") + break + else: + raise LcmException("Not found vnfr_id={}, vdu_index={}, vdu_index={}".format( + vnfr_id, vdu_id, vdu_index + )) + + if not target_vdu_id: + continue + + # inject public key into machine + if pub_key and user: + try: + ro_vm_id = "{}-{}".format(db_vnfr["member-vnf-index-ref"], target_vdu_id) # TODO add vdu_index + result_dict = await self.RO.create_action( + item="ns", + item_id_name=ro_nsr_id, + descriptor={"add_public_key": pub_key, "vms": [ro_vm_id], "user": user} + ) + # result_dict contains the format {VM-id: {vim_result: 200, description: text}} + if not result_dict or not isinstance(result_dict, dict): + raise LcmException("Unknown response from RO when injecting key") + for result in result_dict.values(): + if result.get("vim_result") == 200: + break + else: + raise ROclient.ROClientException("error injecting key: {}".format( + result.get("description"))) + break + except ROclient.ROClientException as e: + nb_tries += 1 + if nb_tries >= 10: + raise LcmException("Reaching max tries injecting key. Error: {}".format(e)) + self.logger.debug(logging_text + "error injecting key: {}".format(e)) + else: + # no user or pub_key ---> break while true + break + + return ip_address + + async def instantiate_N2VC(self, logging_text, vca_index, nsi_id, db_nsr, db_vnfr, vdu_id, + vdu_index, config_descriptor, deploy_params, base_folder): + nsr_id = db_nsr["_id"] + db_update_entry = "_admin.deployed.VCA.{}.".format(vca_index) + vca_deployed = db_nsr["_admin"]["deployed"]["VCA"][vca_index] + db_dict = { + 'collection': 'nsrs', + 'filter': {'_id': nsr_id}, + 'path': db_update_entry + } + + logging_text += "member_vnf_index={} vdu_id={}, vdu_index={} "\ + .format(db_vnfr["member-vnf-index-ref"], vdu_id, vdu_index) + + step = "" + try: + vnfr_id = None + if db_vnfr: + vnfr_id = db_vnfr["_id"] + + namespace = "{nsi}.{ns}".format( + nsi=nsi_id if nsi_id else "", + ns=nsr_id) + if vnfr_id: + namespace += "." + vnfr_id + if vdu_id: + namespace += ".{}-{}".format(vdu_id, vdu_index or 0) + + # Get artifact path + artifact_path = "/{}/{}/charms/{}".format( + base_folder["folder"], + base_folder["pkg-dir"], + config_descriptor["juju"]["charm"] + ) + + is_proxy_charm = deep_get(config_descriptor, ('juju', 'charm')) is not None + if deep_get(config_descriptor, ('juju', 'proxy')) is False: + is_proxy_charm = False + + # n2vc_redesign STEP 3.1 + + # find old ee_id if exists + ee_id = vca_deployed.get("ee_id") + + # create or register execution environment in VCA + if is_proxy_charm: + step = "create execution environment" + self.logger.debug(logging_text + step) + ee_id, credentials = await self.n2vc.create_execution_environment( + namespace=namespace, + reuse_ee_id=ee_id, + db_dict=db_dict + ) + + else: + step = "register execution envioronment" + # TODO wait until deployed by RO, when IP address has been filled. By pooling???? + credentials = {} # TODO db_credentials["ip_address"] + # get username + # TODO remove this when changes on IM regarding config-access:ssh-access:default-user were + # merged. Meanwhile let's get username from initial-config-primitive + if config_descriptor.get("initial-config-primitive"): + for param in config_descriptor["initial-config-primitive"][0].get("parameter", ()): + if param["name"] == "ssh-username": + credentials["username"] = param["value"] + if config_descriptor.get("config-access") and config_descriptor["config-access"].get("ssh-access"): + if config_descriptor["config-access"]["ssh-access"].get("required"): + credentials["username"] = \ + config_descriptor["config-access"]["ssh-access"].get("default-user") + + # n2vc_redesign STEP 3.2 + self.logger.debug(logging_text + step) + ee_id = await self.n2vc.register_execution_environment( + credentials=credentials, + namespace=namespace, + db_dict=db_dict + ) + + # for compatibility with MON/POL modules, the need model and application name at database + # TODO ask to N2VC instead of assuming the format "model_name.application_name" + ee_id_parts = ee_id.split('.') + model_name = ee_id_parts[0] + application_name = ee_id_parts[1] + self.update_db_2("nsrs", nsr_id, {db_update_entry + "model": model_name, + db_update_entry + "application": application_name, + db_update_entry + "ee_id": ee_id}) + + # n2vc_redesign STEP 3.3 + # TODO check if already done + step = "Install configuration Software" + self.logger.debug(logging_text + step) + await self.n2vc.install_configuration_sw( + ee_id=ee_id, + artifact_path=artifact_path, + db_dict=db_dict + ) + + # if SSH access is required, then get execution environment SSH public + required = deep_get(config_descriptor, ("config-access", "ssh-access", "required")) + if is_proxy_charm and required: + + pub_key = None + pub_key = await self.n2vc.get_ee_ssh_public__key( + ee_id=ee_id, + db_dict=db_dict + ) + + user = deep_get(config_descriptor, ("config-access", "ssh-access", "default-user")) + # insert pub_key into VM + # n2vc_redesign STEP 5.1 + step = "Insert public key into VM" + self.logger.debug(logging_text + step) + + # wait for RO (ip-address) + rw_mgmt_ip = await self.insert_key_ro( + logging_text=logging_text, + nsr_id=nsr_id, + vnfr_id=vnfr_id, + vdu_id=vdu_id, + vdu_index=vdu_index, + user=user, + pub_key=pub_key + ) + + # store rw_mgmt_ip in deploy params for later substitution + self.logger.debug('rw_mgmt_ip={}'.format(rw_mgmt_ip)) + deploy_params["rw_mgmt_ip"] = rw_mgmt_ip + + # n2vc_redesign STEP 6 Execute initial config primitive + initial_config_primitive_list = config_descriptor.get('initial-config-primitive', []) + step = 'execute initial config primitive' + + # sort initial config primitives by 'seq' + try: + initial_config_primitive_list.sort(key=lambda val: int(val['seq'])) + except Exception: + self.logger.warn(logging_text + 'Cannot sort by "seq" field' + step) + + for initial_config_primitive in initial_config_primitive_list: + # TODO check if already done + primitive_params_ = self._map_primitive_params(initial_config_primitive, {}, deploy_params) + step = "execute primitive '{}' params '{}'".format(initial_config_primitive["name"], primitive_params_) + self.logger.debug(logging_text + step) + await self.n2vc.exec_primitive( + ee_id=ee_id, + primitive_name=initial_config_primitive["name"], + params_dict=primitive_params_, + db_dict=db_dict + ) + # TODO register in database that primitive is done + + step = "instantiated at VCA" + self.logger.debug(logging_text + step) + + except Exception as e: # TODO not use Exception but N2VC exception + raise Exception("{} {}".format(step, e)) from e + # TODO raise N2VC exception with 'step' extra information async def instantiate(self, nsr_id, nslcmop_id): + """ + + :param nsr_id: ns instance to deploy + :param nslcmop_id: operation to run + :return: + """ + + # Try to lock HA task here + task_is_locked_by_me = self.lcm_tasks.lock_HA('ns', 'nslcmops', nslcmop_id) + if not task_is_locked_by_me: + self.logger.debug('instantiate() task is not locked by me') + return + logging_text = "Task ns={} instantiate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") + # get all needed from database - start_deploy = time() + + # database nsrs record db_nsr = None + + # database nslcmops record db_nslcmop = None + + # update operation on nsrs db_nsr_update = {"_admin.nslcmop": nslcmop_id} + + # update operation on nslcmops db_nslcmop_update = {} + nslcmop_operation_state = None - db_vnfrs = {} - RO_descriptor_number = 0 # number of descriptors created at RO - vnf_index_2_RO_id = {} # map between vnfd/nsd id to the id used at RO - n2vc_info = {} + db_vnfrs = {} # vnf's info indexed by member-index + # n2vc_info = {} + # n2vc_key_list = [] # list of public keys to be injected as authorized to VMs + task_instantiation_list = [] exc = None try: + # wait for any previous tasks in process + step = "Waiting for previous tasks" + await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) + + # STEP 0: Reading database (nslcmops, nsrs, nsds, vnfrs, vnfds) + + # read from db: operation step = "Getting nslcmop={} from db".format(nslcmop_id) db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) + + # read from db: ns step = "Getting nsr={} from db".format(nsr_id) db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) - ns_params = db_nslcmop.get("operationParams") + # nsd is replicated into ns (no db read) nsd = db_nsr["nsd"] - nsr_name = db_nsr["name"] # TODO short-name?? - - # look if previous tasks in process - task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id) - if task_dependency: - step = db_nslcmop_update["detailed-status"] = \ - "Waiting for related tasks to be completed: {}".format(task_name) - self.logger.debug(logging_text + step) - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - _, pending = await asyncio.wait(task_dependency, timeout=3600) - if pending: - raise LcmException("Timeout waiting related tasks to be completed") + # nsr_name = db_nsr["name"] # TODO short-name?? + # read from db: vnf's of this ns step = "Getting vnfrs from db" db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) - db_vnfds_ref = {} - db_vnfds = {} + + # read from db: vnfd's for every vnf + db_vnfds_ref = {} # every vnfd data indexed by vnf name + db_vnfds = {} # every vnfd data indexed by vnf id + db_vnfds_index = {} # every vnfd data indexed by vnf member-index + + # for each vnf in ns, read vnfd for vnfr in db_vnfrs_list: - db_vnfrs[vnfr["member-vnf-index-ref"]] = vnfr - vnfd_id = vnfr["vnfd-id"] - vnfd_ref = vnfr["vnfd-ref"] + db_vnfrs[vnfr["member-vnf-index-ref"]] = vnfr # vnf's dict indexed by member-index: '1', '2', etc + vnfd_id = vnfr["vnfd-id"] # vnfd uuid for this vnf + vnfd_ref = vnfr["vnfd-ref"] # vnfd name for this vnf + # if we haven't this vnfd, read it from db if vnfd_id not in db_vnfds: + # read from cb 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 + # store vnfd + db_vnfds_ref[vnfd_ref] = vnfd # vnfd's indexed by name + db_vnfds[vnfd_id] = vnfd # vnfd's indexed by id + db_vnfds_index[vnfr["member-vnf-index-ref"]] = db_vnfds[vnfd_id] # vnfd's indexed by member-index + + # 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 + # add _admin.deployed.VCA to db_nsr dictionary, value=vca_deployed_list + populate_dict(db_nsr, ("_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 + populate_dict(db_nsr, ("_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"): + + if not isinstance(deep_get(db_nsr, ("_admin", "deployed", "RO", "vnfd")), list): 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 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, 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: - 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, db_vnfrs[c_vnf["member-vnf-index"]]. - get("additionalParamsForVnf"), nsr_id) - desc = await RO.create("vnfd", descriptor=vnfd_RO) - 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_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_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_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.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_ref, RO_nsd_uuid)) - self.update_db_2("nsrs", nsr_id, db_nsr_update) - - # Crate ns at RO - # if present use it unless in error status - RO_nsr_id = db_nsr["_admin"].get("deployed", {}).get("RO", {}).get("nsr_id") - if RO_nsr_id: - try: - step = db_nsr_update["detailed-status"] = "Looking for existing ns at RO" - # self.logger.debug(logging_text + step + " RO_ns_id={}".format(RO_nsr_id)) - desc = await RO.show("ns", RO_nsr_id) - except ROclient.ROClientException as e: - if e.http_code != HTTPStatus.NOT_FOUND: - raise - RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None - if RO_nsr_id: - ns_status, ns_status_info = RO.check_ns_status(desc) - db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status - if ns_status == "ERROR": - step = db_nsr_update["detailed-status"] = "Deleting ns at RO. RO_ns_id={}".format(RO_nsr_id) - self.logger.debug(logging_text + step) - await RO.delete("ns", RO_nsr_id) - RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = None - if not RO_nsr_id: - step = db_nsr_update["detailed-status"] = "Checking dependencies" - # self.logger.debug(logging_text + step) - - # check if VIM is creating and wait look if previous tasks in process - task_name, task_dependency = self.lcm_tasks.lookfor_related("vim_account", ns_params["vimAccountId"]) - if task_dependency: - step = "Waiting for related tasks to be completed: {}".format(task_name) - self.logger.debug(logging_text + step) - await asyncio.wait(task_dependency, timeout=3600) - if ns_params.get("vnf"): - for vnf in ns_params["vnf"]: - if "vimAccountId" in vnf: - task_name, task_dependency = self.lcm_tasks.lookfor_related("vim_account", - vnf["vimAccountId"]) - if task_dependency: - step = "Waiting for related tasks to be completed: {}".format(task_name) - self.logger.debug(logging_text + step) - await asyncio.wait(task_dependency, timeout=3600) - - step = db_nsr_update["detailed-status"] = "Checking instantiation parameters" - - # feature 1429. Add n2vc public key to needed VMs - n2vc_key = await self.n2vc.GetPublicKey() - 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, - name=db_nsr["name"], - scenario=RO_nsd_uuid) - RO_nsr_id = db_nsr_update["_admin.deployed.RO.nsr_id"] = desc["uuid"] - db_nsr_update["_admin.nsState"] = "INSTANTIATED" - db_nsr_update["_admin.deployed.RO.nsr_status"] = "BUILD" - self.logger.debug(logging_text + "ns created at RO. RO_id={}".format(desc["uuid"])) - self.update_db_2("nsrs", nsr_id, db_nsr_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) - - 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 - 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. Updating VNFRs" - try: - self.ns_update_vnfr(db_vnfrs, desc) - break - 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) - else: # total_deploy_timeout - raise ROclient.ROClientException("Timeout waiting ns to be ready") - - 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) - - # 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, 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 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: - # self.logger.debug("Logging into N2VC...") - # task = asyncio.ensure_future(self.n2vc.login()) - # yield from asyncio.wait_for(task, 30.0) - # self.logger.debug("Logged into N2VC!") - - # # await self.n2vc.login() - - # Note: The charm needs to exist on disk at the location - # specified by charm_path. - base_folder = vnfd["_admin"]["storage"] - storage_params = self.fs.get_params() - charm_path = "{}{}/{}/charms/{}".format( - storage_params["path"], - base_folder["folder"], - base_folder["pkg-dir"], - proxy_charm - ) - - # 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 - if vdu_id: - 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, - "application": application_name, - "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, - proxy_charm)) - if not n2vc_info: - n2vc_info["nsr_id"] = nsr_id - n2vc_info["nslcmop_id"] = nslcmop_id - n2vc_info["n2vc_event"] = asyncio.Event(loop=self.loop) - n2vc_info["lcmOperationType"] = "instantiate" - n2vc_info["deployed"] = vca_deployed_list - n2vc_info["db_update"] = db_nsr_update - task = asyncio.ensure_future( - self.n2vc.DeployCharms( - model_name, # The network service name - application_name, # The application name - vnfd, # The vnf descriptor - charm_path, # Path to charm - charm_params, # Runtime params, like mgmt ip - {}, # for native charms only - self.n2vc_callback, # Callback for status changes - n2vc_info, # Callback parameter - None, # Callback parameter (task) - ) + # n2vc_redesign STEP 1 Get VCA public ssh-key + # feature 1429. Add n2vc public key to needed VMs + n2vc_key = await self.n2vc.get_public_key() + + # n2vc_redesign STEP 2 Deploy Network Scenario + task_ro = asyncio.ensure_future( + self.instantiate_RO( + logging_text=logging_text, + nsr_id=nsr_id, + nsd=nsd, + db_nsr=db_nsr, + db_nslcmop=db_nslcmop, + db_vnfrs=db_vnfrs, + db_vnfds_ref=db_vnfds_ref, + n2vc_key_list=[n2vc_key] ) - task.add_done_callback(functools.partial(self.n2vc_callback, model_name, application_name, None, None, - n2vc_info)) - self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "create_charm:" + application_name, task) + ) + self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_RO", task_ro) + task_instantiation_list.append(task_ro) - step = "Looking for needed vnfd to configure" + # n2vc_redesign STEP 3 to 6 Deploy N2VC + step = "Looking for needed vnfd to configure with proxy charm" self.logger.debug(logging_text + step) + nsi_id = None # TODO put nsi_id when this nsr belongs to a NSI + # get_iterable() returns a value from a dict or empty tuple if key does not exist 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 = db_vnfds_ref[vnfd_id] + member_vnf_index = str(c_vnf["member-vnf-index"]) + db_vnfr = db_vnfrs[member_vnf_index] + base_folder = vnfd["_admin"]["storage"] + vdu_id = None + vdu_index = 0 + vdu_name = None # 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(): + deploy_params = {} + if db_vnfr.get("additionalParamsForVnf"): + deploy_params = db_vnfr["additionalParamsForVnf"].copy() + for k, v in deploy_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"] - - if proxy_charm: - 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. - await self.n2vc.login() - deploy_charm(vnf_index, None, None, None, charm_params, n2vc_info) - number_to_configure += 1 + deploy_params[k] = yaml.safe_load(v[7:]) + + descriptor_config = vnfd.get("vnf-configuration") + if descriptor_config and descriptor_config.get("juju"): + self._deploy_n2vc( + logging_text=logging_text, + db_nsr=db_nsr, + db_vnfr=db_vnfr, + nslcmop_id=nslcmop_id, + nsr_id=nsr_id, + nsi_id=nsi_id, + vnfd_id=vnfd_id, + vdu_id=vdu_id, + member_vnf_index=member_vnf_index, + vdu_index=vdu_index, + vdu_name=vdu_name, + deploy_params=deploy_params, + descriptor_config=descriptor_config, + base_folder=base_folder, + task_instantiation_list=task_instantiation_list + ) # 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 - - if vdu_config and vdu_config.get("juju"): - proxy_charm = vdu_config["juju"]["charm"] - - if proxy_charm: - step = "connecting to N2VC to configure vdu {} from vnf {}".format(vdu["id"], vnf_index) - await self.n2vc.login() - 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 - - db_nsr_update["operational-status"] = "running" - configuration_failed = False - if number_to_configure: - old_status = "configuring: init: {}".format(number_to_configure) - db_nsr_update["config-status"] = old_status - db_nsr_update["detailed-status"] = old_status - db_nslcmop_update["detailed-status"] = old_status - - # wait until all are configured. - 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 - 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": - vca_deployed.pop("time_first_error", None) - vca_deployed.pop("status_first_error", None) - continue + for vdud in get_iterable(vnfd, 'vdu'): + vdu_id = vdud["id"] + descriptor_config = vdud.get('vdu-configuration') + if descriptor_config and descriptor_config.get("juju"): + # look for vdu index in the db_vnfr["vdu"] section + # for vdur_index, vdur in enumerate(db_vnfr["vdur"]): + # if vdur["vdu-id-ref"] == vdu_id: + # break + # else: + # raise LcmException("Mismatch vdu_id={} not found in the vnfr['vdur'] list for " + # "member_vnf_index={}".format(vdu_id, member_vnf_index)) + # vdu_name = vdur.get("name") + vdu_name = None + for vdu_index in range(int(vdud.get("count", 1))): + # TODO vnfr_params["rw_mgmt_ip"] = vdur["ip-address"] + self._deploy_n2vc( + logging_text=logging_text, + db_nsr=db_nsr, + db_vnfr=db_vnfr, + nslcmop_id=nslcmop_id, + nsr_id=nsr_id, + nsi_id=nsi_id, + vnfd_id=vnfd_id, + vdu_id=vdu_id, + member_vnf_index=member_vnf_index, + vdu_index=vdu_index, + vdu_name=vdu_name, + deploy_params=deploy_params, + descriptor_config=descriptor_config, + base_folder=base_folder, + task_instantiation_list=task_instantiation_list + ) + + # Check if this NS has a charm configuration + descriptor_config = nsd.get("ns-configuration") + if descriptor_config and descriptor_config.get("juju"): + vnfd_id = None + db_vnfr = None + member_vnf_index = None + vdu_id = None + vdu_index = 0 + vdu_name = None + # Get additional parameters + deploy_params = {} + if db_nsr.get("additionalParamsForNs"): + deploy_params = db_nsr["additionalParamsForNs"].copy() + for k, v in deploy_params.items(): + if isinstance(v, str) and v.startswith("!!yaml "): + deploy_params[k] = yaml.safe_load(v[7:]) + base_folder = nsd["_admin"]["storage"] + self._deploy_n2vc( + logging_text=logging_text, + db_nsr=db_nsr, + db_vnfr=db_vnfr, + nslcmop_id=nslcmop_id, + nsr_id=nsr_id, + nsi_id=nsi_id, + vnfd_id=vnfd_id, + vdu_id=vdu_id, + member_vnf_index=member_vnf_index, + vdu_index=vdu_index, + vdu_name=vdu_name, + deploy_params=deploy_params, + descriptor_config=descriptor_config, + base_folder=base_folder, + task_instantiation_list=task_instantiation_list + ) - all_active = False - if vca_status in ("error", "blocked"): - 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 - elif n2vc_error_text: - db_nsr_update["config-status"] = "failed" - error_text = "fail configuring " + ";".join(n2vc_error_text) - db_nsr_update["detailed-status"] = error_text - db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED_TEMP" - db_nslcmop_update["detailed-status"] = error_text - db_nslcmop_update["statusEnteredTime"] = time() - configuration_failed = True - break - else: - cs = "configuring: " - separator = "" - for status, num in status_map.items(): - cs += separator + "{}: {}".format(status, num) - separator = ", " - if old_status != cs: - db_nsr_update["config-status"] = cs - 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: + # Wait until all tasks of "task_instantiation_list" have been finished + + # while time() <= start_deploy + self.total_deploy_timeout: + error_text = None + timeout = 3600 # time() - start_deploy + task_instantiation_set = set(task_instantiation_list) # build a set with tasks + done = None + pending = None + if len(task_instantiation_set) > 0: + done, pending = await asyncio.wait(task_instantiation_set, timeout=timeout) + if pending: + error_text = "timeout" + for task in done: + if task.cancelled(): + if not error_text: + error_text = "cancelled" + elif task.done(): + exc = task.exception() + if exc: + error_text = str(exc) + + if error_text: + db_nsr_update["config-status"] = "failed" + error_text = "fail configuring " + error_text + db_nsr_update["detailed-status"] = error_text + db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED_TEMP" + db_nslcmop_update["detailed-status"] = error_text + db_nslcmop_update["statusEnteredTime"] = time() + else: # all is done db_nslcmop_update["operationState"] = nslcmop_operation_state = "COMPLETED" db_nslcmop_update["statusEnteredTime"] = time() @@ -1094,47 +1323,361 @@ class NsLcm(LcmBase): 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 + def _deploy_n2vc(self, logging_text, db_nsr, db_vnfr, nslcmop_id, nsr_id, nsi_id, vnfd_id, vdu_id, + member_vnf_index, vdu_index, vdu_name, deploy_params, descriptor_config, + base_folder, task_instantiation_list): + # launch instantiate_N2VC in a asyncio task and register task object + # Look where information of this charm is at database ._admin.deployed.VCA + # if not found, create one entry and update database + + # fill db_nsr._admin.deployed.VCA. + vca_index = -1 + for vca_index, vca_deployed in enumerate(db_nsr["_admin"]["deployed"]["VCA"]): + if not vca_deployed: + continue + if vca_deployed.get("member-vnf-index") == member_vnf_index and \ + vca_deployed.get("vdu_id") == vdu_id and \ + vca_deployed.get("vdu_count_index", 0) == vdu_index: + break + else: + # not found, create one. + vca_deployed = { + "member-vnf-index": member_vnf_index, + "vdu_id": vdu_id, + "vdu_count_index": vdu_index, + "operational-status": "init", # TODO revise + "detailed-status": "", # TODO revise + "step": "initial-deploy", # TODO revise + "vnfd_id": vnfd_id, + "vdu_name": vdu_name, + } + vca_index += 1 + self.update_db_2("nsrs", nsr_id, {"_admin.deployed.VCA.{}".format(vca_index): vca_deployed}) + db_nsr["_admin"]["deployed"]["VCA"].append(vca_deployed) + + # Launch task + task_n2vc = asyncio.ensure_future( + self.instantiate_N2VC( + logging_text=logging_text, + vca_index=vca_index, + nsi_id=nsi_id, + db_nsr=db_nsr, + db_vnfr=db_vnfr, + vdu_id=vdu_id, + vdu_index=vdu_index, + deploy_params=deploy_params, + config_descriptor=descriptor_config, + base_folder=base_folder, + ) + ) + self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_N2VC-{}".format(vca_index), task_n2vc) + task_instantiation_list.append(task_n2vc) + + # Check if this VNFD has a configured terminate action + def _has_terminate_config_primitive(self, vnfd): + vnf_config = vnfd.get("vnf-configuration") + if vnf_config and vnf_config.get("terminate-config-primitive"): + return True + else: + return False + + @staticmethod + def _get_terminate_config_primitive_seq_list(vnfd): + """ Get a numerically sorted list of the sequences for this VNFD's terminate action """ + # No need to check for existing primitive twice, already done before + vnf_config = vnfd.get("vnf-configuration") + seq_list = vnf_config.get("terminate-config-primitive") + # Get all 'seq' tags in seq_list, order sequences numerically, ascending. + seq_list_sorted = sorted(seq_list, key=lambda x: int(x['seq'])) + return seq_list_sorted - async def _wait_charm_destroyed(self, model, application, timeout): + @staticmethod + def _create_nslcmop(nsr_id, operation, params): """ - Wait until charm does not exist - :param model: - :param application: - :param timeout: - :return: True if not exist, False if timeout + Creates a ns-lcm-opp content to be stored at database. + :param nsr_id: internal id of the instance + :param operation: instantiate, terminate, scale, action, ... + :param params: user parameters for the operation + :return: dictionary following SOL005 format """ - while True: - if not await self.n2vc.HasApplication(model, application): - return True - if timeout < 0: - return False - await asyncio.sleep(10) - timeout -= 10 + # Raise exception if invalid arguments + if not (nsr_id and operation and params): + raise LcmException( + "Parameters 'nsr_id', 'operation' and 'params' needed to create primitive not provided") + now = time() + _id = str(uuid4()) + nslcmop = { + "id": _id, + "_id": _id, + # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK + "operationState": "PROCESSING", + "statusEnteredTime": now, + "nsInstanceId": nsr_id, + "lcmOperationType": operation, + "startTime": now, + "isAutomaticInvocation": False, + "operationParams": params, + "isCancelPending": False, + "links": { + "self": "/osm/nslcm/v1/ns_lcm_op_occs/" + _id, + "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsr_id, + } + } + return nslcmop + + def _get_terminate_primitive_params(self, seq, vnf_index): + primitive = seq.get('name') + primitive_params = {} + params = { + "member_vnf_index": vnf_index, + "primitive": primitive, + "primitive_params": primitive_params, + } + desc_params = {} + return self._map_primitive_params(seq, params, desc_params) + + # sub-operations + + def _reintent_or_skip_suboperation(self, db_nslcmop, op_index): + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + if (op.get('operationState') == 'COMPLETED'): + # b. Skip sub-operation + # _ns_execute_primitive() or RO.create_action() will NOT be executed + return self.SUBOPERATION_STATUS_SKIP + else: + # c. Reintent executing sub-operation + # The sub-operation exists, and operationState != 'COMPLETED' + # Update operationState = 'PROCESSING' to indicate a reintent. + operationState = 'PROCESSING' + detailed_status = 'In progress' + self._update_suboperation_status( + db_nslcmop, op_index, operationState, detailed_status) + # Return the sub-operation index + # _ns_execute_primitive() or RO.create_action() will be called from scale() + # with arguments extracted from the sub-operation + return op_index + + # Find a sub-operation where all keys in a matching dictionary must match + # Returns the index of the matching sub-operation, or SUBOPERATION_STATUS_NOT_FOUND if no match + def _find_suboperation(self, db_nslcmop, match): + if (db_nslcmop and match): + op_list = db_nslcmop.get('_admin', {}).get('operations', []) + for i, op in enumerate(op_list): + if all(op.get(k) == match[k] for k in match): + return i + return self.SUBOPERATION_STATUS_NOT_FOUND + + # Update status for a sub-operation given its index + def _update_suboperation_status(self, db_nslcmop, op_index, operationState, detailed_status): + # Update DB for HA tasks + q_filter = {'_id': db_nslcmop['_id']} + update_dict = {'_admin.operations.{}.operationState'.format(op_index): operationState, + '_admin.operations.{}.detailed-status'.format(op_index): detailed_status} + self.db.set_one("nslcmops", + q_filter=q_filter, + update_dict=update_dict, + fail_on_empty=False) + + # Add sub-operation, return the index of the added sub-operation + # Optionally, set operationState, detailed-status, and operationType + # Status and type are currently set for 'scale' sub-operations: + # 'operationState' : 'PROCESSING' | 'COMPLETED' | 'FAILED' + # 'detailed-status' : status message + # 'operationType': may be any type, in the case of scaling: 'PRE-SCALE' | 'POST-SCALE' + # Status and operation type are currently only used for 'scale', but NOT for 'terminate' sub-operations. + def _add_suboperation(self, db_nslcmop, vnf_index, vdu_id, vdu_count_index, vdu_name, primitive, + mapped_primitive_params, operationState=None, detailed_status=None, operationType=None, + RO_nsr_id=None, RO_scaling_info=None): + if not (db_nslcmop): + return self.SUBOPERATION_STATUS_NOT_FOUND + # Get the "_admin.operations" list, if it exists + db_nslcmop_admin = db_nslcmop.get('_admin', {}) + op_list = db_nslcmop_admin.get('operations') + # Create or append to the "_admin.operations" list + new_op = {'member_vnf_index': vnf_index, + 'vdu_id': vdu_id, + 'vdu_count_index': vdu_count_index, + 'primitive': primitive, + 'primitive_params': mapped_primitive_params} + if operationState: + new_op['operationState'] = operationState + if detailed_status: + new_op['detailed-status'] = detailed_status + if operationType: + new_op['lcmOperationType'] = operationType + if RO_nsr_id: + new_op['RO_nsr_id'] = RO_nsr_id + if RO_scaling_info: + new_op['RO_scaling_info'] = RO_scaling_info + if not op_list: + # No existing operations, create key 'operations' with current operation as first list element + db_nslcmop_admin.update({'operations': [new_op]}) + op_list = db_nslcmop_admin.get('operations') + else: + # Existing operations, append operation to list + op_list.append(new_op) + + db_nslcmop_update = {'_admin.operations': op_list} + self.update_db_2("nslcmops", db_nslcmop['_id'], db_nslcmop_update) + op_index = len(op_list) - 1 + return op_index + + # Helper methods for scale() sub-operations + + # pre-scale/post-scale: + # Check for 3 different cases: + # a. New: First time execution, return SUBOPERATION_STATUS_NEW + # b. Skip: Existing sub-operation exists, operationState == 'COMPLETED', return SUBOPERATION_STATUS_SKIP + # c. Reintent: Existing sub-operation exists, operationState != 'COMPLETED', return op_index to re-execute + def _check_or_add_scale_suboperation(self, db_nslcmop, vnf_index, vnf_config_primitive, primitive_params, + operationType, RO_nsr_id=None, RO_scaling_info=None): + # Find this sub-operation + if (RO_nsr_id and RO_scaling_info): + operationType = 'SCALE-RO' + match = { + 'member_vnf_index': vnf_index, + 'RO_nsr_id': RO_nsr_id, + 'RO_scaling_info': RO_scaling_info, + } + else: + match = { + 'member_vnf_index': vnf_index, + 'primitive': vnf_config_primitive, + 'primitive_params': primitive_params, + 'lcmOperationType': operationType + } + op_index = self._find_suboperation(db_nslcmop, match) + if (op_index == self.SUBOPERATION_STATUS_NOT_FOUND): + # a. New sub-operation + # The sub-operation does not exist, add it. + # _ns_execute_primitive() will be called from scale() as usual, with non-modified arguments + # The following parameters are set to None for all kind of scaling: + vdu_id = None + vdu_count_index = None + vdu_name = None + if (RO_nsr_id and RO_scaling_info): + vnf_config_primitive = None + primitive_params = None + else: + RO_nsr_id = None + RO_scaling_info = None + # Initial status for sub-operation + operationState = 'PROCESSING' + detailed_status = 'In progress' + # Add sub-operation for pre/post-scaling (zero or more operations) + self._add_suboperation(db_nslcmop, + vnf_index, + vdu_id, + vdu_count_index, + vdu_name, + vnf_config_primitive, + primitive_params, + operationState, + detailed_status, + operationType, + RO_nsr_id, + RO_scaling_info) + return self.SUBOPERATION_STATUS_NEW + else: + # Return either SUBOPERATION_STATUS_SKIP (operationState == 'COMPLETED'), + # or op_index (operationState != 'COMPLETED') + return self._reintent_or_skip_suboperation(db_nslcmop, op_index) + + # Helper methods for terminate() + + async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id): + """ Create a primitive with params from VNFD + Called from terminate() before deleting instance + Calls action() to execute the primitive """ + logging_text = "Task ns={} _terminate_action={} ".format(nsr_id, nslcmop_id) + db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) + db_vnfds = {} + # Loop over VNFRs + for vnfr in db_vnfrs_list: + vnfd_id = vnfr["vnfd-id"] + vnf_index = vnfr["member-vnf-index-ref"] + if vnfd_id not in db_vnfds: + step = "Getting vnfd={} id='{}' from db".format(vnfd_id, vnfd_id) + vnfd = self.db.get_one("vnfds", {"_id": vnfd_id}) + db_vnfds[vnfd_id] = vnfd + vnfd = db_vnfds[vnfd_id] + if not self._has_terminate_config_primitive(vnfd): + continue + # Get the primitive's sorted sequence list + seq_list = self._get_terminate_config_primitive_seq_list(vnfd) + for seq in seq_list: + # For each sequence in list, get primitive and call _ns_execute_primitive() + step = "Calling terminate action for vnf_member_index={} primitive={}".format( + vnf_index, seq.get("name")) + self.logger.debug(logging_text + step) + # Create the primitive for each sequence, i.e. "primitive": "touch" + primitive = seq.get('name') + mapped_primitive_params = self._get_terminate_primitive_params(seq, vnf_index) + # The following 3 parameters are currently set to None for 'terminate': + # vdu_id, vdu_count_index, vdu_name + 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") + # Add sub-operation + self._add_suboperation(db_nslcmop, + nslcmop_id, + vnf_index, + vdu_id, + vdu_count_index, + vdu_name, + primitive, + mapped_primitive_params) + # Sub-operations: Call _ns_execute_primitive() instead of action() + # db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) + # nsr_deployed = db_nsr["_admin"]["deployed"] + + # nslcmop_operation_state, nslcmop_operation_state_detail = await self.action( + # nsr_id, nslcmop_terminate_action_id) + # Launch Exception if action() returns other than ['COMPLETED', 'PARTIALLY_COMPLETED'] + # result_ok = ['COMPLETED', 'PARTIALLY_COMPLETED'] + # if result not in result_ok: + # raise LcmException( + # "terminate_primitive_action for vnf_member_index={}", + # " primitive={} fails with error {}".format( + # vnf_index, seq.get("name"), result_detail)) + + # TODO: find ee_id + ee_id = None + try: + await self.n2vc.exec_primitive( + ee_id=ee_id, + primitive_name=primitive, + params_dict=mapped_primitive_params + ) + except Exception as e: + self.logger.error('Error executing primitive {}: {}'.format(primitive, e)) + raise LcmException( + "terminate_primitive_action for vnf_member_index={}, primitive={} fails with error {}" + .format(vnf_index, seq.get("name"), e), + ) async def terminate(self, nsr_id, nslcmop_id): + + # Try to lock HA task here + task_is_locked_by_me = self.lcm_tasks.lock_HA('ns', 'nslcmops', nslcmop_id) + if not task_is_locked_by_me: + return + logging_text = "Task ns={} terminate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") db_nsr = None db_nslcmop = None exc = None failed_detail = [] # annotates all failed error messages - 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 + pending_tasks = [] try: + # wait for any previous tasks in process + await self.lcm_tasks.waitfor_related_HA("ns", 'nslcmops', nslcmop_id) + 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) @@ -1145,35 +1688,26 @@ class NsLcm(LcmBase): return # #TODO check if VIM is creating and wait # RO_vim_id = db_vim["_admin"]["deployed"]["RO"] + # Call internal terminate action + await self._terminate_action(db_nslcmop, nslcmop_id, nsr_id) db_nsr_update["operational-status"] = "terminating" db_nsr_update["config-status"] = "terminating" - 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 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)) + # remove NS + try: + step = "delete execution environment" + self.logger.debug(logging_text + step) + + task_delete_ee = asyncio.ensure_future(self.n2vc.delete_namespace(namespace="." + nsr_id)) + pending_tasks.append(task_delete_ee) + except Exception as e: + msg = "Failed while deleting NS in VCA: {}".format(e) + self.logger.error(msg) + failed_detail.append(msg) # remove from RO RO_fail = False - RO = ROclient.ROClient(self.loop, **self.ro_config) # Delete ns RO_nsr_id = RO_delete_action = None @@ -1182,11 +1716,12 @@ class NsLcm(LcmBase): 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" + step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = \ + "Deleting ns from VIM" 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) + desc = await self.RO.delete("ns", RO_nsr_id) RO_delete_action = desc["action_id"] db_nsr_update["_admin.deployed.RO.nsr_delete_action_id"] = RO_delete_action db_nsr_update["_admin.deployed.RO.nsr_id"] = None @@ -1200,9 +1735,12 @@ class NsLcm(LcmBase): delete_timeout = 20 * 60 # 20 minutes while delete_timeout > 0: - desc = await RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", - extra_item_id=RO_delete_action) - ns_status, ns_status_info = RO.check_action_status(desc) + desc = await self.RO.show( + "ns", + item_id_name=RO_nsr_id, + extra_item="action", + extra_item_id=RO_delete_action) + ns_status, ns_status_info = self.RO.check_action_status(desc) if ns_status == "ERROR": raise ROclient.ROClientException(ns_status_info) elif ns_status == "BUILD": @@ -1243,8 +1781,8 @@ class NsLcm(LcmBase): RO_nsd_id = nsr_deployed["RO"]["nsd_id"] try: step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ - "Deleting nsd at RO" - await RO.delete("nsd", RO_nsd_id) + "Deleting nsd from RO" + await self.RO.delete("nsd", RO_nsd_id) self.logger.debug(logging_text + "RO_nsd_id={} deleted".format(RO_nsd_id)) db_nsr_update["_admin.deployed.RO.nsd_id"] = None except ROclient.ROClientException as e: @@ -1267,9 +1805,9 @@ class NsLcm(LcmBase): try: RO_vnfd_id = vnf_deployed["id"] step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ - "Deleting member-vnf-index={} RO_vnfd_id={} from RO".format( + "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) + await self.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(index)] = None except ROclient.ROClientException as e: @@ -1283,24 +1821,6 @@ class NsLcm(LcmBase): failed_detail.append("RO_vnfd_id={} delete error: {}".format(RO_vnfd_id, e)) self.logger.error(logging_text + failed_detail[-1]) - # 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) - 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["_admin.deployed.VCA.{}".format(vca_index)] = None - if failed_detail: self.logger.error(logging_text + " ;".join(failed_detail)) db_nsr_update["operational-status"] = "failed" @@ -1318,7 +1838,7 @@ class NsLcm(LcmBase): if db_nslcmop["operationParams"].get("autoremove"): autoremove = True - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, LcmException) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except asyncio.CancelledError: @@ -1348,6 +1868,18 @@ class NsLcm(LcmBase): loop=self.loop) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) + + # wait for pending tasks + done = None + pending = None + if pending_tasks: + self.logger.debug(logging_text + 'Waiting for terminate pending tasks...') + done, pending = await asyncio.wait(pending_tasks, timeout=3600) + if not pending: + self.logger.debug(logging_text + 'All tasks finished...') + else: + self.logger.info(logging_text + 'There are pending tasks: {}'.format(pending)) + self.logger.debug(logging_text + "Exit") self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_terminate") @@ -1366,15 +1898,18 @@ class NsLcm(LcmBase): 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]] + elif "default-value" in parameter or "value" in parameter: + if "value" in parameter: + calculated_params[param_name] = parameter["value"] + else: + calculated_params[param_name] = parameter["default-value"] + if isinstance(calculated_params[param_name], str) and calculated_params[param_name].startswith("<") \ + and calculated_params[param_name].endswith(">"): + if calculated_params[param_name][1:-1] in instantiation_params: + calculated_params[param_name] = instantiation_params[calculated_params[param_name][1:-1]] else: raise LcmException("Parameter {} needed to execute primitive {} not provided". - format(parameter["default-value"], primitive_desc["name"])) + format(calculated_params[param_name], primitive_desc["name"])) else: raise LcmException("Parameter {} needed to execute primitive {} not provided". format(param_name, primitive_desc["name"])) @@ -1387,8 +1922,9 @@ class NsLcm(LcmBase): 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() + primitive, primitive_params, retries=0, retries_interval=30) -> (str, str): + + # find vca_deployed record for this action try: for vca_deployed in db_deployed["VCA"]: if not vca_deployed: @@ -1401,48 +1937,50 @@ class NsLcm(LcmBase): continue break else: + # vca_deployed not found 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: + + # get ee_id + ee_id = vca_deployed.get("ee_id") + if not ee_id: 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, - *callback_args, - **primitive_params - ) - 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" + "execution environment" + .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index)) + + if primitive == "config": + primitive_params = {"params": primitive_params} + + while retries >= 0: + try: + output = await self.n2vc.exec_primitive( + ee_id=ee_id, + primitive_name=primitive, + params_dict=primitive_params + ) + # execution was OK break - await asyncio.sleep(5) - else: - raise LcmException("timeout after {} seconds".format(self.timeout_primitive)) - return primitive_result, detailed_result - except (N2VCPrimitiveExecutionFailed, LcmException) as e: - return "FAILED", str(e) + except Exception as e: + retries -= 1 + if retries >= 0: + self.logger.debug('Error executing action {} on {} -> {}'.format(primitive, ee_id, e)) + # wait and retry + await asyncio.sleep(retries_interval, loop=self.loop) + else: + return 'Cannot execute action {} on {}: {}'.format(primitive, ee_id, e), 'FAIL' + + return output, 'OK' + + except Exception as e: + return 'Error executing action {}: {}'.format(primitive, e), 'FAIL' async def action(self, nsr_id, nslcmop_id): + + # Try to lock HA task here + task_is_locked_by_me = self.lcm_tasks.lock_HA('ns', 'nslcmops', nslcmop_id) + if not task_is_locked_by_me: + return + logging_text = "Task ns={} action={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") # get all needed from database @@ -1451,33 +1989,33 @@ class NsLcm(LcmBase): db_nsr_update = {"_admin.nslcmop": nslcmop_id} db_nslcmop_update = {} nslcmop_operation_state = None + nslcmop_operation_state_detail = None exc = None try: + # wait for any previous tasks in process + await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) + 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") - vnf_index = db_nslcmop["operationParams"]["member_vnf_index"] + vnf_index = db_nslcmop["operationParams"].get("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: - step = db_nslcmop_update["detailed-status"] = \ - "Waiting for related tasks to be completed: {}".format(task_name) - self.logger.debug(logging_text + step) - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - _, pending = await asyncio.wait(task_dependency, timeout=3600) - if pending: - raise LcmException("Timeout waiting related tasks to be completed") + if vnf_index: + 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"]}) + else: + if db_nsr.get("nsd"): + db_nsd = db_nsr.get("nsd") # TODO this will be removed + else: + step = "Getting nsd from database" + db_nsd = self.db.get_one("nsds", {"_id": db_nsr["nsd-id"]}) # for backward compatibility if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict): @@ -1497,26 +2035,49 @@ class NsLcm(LcmBase): 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 + elif vnf_index: + for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): + if config_primitive["name"] == primitive: + config_primitive_desc = config_primitive + break + else: + for config_primitive in db_nsd.get("ns-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)) + raise LcmException("Primitive {} not found at [ns|vnf|vdu]-configuration:config-primitive ". + format(primitive)) - vnfr_params = {} - if db_vnfr.get("additionalParamsForVnf"): - vnfr_params.update(db_vnfr["additionalParamsForVnf"]) + desc_params = {} + if vnf_index: + if db_vnfr.get("additionalParamsForVnf"): + desc_params.update(db_vnfr["additionalParamsForVnf"]) + else: + if db_nsr.get("additionalParamsForVnf"): + desc_params.update(db_nsr["additionalParamsForNs"]) # 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 + output, detail = await self._ns_execute_primitive( + db_deployed=nsr_deployed, + member_vnf_index=vnf_index, + vdu_id=vdu_id, + vdu_name=vdu_name, + vdu_count_index=vdu_count_index, + primitive=primitive, + primitive_params=self._map_primitive_params(config_primitive_desc, primitive_params, desc_params)) + + detailed_status = output + if detail == 'OK': + result = 'COMPLETED' + else: + result = 'FAILED' + + db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = detailed_status db_nslcmop_update["operationState"] = nslcmop_operation_state = result db_nslcmop_update["statusEnteredTime"] = time() - self.logger.debug(logging_text + " task Done with result {} {}".format(result, result_detail)) + self.logger.debug(logging_text + " task Done with result {} {}".format(result, detailed_status)) return # database update is called inside finally except (DbException, LcmException) as e: @@ -1530,7 +2091,8 @@ class NsLcm(LcmBase): self.logger.critical(logging_text + "Exit Exception {} {}".format(type(e).__name__, e), exc_info=True) finally: if exc and db_nslcmop: - db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc) + db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = \ + "FAILED {}: {}".format(step, exc) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() try: @@ -1551,8 +2113,15 @@ class NsLcm(LcmBase): 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_action") + return nslcmop_operation_state, nslcmop_operation_state_detail async def scale(self, nsr_id, nslcmop_id): + + # Try to lock HA task here + task_is_locked_by_me = self.lcm_tasks.lock_HA('ns', 'nslcmops', nslcmop_id) + if not task_is_locked_by_me: + return + logging_text = "Task ns={} scale={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") # get all needed from database @@ -1568,26 +2137,19 @@ class NsLcm(LcmBase): old_config_status = "" vnfr_scaled = False try: + # wait for any previous tasks in process + await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) + step = "Getting nslcmop from database" + self.logger.debug(step + " after having waited for previous tasks to be completed") 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"] - - # look if previous tasks in process - task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id) - if task_dependency: - step = db_nslcmop_update["detailed-status"] = \ - "Waiting for related tasks to be completed: {}".format(task_name) - self.logger.debug(logging_text + step) - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - _, pending = await asyncio.wait(task_dependency, timeout=3600) - if pending: - raise LcmException("Timeout waiting related tasks to be completed") - step = "Parsing scaling parameters" + # self.logger.debug(step) db_nsr_update["operational-status"] = "scaling" self.update_db_2("nsrs", nsr_id, db_nsr_update) nsr_deployed = db_nsr["_admin"].get("deployed") @@ -1607,6 +2169,7 @@ class NsLcm(LcmBase): 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"]}) + step = "Getting scaling-group-descriptor" for scaling_descriptor in db_vnfd["scaling-group-descriptor"]: if scaling_descriptor["name"] == scaling_group: @@ -1614,6 +2177,7 @@ class NsLcm(LcmBase): else: raise LcmException("input parameter 'scaleByStepData':'scaling-group-descriptor':'{}' is not present " "at vnfd:scaling-group-descriptor".format(scaling_group)) + # cooldown_time = 0 # for scaling_policy_descriptor in scaling_descriptor.get("scaling-policy", ()): # cooldown_time = scaling_policy_descriptor.get("cooldown-time", 0) @@ -1621,7 +2185,7 @@ class NsLcm(LcmBase): # break # TODO check if ns is in a proper status - step = "Sending scale order to RO" + step = "Sending scale order to VIM" nb_scale_op = 0 if not db_nsr["_admin"].get("scaling-group"): self.update_db_2("nsrs", nsr_id, {"_admin.scaling-group": [{"name": scaling_group, "nb-scale-op": 0}]}) @@ -1638,18 +2202,21 @@ class NsLcm(LcmBase): vdu_scaling_info = {"scaling_group_name": scaling_group, "vdu": []} if scaling_type == "SCALE_OUT": # count if max-instance-count is reached - if "max-instance-count" in scaling_descriptor and scaling_descriptor["max-instance-count"] is not None: - max_instance_count = int(scaling_descriptor["max-instance-count"]) - if nb_scale_op >= max_instance_count: - raise LcmException("reached the limit of {} (max-instance-count) scaling-out operations for the" - " scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group)) - nb_scale_op = nb_scale_op + 1 + max_instance_count = scaling_descriptor.get("max-instance-count", 10) + # self.logger.debug("MAX_INSTANCE_COUNT is {}".format(max_instance_count)) + if nb_scale_op >= max_instance_count: + raise LcmException("reached the limit of {} (max-instance-count) " + "scaling-out operations for the " + "scaling-group-descriptor '{}'".format(nb_scale_op, scaling_group)) + + nb_scale_op += 1 vdu_scaling_info["scaling_direction"] = "OUT" vdu_scaling_info["vdu-create"] = {} for vdu_scale_info in scaling_descriptor["vdu"]: RO_scaling_info.append({"osm_vdu_id": vdu_scale_info["vdu-id-ref"], "member-vnf-index": vnf_index, "type": "create", "count": vdu_scale_info.get("count", 1)}) 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 @@ -1658,7 +2225,7 @@ class NsLcm(LcmBase): 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 + nb_scale_op -= 1 vdu_scaling_info["scaling_direction"] = "IN" vdu_scaling_info["vdu-delete"] = {} for vdu_scale_info in scaling_descriptor["vdu"]: @@ -1686,12 +2253,12 @@ class NsLcm(LcmBase): }) vdu_delete = vdu_scaling_info.pop("vdu-delete") - # execute primitive service PRE-SCALING + # PRE-SCALE BEGIN step = "Executing pre-scale vnf-config-primitive" if scaling_descriptor.get("scaling-config-action"): for scaling_config_action in scaling_descriptor["scaling-config-action"]: - if scaling_config_action.get("trigger") and scaling_config_action["trigger"] == "pre-scale-in" \ - and scaling_type == "SCALE_IN": + if (scaling_config_action.get("trigger") == "pre-scale-in" and scaling_type == "SCALE_IN") \ + or (scaling_config_action.get("trigger") == "pre-scale-out" and scaling_type == "SCALE_OUT"): 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) @@ -1706,117 +2273,179 @@ class NsLcm(LcmBase): "[vnf-config-primitive-name-ref='{}'] does not match any vnf-configuration:config-" "primitive".format(scaling_group, config_primitive)) - vnfr_params = {"": vdu_scaling_info} + vnfr_params = {"VDU_SCALE_INFO": 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, 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)) + primitive_params = self._map_primitive_params(config_primitive, {}, vnfr_params) + + # Pre-scale reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, nslcmop_id, vnf_index, vnf_config_primitive, primitive_params, 'PRE-SCALE') + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + + "vnf_config_primitive={} Skipped sub-operation, result {} {}".format( + vnf_config_primitive, result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "vnf_config_primitive={} New sub-operation". + format(vnf_config_primitive)) + else: + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + vnf_index = op.get('member_vnf_index') + vnf_config_primitive = op.get('primitive') + primitive_params = op.get('primitive_params') + self.logger.debug(logging_text + "vnf_config_primitive={} Sub-operation reintent". + format(vnf_config_primitive)) + # Execute the primitive, either with new (first-time) or registered (reintent) args + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, primitive_params) + self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( + vnf_config_primitive, result, result_detail)) + # Update operationState = COMPLETED | FAILED + self._update_suboperation_status( + db_nslcmop, op_index, result, result_detail) + if result == "FAILED": raise LcmException(result_detail) db_nsr_update["config-status"] = old_config_status scale_process = None + # PRE-SCALE END + # SCALE RO - BEGIN + # Should this block be skipped if 'RO_nsr_id' == None ? + # if (RO_nsr_id and RO_scaling_info): if RO_scaling_info: scale_process = "RO" - RO = ROclient.ROClient(self.loop, **self.ro_config) - RO_desc = await RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info}) - db_nsr_update["_admin.scaling-group.{}.nb-scale-op".format(admin_scale_index)] = nb_scale_op - db_nsr_update["_admin.scaling-group.{}.time".format(admin_scale_index)] = time() - # wait until ready - RO_nslcmop_id = RO_desc["instance_action_id"] - db_nslcmop_update["_admin.deploy.RO"] = RO_nslcmop_id - - RO_task_done = False - step = detailed_status = "Waiting RO_task_id={} to complete the scale action.".format(RO_nslcmop_id) - detailed_status_old = None - self.logger.debug(logging_text + step) - - deployment_timeout = 1 * 3600 # One hour - while deployment_timeout > 0: - if not RO_task_done: - desc = await RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", - extra_item_id=RO_nslcmop_id) - ns_status, ns_status_info = RO.check_action_status(desc) - if ns_status == "ERROR": - raise ROclient.ROClientException(ns_status_info) - elif ns_status == "BUILD": - detailed_status = step + "; {}".format(ns_status_info) - elif ns_status == "ACTIVE": - RO_task_done = True - step = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id) - self.logger.debug(logging_text + step) - else: - assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) + # Scale RO reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info) + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + "Skipped sub-operation RO, result {} {}".format( + result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "New sub-operation RO") else: - desc = await RO.show("ns", RO_nsr_id) - ns_status, ns_status_info = RO.check_ns_status(desc) - if ns_status == "ERROR": - raise ROclient.ROClientException(ns_status_info) - 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. 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_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc) - self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc) - break - except LcmExceptionNoMgmtIP: - pass + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + RO_nsr_id = op.get('RO_nsr_id') + RO_scaling_info = op.get('RO_scaling_info') + self.logger.debug(logging_text + "Sub-operation RO reintent".format( + vnf_config_primitive)) + + RO_desc = await self.RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info}) + db_nsr_update["_admin.scaling-group.{}.nb-scale-op".format(admin_scale_index)] = nb_scale_op + db_nsr_update["_admin.scaling-group.{}.time".format(admin_scale_index)] = time() + # wait until ready + RO_nslcmop_id = RO_desc["instance_action_id"] + db_nslcmop_update["_admin.deploy.RO"] = RO_nslcmop_id + + RO_task_done = False + step = detailed_status = "Waiting RO_task_id={} to complete the scale action.".format(RO_nslcmop_id) + detailed_status_old = None + self.logger.debug(logging_text + step) + + deployment_timeout = 1 * 3600 # One hour + while deployment_timeout > 0: + if not RO_task_done: + desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", + extra_item_id=RO_nslcmop_id) + ns_status, ns_status_info = self.RO.check_action_status(desc) + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + elif ns_status == "BUILD": + detailed_status = step + "; {}".format(ns_status_info) + elif ns_status == "ACTIVE": + RO_task_done = True + step = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id) + self.logger.debug(logging_text + step) + else: + assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) else: - assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) - if detailed_status != detailed_status_old: - detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - - await asyncio.sleep(5, loop=self.loop) - deployment_timeout -= 5 - if deployment_timeout <= 0: - raise ROclient.ROClientException("Timeout waiting ns to be ready") - - # update VDU_SCALING_INFO with the obtained ip_addresses - if vdu_scaling_info["scaling_direction"] == "OUT": - for vdur in reversed(db_vnfr["vdur"]): - if vdu_scaling_info["vdu-create"].get(vdur["vdu-id-ref"]): - vdu_scaling_info["vdu-create"][vdur["vdu-id-ref"]] -= 1 - vdu_scaling_info["vdu"].append({ - "name": vdur["name"], - "vdu_id": vdur["vdu-id-ref"], - "interface": [] - }) - for interface in vdur["interfaces"]: - vdu_scaling_info["vdu"][-1]["interface"].append({ - "name": interface["name"], - "ip_address": interface["ip-address"], - "mac_address": interface.get("mac-address"), + + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + 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. 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 self.RO.show("ns", RO_nsr_id) + # 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 LcmExceptionNoMgmtIP: + pass + else: + assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) + if detailed_status != detailed_status_old: + self._update_suboperation_status( + db_nslcmop, op_index, 'COMPLETED', detailed_status) + detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + + await asyncio.sleep(5, loop=self.loop) + deployment_timeout -= 5 + if deployment_timeout <= 0: + self._update_suboperation_status( + db_nslcmop, nslcmop_id, op_index, 'FAILED', "Timeout when waiting for ns to get ready") + raise ROclient.ROClientException("Timeout waiting ns to be ready") + + # update VDU_SCALING_INFO with the obtained ip_addresses + if vdu_scaling_info["scaling_direction"] == "OUT": + for vdur in reversed(db_vnfr["vdur"]): + if vdu_scaling_info["vdu-create"].get(vdur["vdu-id-ref"]): + vdu_scaling_info["vdu-create"][vdur["vdu-id-ref"]] -= 1 + vdu_scaling_info["vdu"].append({ + "name": vdur["name"], + "vdu_id": vdur["vdu-id-ref"], + "interface": [] }) - del vdu_scaling_info["vdu-create"] + for interface in vdur["interfaces"]: + vdu_scaling_info["vdu"][-1]["interface"].append({ + "name": interface["name"], + "ip_address": interface["ip-address"], + "mac_address": interface.get("mac-address"), + }) + del vdu_scaling_info["vdu-create"] + + self._update_suboperation_status(db_nslcmop, op_index, 'COMPLETED', 'Done') + # SCALE RO - END scale_process = None if db_nsr_update: self.update_db_2("nsrs", nsr_id, db_nsr_update) + # POST-SCALE BEGIN # execute primitive service POST-SCALING step = "Executing post-scale vnf-config-primitive" if scaling_descriptor.get("scaling-config-action"): for scaling_config_action in scaling_descriptor["scaling-config-action"]: - if scaling_config_action.get("trigger") and scaling_config_action["trigger"] == "post-scale-out" \ - and scaling_type == "SCALE_OUT": + if (scaling_config_action.get("trigger") == "post-scale-in" and scaling_type == "SCALE_IN") \ + or (scaling_config_action.get("trigger") == "post-scale-out" and scaling_type == "SCALE_OUT"): 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} + vnfr_params = {"VDU_SCALE_INFO": vdu_scaling_info} if db_vnfr.get("additionalParamsForVnf"): vnfr_params.update(db_vnfr["additionalParamsForVnf"]) @@ -1831,22 +2460,53 @@ class NsLcm(LcmBase): config_primitive)) scale_process = "VCA" db_nsr_update["config-status"] = "configuring post-scaling" + primitive_params = self._map_primitive_params(config_primitive, {}, vnfr_params) + + # Post-scale reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, nslcmop_id, vnf_index, vnf_config_primitive, primitive_params, 'POST-SCALE') + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + + "vnf_config_primitive={} Skipped sub-operation, result {} {}". + format(vnf_config_primitive, result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "vnf_config_primitive={} New sub-operation". + format(vnf_config_primitive)) + else: + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + vnf_index = op.get('member_vnf_index') + vnf_config_primitive = op.get('primitive') + primitive_params = op.get('primitive_params') + self.logger.debug(logging_text + "vnf_config_primitive={} Sub-operation reintent". + format(vnf_config_primitive)) + # Execute the primitive, either with new (first-time) or registered (reintent) args + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, primitive_params) + self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( + vnf_config_primitive, result, result_detail)) + # Update operationState = COMPLETED | FAILED + self._update_suboperation_status( + db_nslcmop, op_index, result, result_detail) - 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": raise LcmException(result_detail) db_nsr_update["config-status"] = old_config_status scale_process = None + # POST-SCALE END db_nslcmop_update["operationState"] = nslcmop_operation_state = "COMPLETED" db_nslcmop_update["statusEnteredTime"] = time() db_nslcmop_update["detailed-status"] = "done" db_nsr_update["detailed-status"] = "" # "scaled {} {}".format(scaling_group, scaling_type) - db_nsr_update["operational-status"] = old_operational_status + db_nsr_update["operational-status"] = "running" if old_operational_status == "failed" \ + else old_operational_status db_nsr_update["config-status"] = old_config_status return except (ROclient.ROClientException, DbException, LcmException) as e: @@ -1890,7 +2550,7 @@ class NsLcm(LcmBase): "operationState": nslcmop_operation_state}, loop=self.loop) # if cooldown_time: - # await asyncio.sleep(cooldown_time) + # await asyncio.sleep(cooldown_time, loop=self.loop) # await self.msg.aiowrite("ns","scaled-cooldown-time", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id}) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e))