X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=763d2390acf8fbae9b780dd06a7b4882ce53db20;hb=3149f26911d1c239f674d5918f67ae802b0e671c;hp=13c1404a55b596e12ffa5d479f84156339070aaa;hpb=d832304282d3776caf9dcb040044e60c00074772;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 13c1404..763d239 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -24,11 +24,13 @@ import traceback from jinja2 import Environment, Template, meta, TemplateError, TemplateNotFound, TemplateSyntaxError from osm_lcm import ROclient -from osm_lcm.lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase +from osm_lcm.lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase, deep_get +from n2vc.k8s_helm_conn import K8sHelmConnector from osm_common.dbbase import DbException from osm_common.fsbase import FsException -from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed, NetworkServiceDoesNotExist + +from n2vc.n2vc_juju_conn import N2VCJujuConnector from copy import copy, deepcopy from http import HTTPStatus @@ -66,21 +68,6 @@ 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 = 2 * 3600 # global timeout for deployment @@ -97,32 +84,77 @@ 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.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'] + if 'apiproxy' in self.vca_config: + self.vca_config['api_proxy'] = self.vca_config['apiproxy'] + + # create N2VC connector + self.n2vc = N2VCJujuConnector( + db=self.db, + fs=self.fs, + log=self.logger, + 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, + # ca_cert=self.vca_config.get('cacert'), + # api_proxy=self.vca_config.get('apiproxy'), + ) - self.n2vc = N2VC( + self.k8sclusterhelm = K8sHelmConnector( + kubectl_command=self.vca_config.get("kubectlpath"), + helm_command=self.vca_config.get("helmpath"), + 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, - juju_public_key=vca_config.get('pubkey'), - ca_cert=vca_config.get('cacert'), - api_proxy=vca_config.get('apiproxy') + db=self.db, + on_update_db=None, ) + + # 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)) + + return + # write NS status to database + # try: + # # nsrs_id = filter.get('_id') + # # print(nsrs_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') + # # print(status) + # # detailed_status = vca.get('detailed-status') + # # print(detailed_status) + # # for ro in ro_list: + # # print(ro) + # + # except Exception as e: + # self.logger.error('Error writing NS status to db: {}'.format(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 @@ -140,6 +172,8 @@ class NsLcm(LcmBase): vnfd_RO.pop("vnf-configuration", None) vnfd_RO.pop("monitoring-param", None) vnfd_RO.pop("scaling-group-descriptor", None) + vnfd_RO.pop("kdu", None) + vnfd_RO.pop("k8s-cluster", None) if new_id: vnfd_RO["id"] = new_id @@ -179,85 +213,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. Received model_name={}". - format(model_name)) - 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 @@ -323,6 +278,7 @@ class NsLcm(LcmBase): "wim_account": wim_account_2_RO(ns_params.get("wimAccountId")), # "scenario": ns_params["nsdId"], } + n2vc_key_list = n2vc_key_list or [] for vnfd_ref, vnfd in vnfd_dict.items(): vdu_needed_access = [] @@ -413,6 +369,11 @@ class NsLcm(LcmBase): populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", internal_vld_params["name"], "ip-profile"), ip_profile_2_RO(internal_vld_params["ip-profile"])) + if internal_vld_params.get("provider-network"): + + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", + internal_vld_params["name"], "provider-network"), + internal_vld_params["provider-network"].copy()) for icp_params in get_iterable(internal_vld_params, "internal-connection-point"): # look for interface @@ -446,6 +407,11 @@ class NsLcm(LcmBase): populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"), ip_profile_2_RO(vld_params["ip-profile"])) + if vld_params.get("provider-network"): + + populate_dict(RO_ns_params, ("networks", vld_params["name"], "provider-network"), + vld_params["provider-network"].copy()) + 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"])), @@ -461,6 +427,7 @@ class NsLcm(LcmBase): RO_vld_sites.append({"netmap-use": vld_params["vim-network-name"]}) if RO_vld_sites: populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites) + if vld_params.get("vim-network-id"): RO_vld_sites = [] if isinstance(vld_params["vim-network-id"], dict): @@ -478,7 +445,7 @@ class NsLcm(LcmBase): 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) + 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 @@ -623,8 +590,8 @@ class NsLcm(LcmBase): break else: raise LcmException("ns_update_vnfr: Not found member_vnf_index={} vdur={} interface={} " - "from VIM 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: @@ -651,22 +618,79 @@ class NsLcm(LcmBase): else: 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): + @staticmethod + def _get_ns_config_info(vca_deployed_list): + """ + Generates a mapping between vnf,vdu elements and the N2VC id + :param vca_deployed_list: List of database _admin.deploy.VCA that contains this list + :return: a dictionary with {osm-config-mapping: {}} where its element contains: + "": for a vnf configuration, or + "..": for a vdu configuration + """ + mapping = {} + ns_config_info = {"osm-config-mapping": mapping} + for vca in vca_deployed_list: + if not vca["member-vnf-index"]: + continue + if not vca["vdu_id"]: + mapping[vca["member-vnf-index"]] = vca["application"] + else: + mapping["{}.{}.{}".format(vca["member-vnf-index"], vca["vdu_id"], vca["vdu_count_index"])] =\ + vca["application"] + return ns_config_info + + @staticmethod + def _get_initial_config_primitive_list(desc_primitive_list, vca_deployed): + """ + Generates a list of initial-config-primitive based on the list provided by the descriptor. It includes internal + primitives as verify-ssh-credentials, or config when needed + :param desc_primitive_list: information of the descriptor + :param vca_deployed: information of the deployed, needed for known if it is related to an NS, VNF, VDU and if + this element contains a ssh public key + :return: The modified list. Can ba an empty list, but always a list + """ + if desc_primitive_list: + primitive_list = desc_primitive_list.copy() + else: + primitive_list = [] + # look for primitive config, and get the position. None if not present + config_position = None + for index, primitive in enumerate(primitive_list): + if primitive["name"] == "config": + config_position = index + break + + # for NS, add always a config primitive if not present (bug 874) + if not vca_deployed["member-vnf-index"] and config_position is None: + primitive_list.insert(0, {"name": "config", "parameter": []}) + config_position = 0 + # for VNF/VDU add verify-ssh-credentials after config + if vca_deployed["member-vnf-index"] and config_position is not None and vca_deployed.get("ssh-public-key"): + primitive_list.insert(config_position + 1, {"name": "verify-ssh-credentials", "parameter": []}) + return primitive_list + + 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() + vdu_flag = False # If any of the VNFDs has VDUs 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']] + if vnfd.get("vdu"): + vdu_flag = True vnfd_ref = vnfd["id"] - step = db_nsr_update["detailed-status"] = "Creating vnfd='{}' member_vnf_index='{}' at RO".format( - vnfd_ref, member_vnf_index) + step = db_nsr_update["_admin.deployed.RO.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 @@ -697,10 +721,11 @@ class NsLcm(LcmBase): 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) + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", db_nsr_update) # create nsd at RO nsd_ref = nsd["id"] - step = db_nsr_update["detailed-status"] = "Creating nsd={} at RO".format(nsd_ref) + step = db_nsr_update["_admin.deployed.RO.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]) @@ -728,13 +753,14 @@ class NsLcm(LcmBase): 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) + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", 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" + step = db_nsr_update["_admin.deployed.RO.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: @@ -745,12 +771,13 @@ class NsLcm(LcmBase): 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) + step = db_nsr_update["_admin.deployed.RO.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" + step = db_nsr_update["_admin.deployed.RO.detailed-status"] = "Checking dependencies" # self.logger.debug(logging_text + step) # check if VIM is creating and wait look if previous tasks in process @@ -769,19 +796,19 @@ class NsLcm(LcmBase): self.logger.debug(logging_text + step) await asyncio.wait(task_dependency, timeout=3600) - step = db_nsr_update["detailed-status"] = "Checking instantiation parameters" + step = db_nsr_update["_admin.deployed.RO.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) + # step = db_nsr_update["_admin.deployed.RO.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) + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", 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) @@ -799,15 +826,17 @@ class NsLcm(LcmBase): 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) + if vdu_flag: + 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 + detailed_status_old = db_nsr_update["_admin.deployed.RO.detailed-status"] = detailed_status self.update_db_2("nsrs", nsr_id, db_nsr_update) + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", db_nsr_update) await asyncio.sleep(5, loop=self.loop) else: # total_deploy_timeout raise ROclient.ROClientException("Timeout waiting ns to be ready") @@ -815,70 +844,126 @@ class NsLcm(LcmBase): step = "Updating NSR" self.ns_update_nsr(db_nsr_update, db_nsr, desc) - db_nsr_update["operational-status"] = "running" - db_nsr["detailed-status"] = "Configuring vnfr" + db_nsr_update["_admin.deployed.RO.operational-status"] = "running" + db_nsr["_admin.deployed.RO.detailed-status"] = "Deployed at VIM" + db_nsr_update["_admin.deployed.RO.detailed-status"] = "Deployed at VIM" self.update_db_2("nsrs", nsr_id, db_nsr_update) - - async def insert_key_ro(self, logging_text, pub_key, nsr_id, vnfr_id, vdu_id, vdu_index, user): + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", db_nsr_update) + + step = "Deployed at VIM" + self.logger.debug(logging_text + step) + + async def wait_vm_up_insert_key_ro(self, logging_text, nsr_id, vnfr_id, vdu_id, vdu_index, pub_key=None, user=None): + """ + Wait for ip addres at RO, and optionally, insert public key in virtual machine + :param logging_text: prefix use for logging + :param nsr_id: + :param vnfr_id: + :param vdu_id: + :param vdu_index: + :param pub_key: public ssh key to inject, None to skip + :param user: user to apply the public ssh key + :return: IP address + """ + + # self.logger.debug(logging_text + "Starting wait_vm_up_insert_key_ro") ro_nsr_id = None ip_address = None nb_tries = 0 target_vdu_id = None + ro_retries = 0 + while True: + + ro_retries += 1 + if ro_retries >= 360: # 1 hour + raise LcmException("Not found _admin.deployed.RO.nsr_id for nsr_id: {}".format(nsr_id)) + await asyncio.sleep(10, loop=self.loop) - # 1 wait until NS is deployed at RO + # 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: + + if not vdu_id: # for the VNF case 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: + vdur = next((x for x in get_iterable(db_vnfr, "vdur") if x.get("ip-address") == ip_address), None) + else: # VDU case + vdur = next((x for x in get_iterable(db_vnfr, "vdur") + if x.get("vdu-id-ref") == vdu_id and x.get("count-index") == vdu_index), None) + + if not vdur: raise LcmException("Not found vnfr_id={}, vdu_index={}, vdu_index={}".format( vnfr_id, vdu_id, vdu_index )) + + if vdur.get("status") == "ACTIVE": + ip_address = vdur.get("ip-address") + if not ip_address: + continue + target_vdu_id = vdur["vdu-id-ref"] + elif vdur.get("status") == "ERROR": + raise LcmException("Cannot inject ssh-key because target VM is in error state") + if not target_vdu_id: continue - 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("ns", ro_nsr_id, - {"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"))) - return - 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)) - async def instantiate_N2VC(self, logging_text, vca_index, nsi_id, db_nsr, db_vnfr, vdu_id, vdu_index, - deploy_params, config_descriptor, base_folder): + # self.logger.debug(logging_text + "IP address={}".format(ip_address)) + + # inject public key into machine + if pub_key and user: + # self.logger.debug(logging_text + "Inserting RO key") + 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: + if not nb_tries: + self.logger.debug(logging_text + "error injecting key: {}. Retrying until {} seconds". + format(e, 20*10)) + nb_tries += 1 + if nb_tries >= 20: + raise LcmException("Reaching max tries injecting key. Error: {}".format(e)) + else: + break + + return ip_address + + async def instantiate_N2VC(self, logging_text, vca_index, nsi_id, db_nsr, db_vnfr, vdu_id, + kdu_name, vdu_index, config_descriptor, deploy_params, base_folder): nsr_id = db_nsr["_id"] db_update_entry = "_admin.deployed.VCA.{}.".format(vca_index) + vca_deployed_list = db_nsr["_admin"]["deployed"]["VCA"] 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 @@ -894,138 +979,226 @@ class NsLcm(LcmBase): namespace += ".{}-{}".format(vdu_id, vdu_index or 0) # Get artifact path - storage_params = self.fs.get_params() - artifact_path = "{}{}/{}/charms/{}".format( - storage_params["path"], + artifact_path = "/{}/{}/charms/{}".format( base_folder["folder"], base_folder["pkg-dir"], config_descriptor["juju"]["charm"] ) - is_proxy_charm = True if config_descriptor["juju"]["charm"] else False - if config_descriptor["juju"].get("proxy") is False: + 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") - if not ee_id: - if is_proxy_charm: - step = "create execution envioronment" - self.logger.debug(logging_text + step) - ee_id = await self.n2vc.CreateExecutionEnvironment(namespace) - 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", ()): + # 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 = "Waiting to VM being up and getting IP address" + self.logger.debug(logging_text + step) + rw_mgmt_ip = await self.wait_vm_up_insert_key_ro(logging_text, nsr_id, vnfr_id, vdu_id, vdu_index, + user=None, pub_key=None) + credentials = {"hostname": rw_mgmt_ip} + # get username + username = deep_get(config_descriptor, ("config-access", "ssh-access", "default-user")) + # 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 not username and config_descriptor.get("initial-config-primitive"): + for config_primitive in config_descriptor["initial-config-primitive"]: + for param in config_primitive.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") + username = param["value"] + break + if not username: + raise LcmException("Cannot determine the username neither with 'initial-config-promitive' nor with " + "'config-access.ssh-access.default-user'") + credentials["username"] = username + # n2vc_redesign STEP 3.2 - # n2vc_redesign STEP 3.2 - self.logger.debug(logging_text + step) - ee_id = await self.n2vc.RegisterExecutionEnvioronment(credentials) - # 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" - model_name, _, application_name = ee_id.partition(".") - 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}) + step = "register execution environment {}".format(credentials) + 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" - # TODO db_dict with filter: 'nsr_id', path:'db_update_entry' - pub_key = await self.n2vc.InstallConfigurationSW(self, ee_id, artifact_path) - if is_proxy_charm and pub_key: - # check if ssh key must be injected - required = deep_get(config_descriptor, ("config-access", "ssh-access", "required")) - # TODO get from config primitive: if required not user: - if required: + # TODO check if already done + 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 + if is_proxy_charm: # if native charm we have waited already to VM be UP + pub_key = None + user = None + if deep_get(config_descriptor, ("config-access", "ssh-access", "required")): + # Needed to inject a ssh key user = deep_get(config_descriptor, ("config-access", "ssh-access", "default-user")) - # insert pub_key into VM - # n2vc_redesign STEP 5.1 + step = "Install configuration Software, getting public ssh key" + pub_key = await self.n2vc.get_ee_ssh_public__key(ee_id=ee_id, db_dict=db_dict) + step = "Insert public key into VM" - await self.insert_key_ro(logging_text, pub_key, nsr_id, vnfr_id, vdu_id, vdu_index, user) - # TODO get ip_address and add to deploy params - deploy_params["rw_mgmt_ip"] = "TODO-ip-address" + else: + step = "Waiting to VM being up and getting IP address" + self.logger.debug(logging_text + step) + + # n2vc_redesign STEP 5.1 + # wait for RO (ip-address) Insert pub_key into VM + rw_mgmt_ip = await self.wait_vm_up_insert_key_ro(logging_text, nsr_id, vnfr_id, vdu_id, vdu_index, + user=user, pub_key=pub_key) + + self.logger.debug(logging_text + ' VM_ip_address={}'.format(rw_mgmt_ip)) + + # store rw_mgmt_ip in deploy params for later replacement + 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' + initial_config_primitive_list = config_descriptor.get('initial-config-primitive') + + # sort initial config primitives by 'seq' + try: + initial_config_primitive_list.sort(key=lambda val: int(val['seq'])) + except Exception as e: + self.logger.error(logging_text + step + ": " + str(e)) + + # add config if not present for NS charm + initial_config_primitive_list = self._get_initial_config_primitive_list(initial_config_primitive_list, + vca_deployed) + for initial_config_primitive in initial_config_primitive_list: + # adding information on the vca_deployed if it is a NS execution environment + if not vca_deployed["member-vnf-index"]: + deploy_params["ns_config_info"] = self._get_ns_config_info(vca_deployed_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.ExecutePrimitive(ee_id, initial_config_primitive["name"], primitive_params_) + 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)) + 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 - db_nsr_update = {"_admin.nslcmop": nslcmop_id} + + # update operation on nsrs + db_nsr_update = {"_admin.nslcmop": nslcmop_id, + "_admin.current-operation": nslcmop_id, + "_admin.operation-type": "instantiate"} + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + # update operation on nslcmops db_nslcmop_update = {} + nslcmop_operation_state = None - db_vnfrs = {} + db_vnfrs = {} # vnf's info indexed by member-index + # n2vc_info = {} task_instantiation_list = [] exc = None try: # wait for any previous tasks in process - step = "Waiting for previous tasks" + step = "Waiting for previous operations to terminate" await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) - # STEP 0: Reding database + + # 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}) + # nsd is replicated into ns (no db read) nsd = db_nsr["nsd"] # nsr_name = db_nsr["name"] # TODO short-name?? + # read from db: vnf's of this ns step = "Getting vnfrs from db" + self.logger.debug(logging_text + step) db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) - db_vnfds_ref = {} - db_vnfds = {} - db_vnfds_index = {} + + # 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) + self.logger.debug(logging_text + step) vnfd = self.db.get_one("vnfds", {"_id": vnfd_id}) - db_vnfds_ref[vnfd_ref] = vnfd - db_vnfds[vnfd_id] = vnfd - db_vnfds_index[vnfr["member-vnf-index-ref"]] = db_vnfds[vnfd_id] - # 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 - # vca_model_name = None if db_nsr["_admin"].get("deployed"): vca_deployed_list = db_nsr["_admin"]["deployed"].get("VCA") - # vca_model_name = db_nsr["_admin"]["deployed"].get("VCA-model-name") 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 @@ -1035,6 +1208,7 @@ class NsLcm(LcmBase): db_nsr_update["detailed-status"] = "creating" db_nsr_update["operational-status"] = "init" + 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"] = [] @@ -1042,99 +1216,93 @@ class NsLcm(LcmBase): # 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) - + self.logger.debug(logging_text + "Before deploy_kdus") + # Call to deploy_kdus in case exists the "vdu:kdu" param + task_kdu = asyncio.ensure_future( + self.deploy_kdus( + logging_text=logging_text, + nsr_id=nsr_id, + db_nsr=db_nsr, + db_vnfrs=db_vnfrs, + ) + ) + self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_KDUs", task_kdu) + task_instantiation_list.append(task_kdu) # n2vc_redesign STEP 1 Get VCA public ssh-key # feature 1429. Add n2vc public key to needed VMs - n2vc_key = await self.n2vc.GetPublicKey() + n2vc_key = self.n2vc.get_public_key() + n2vc_key_list = [n2vc_key] + if self.vca_config.get("public_key"): + n2vc_key_list.append(self.vca_config["public_key"]) # n2vc_redesign STEP 2 Deploy Network Scenario task_ro = asyncio.ensure_future( - self.instantiate_RO(logging_text, nsr_id, nsd, db_nsr, db_nslcmop, db_vnfrs, db_vnfds_ref, [n2vc_key]) + 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_list + ) ) self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_RO", task_ro) task_instantiation_list.append(task_ro) - + # n2vc_redesign STEP 3 to 6 Deploy N2VC step = "Looking for needed vnfd to configure with proxy charm" self.logger.debug(logging_text + step) - def _deploy_n2vc(): - # 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 - # read variables logging_text, nsi_id, db_nsr, db_vnfr, vdu_id, vdu_index, deploy_params, - # descriptor_config, base_folder, member_vnf_index, vnfd_id - # write variables: db_nsr - - # 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, - vca_index, - nsi_id, - db_nsr, - db_vnfr, - vdu_id, - vdu_index, - deploy_params, - descriptor_config, - base_folder, - ) - ) - self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_N2VC-{}".format(vca_index), task_n2vc) - task_instantiation_list.append(task_n2vc) - 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"] + 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 - vnfd = db_vnfds_ref[vnfd_id] + kdu_name = None # Get additional parameters 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 "): - deploy_params[k] = yaml.safe_load(v[7:]) + deploy_params = self._format_additional_params(db_vnfr["additionalParamsForVnf"].copy()) descriptor_config = vnfd.get("vnf-configuration") if descriptor_config and descriptor_config.get("juju"): - _deploy_n2vc() + 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, + kdu_name=kdu_name, + 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 vdud in get_iterable(vnfd, 'vdu'): vdu_id = vdud["id"] descriptor_config = vdud.get('vdu-configuration') + vdur = next((x for x in db_vnfr["vdur"] if x["vdu-id-ref"] == vdu_id), None) + if vdur.get("additionalParams"): + deploy_params_vdu = self._format_additional_params(vdur["additionalParams"]) + else: + deploy_params_vdu = deploy_params 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"]): @@ -1145,9 +1313,62 @@ class NsLcm(LcmBase): # "member_vnf_index={}".format(vdu_id, member_vnf_index)) # vdu_name = vdur.get("name") vdu_name = None + kdu_name = None for vdu_index in range(int(vdud.get("count", 1))): # TODO vnfr_params["rw_mgmt_ip"] = vdur["ip-address"] - _deploy_n2vc() + 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, + kdu_name=kdu_name, + member_vnf_index=member_vnf_index, + vdu_index=vdu_index, + vdu_name=vdu_name, + deploy_params=deploy_params_vdu, + descriptor_config=descriptor_config, + base_folder=base_folder, + task_instantiation_list=task_instantiation_list + ) + for kdud in get_iterable(vnfd, 'kdu'): + kdu_name = kdud["name"] + descriptor_config = kdud.get('kdu-configuration') + if descriptor_config and descriptor_config.get("juju"): + vdu_id = None + vdu_index = 0 + vdu_name = None + # 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 + + 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, + kdu_name=kdu_name, + 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") @@ -1156,26 +1377,44 @@ class NsLcm(LcmBase): db_vnfr = None member_vnf_index = None vdu_id = None + kdu_name = 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:]) + deploy_params = self._format_additional_params(db_nsr["additionalParamsForNs"].copy()) base_folder = nsd["_admin"]["storage"] - _deploy_n2vc() + 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, + kdu_name=kdu_name, + 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 + ) # 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) - done, pending = await asyncio.wait(task_instantiation_set, timeout=timeout) - # TODO return_when=asyncio.FIRST_COMPLETED) + 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: @@ -1202,8 +1441,6 @@ class NsLcm(LcmBase): db_nsr_update["config-status"] = "configured" db_nsr_update["detailed-status"] = "done" - return - except (ROclient.ROClientException, DbException, LcmException) as e: self.logger.error(logging_text + "Exit Exception while '{}': {}".format(step, e)) exc = e @@ -1226,6 +1463,8 @@ class NsLcm(LcmBase): try: if db_nsr: db_nsr_update["_admin.nslcmop"] = None + db_nsr_update["_admin.current-operation"] = None + db_nsr_update["_admin.operation-type"] = None self.update_db_2("nsrs", nsr_id, db_nsr_update) if db_nslcmop_update: self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) @@ -1242,33 +1481,158 @@ 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 + async def deploy_kdus(self, logging_text, nsr_id, db_nsr, db_vnfrs): + # Launch kdus if present in the descriptor - async def _wait_charm_destroyed(self, model, application, timeout): - """ - Wait until charm does not exist - :param model: - :param application: - :param timeout: - :return: True if not exist, False if timeout - """ - while True: - if not await self.n2vc.HasApplication(model, application): - return True - if timeout < 0: - return False - await asyncio.sleep(10, loop=self.loop) - timeout -= 10 + k8scluster_id_2_uuic = {"helm-chart": {}, "juju-bundle": {}} + + def _get_cluster_id(cluster_id, cluster_type): + nonlocal k8scluster_id_2_uuic + if cluster_id in k8scluster_id_2_uuic[cluster_type]: + return k8scluster_id_2_uuic[cluster_type][cluster_id] + + db_k8scluster = self.db.get_one("k8sclusters", {"_id": cluster_id}, fail_on_empty=False) + if not db_k8scluster: + raise LcmException("K8s cluster {} cannot be found".format(cluster_id)) + k8s_id = deep_get(db_k8scluster, ("_admin", cluster_type, "id")) + if not k8s_id: + raise LcmException("K8s cluster '{}' has not been initilized for '{}'".format(cluster_id, cluster_type)) + k8scluster_id_2_uuic[cluster_type][cluster_id] = k8s_id + return k8s_id + + logging_text += "Deploy kdus: " + try: + db_nsr_update = {"_admin.deployed.K8s": []} + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + # Look for all vnfds + pending_tasks = {} + index = 0 + for vnfr_data in db_vnfrs.values(): + for kdur in get_iterable(vnfr_data, "kdur"): + desc_params = self._format_additional_params(kdur.get("additionalParams")) + kdumodel = None + k8sclustertype = None + error_text = None + cluster_uuid = None + if kdur.get("helm-chart"): + kdumodel = kdur["helm-chart"] + k8sclustertype = "chart" + k8sclustertype_full = "helm-chart" + elif kdur.get("juju-bundle"): + kdumodel = kdur["juju-bundle"] + k8sclustertype = "juju" + k8sclustertype_full = "juju-bundle" + else: + error_text = "kdu type is neither helm-chart not juju-bundle. Maybe an old NBI version is" \ + " running" + try: + if not error_text: + cluster_uuid = _get_cluster_id(kdur["k8s-cluster"]["id"], k8sclustertype_full) + except LcmException as e: + error_text = str(e) + step = "Instantiate KDU {} in k8s cluster {}".format(kdur["kdu-name"], cluster_uuid) + + k8s_instace_info = {"kdu-instance": None, "k8scluster-uuid": cluster_uuid, + "k8scluster-type": k8sclustertype, + "kdu-name": kdur["kdu-name"], "kdu-model": kdumodel} + if error_text: + k8s_instace_info["detailed-status"] = error_text + db_nsr_update["_admin.deployed.K8s.{}".format(index)] = k8s_instace_info + self.update_db_2("nsrs", nsr_id, db_nsr_update) + if error_text: + continue + + db_dict = {"collection": "nsrs", "filter": {"_id": nsr_id}, "path": "_admin.deployed.K8s." + "{}".format(index)} + if k8sclustertype == "chart": + task = asyncio.ensure_future( + self.k8sclusterhelm.install(cluster_uuid=cluster_uuid, kdu_model=kdumodel, atomic=True, + params=desc_params, db_dict=db_dict, timeout=3600) + ) + else: + # TODO juju-bundle connector in place + pass + pending_tasks[task] = "_admin.deployed.K8s.{}.".format(index) + index += 1 + if not pending_tasks: + return + self.logger.debug(logging_text + 'Waiting for terminate pending tasks...') + pending_list = list(pending_tasks.keys()) + while pending_list: + done_list, pending_list = await asyncio.wait(pending_list, timeout=30*60, + return_when=asyncio.FIRST_COMPLETED) + if not done_list: # timeout + for task in pending_list: + db_nsr_update[pending_tasks(task) + "detailed-status"] = "Timeout" + break + for task in done_list: + exc = task.exception() + if exc: + db_nsr_update[pending_tasks[task] + "detailed-status"] = "{}".format(exc) + else: + db_nsr_update[pending_tasks[task] + "kdu-instance"] = task.result() + + except Exception as e: + self.logger.critical(logging_text + "Exit Exception {} while '{}': {}".format(type(e).__name__, step, e)) + raise LcmException("{} Exit Exception {} while '{}': {}".format(logging_text, type(e).__name__, step, e)) + finally: + # TODO Write in data base + if db_nsr_update: + self.update_db_2("nsrs", nsr_id, db_nsr_update) + + def _deploy_n2vc(self, logging_text, db_nsr, db_vnfr, nslcmop_id, nsr_id, nsi_id, vnfd_id, vdu_id, + kdu_name, 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("kdu_name") == kdu_name 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, + "kdu_name": kdu_name, + "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, + kdu_name=kdu_name, + 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): @@ -1322,6 +1686,13 @@ class NsLcm(LcmBase): } return nslcmop + def _format_additional_params(self, params): + params = params or {} + for key, value in params.items(): + if str(value).startswith("!!yaml "): + params[key] = yaml.safe_load(value[7:]) + return params + def _get_terminate_primitive_params(self, seq, vnf_index): primitive = seq.get('name') primitive_params = {} @@ -1382,9 +1753,8 @@ class NsLcm(LcmBase): # '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, + 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 @@ -1427,9 +1797,8 @@ class NsLcm(LcmBase): # 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): + 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' @@ -1527,21 +1896,33 @@ class NsLcm(LcmBase): 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"] - result, result_detail = await self._ns_execute_primitive( - nsr_deployed, vnf_index, vdu_id, vdu_name, vdu_count_index, primitive, - mapped_primitive_params) + # 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: + # 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"), result_detail)) + "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): @@ -1556,13 +1937,17 @@ class NsLcm(LcmBase): 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_nsr_update = {"_admin.nslcmop": nslcmop_id, + "_admin.current-operation": nslcmop_id, + "_admin.operation-type": "terminate"} + self.update_db_2("nsrs", nsr_id, db_nsr_update) db_nslcmop_update = {} nslcmop_operation_state = None autoremove = False # autoremove after terminated + pending_tasks = [] try: # wait for any previous tasks in process + step = "Waiting for previous operations to terminate" await self.lcm_tasks.waitfor_related_HA("ns", 'nslcmops', nslcmop_id) step = "Getting nslcmop={} from db".format(nslcmop_id) @@ -1578,44 +1963,49 @@ class NsLcm(LcmBase): # Call internal terminate action await self._terminate_action(db_nslcmop, nslcmop_id, nsr_id) + pending_tasks = [] + db_nsr_update["operational-status"] = "terminating" db_nsr_update["config-status"] = "terminating" - if nsr_deployed and nsr_deployed.get("VCA-model-name"): - vca_model_name = nsr_deployed["VCA-model-name"] - step = "deleting VCA model name '{}' and all charms".format(vca_model_name) + # remove NS + try: + step = "delete execution environment" self.logger.debug(logging_text + step) - try: - await self.n2vc.DestroyNetworkService(vca_model_name) - except NetworkServiceDoesNotExist: - pass - db_nsr_update["_admin.deployed.VCA-model-name"] = None - if nsr_deployed.get("VCA"): - for vca_index in range(0, len(nsr_deployed["VCA"])): - db_nsr_update["_admin.deployed.VCA.{}".format(vca_index)] = None - self.update_db_2("nsrs", nsr_id, db_nsr_update) - # for backward compatibility if charm have been created with "default" model name delete one by one - elif 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)) + + 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) + + try: + # Delete from k8scluster + step = "delete kdus" + self.logger.debug(logging_text + step) + # print(nsr_deployed) + if nsr_deployed: + for kdu in nsr_deployed.get("K8s", ()): + kdu_instance = kdu.get("kdu-instance") + if not kdu_instance: + continue + if kdu.get("k8scluster-type") == "chart": + task_delete_kdu_instance = asyncio.ensure_future( + self.k8sclusterhelm.uninstall(cluster_uuid=kdu.get("k8scluster-uuid"), + kdu_instance=kdu_instance)) + elif kdu.get("k8scluster-type") == "juju": + # TODO Juju connector needed + continue + else: + self.error(logging_text + "Unknown k8s deployment type {}". + format(kdu.get("k8scluster-type"))) + continue + pending_tasks.append(task_delete_kdu_instance) + except LcmException as e: + msg = "Failed while deleting KDUs from NS: {}".format(e) + self.logger.error(msg) + failed_detail.append(msg) # remove from RO RO_fail = False @@ -1646,8 +2036,11 @@ class NsLcm(LcmBase): delete_timeout = 20 * 60 # 20 minutes while delete_timeout > 0: - desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", - extra_item_id=RO_delete_action) + 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) @@ -1729,24 +2122,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" @@ -1783,6 +2158,8 @@ class NsLcm(LcmBase): self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) if db_nsr: db_nsr_update["_admin.nslcmop"] = None + db_nsr_update["_admin.current-operation"] = None + db_nsr_update["_admin.operation-type"] = None self.update_db_2("nsrs", nsr_id, db_nsr_update) except DbException as e: self.logger.error(logging_text + "Cannot update database: {}".format(e)) @@ -1794,6 +2171,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") @@ -1833,11 +2222,17 @@ class NsLcm(LcmBase): width=256) elif isinstance(calculated_params[param_name], str) and calculated_params[param_name].startswith("!!yaml "): calculated_params[param_name] = calculated_params[param_name][7:] + + # add always ns_config_info if primitive name is config + if primitive_desc["name"] == "config": + if "ns_config_info" in instantiation_params: + calculated_params["ns_config_info"] = instantiation_params["ns_config_info"] return calculated_params async def _ns_execute_primitive(self, db_deployed, member_vnf_index, vdu_id, vdu_name, vdu_count_index, - primitive, primitive_params, retries=0, retries_interval=30): - 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: @@ -1850,55 +2245,42 @@ 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() + "execution environment" + .format(member_vnf_index, vdu_id, vdu_name, vdu_count_index)) + if primitive == "config": primitive_params = {"params": primitive_params} + while retries >= 0: - 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_ in ("completed", "failed"): - primitive_result = "COMPLETED" if primitive_result_ == "completed" else "FAILED" - detailed_result = await self.n2vc.GetPrimitiveOutput(model_name, primitive_id) - break - elif primitive_result_ is None and primitive == "config": - primitive_result = "COMPLETED" - detailed_result = None - break - else: # ("running", "pending", None): - pass - await asyncio.sleep(5, loop=self.loop) - else: - raise LcmException("timeout after {} seconds".format(self.timeout_primitive)) - if primitive_result == "COMPLETED": + try: + output = await self.n2vc.exec_primitive( + ee_id=ee_id, + primitive_name=primitive, + params_dict=primitive_params + ) + # execution was OK break - retries -= 1 - if retries >= 0: - await asyncio.sleep(retries_interval, loop=self.loop) + 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 primitive_result, detailed_result - except (N2VCPrimitiveExecutionFailed, LcmException) as e: - return "FAILED", str(e) + return output, 'OK' + + except Exception as e: + return 'Error executing action {}: {}'.format(primitive, e), 'FAIL' async def action(self, nsr_id, nslcmop_id): @@ -1912,13 +2294,17 @@ class NsLcm(LcmBase): # get all needed from database db_nsr = None db_nslcmop = None - db_nsr_update = {"_admin.nslcmop": nslcmop_id} + db_nsr_update = {"_admin.nslcmop": nslcmop_id, + "_admin.current-operation": nslcmop_id, + "_admin.operation-type": "action"} + self.update_db_2("nsrs", nsr_id, db_nsr_update) db_nslcmop_update = {} nslcmop_operation_state = None nslcmop_operation_state_detail = None exc = None try: # wait for any previous tasks in process + step = "Waiting for previous operations to terminate" await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) step = "Getting information from database" @@ -1928,6 +2314,7 @@ class NsLcm(LcmBase): nsr_deployed = db_nsr["_admin"].get("deployed") vnf_index = db_nslcmop["operationParams"].get("member_vnf_index") vdu_id = db_nslcmop["operationParams"].get("vdu_id") + kdu_name = db_nslcmop["operationParams"].get("kdu_name") vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index") vdu_name = db_nslcmop["operationParams"].get("vdu_name") @@ -1961,6 +2348,79 @@ class NsLcm(LcmBase): if config_primitive["name"] == primitive: config_primitive_desc = config_primitive break + elif kdu_name: + self.logger.debug(logging_text + "Checking actions in KDUs") + kdur = next((x for x in db_vnfr["kdur"] if x["kdu_name"] == kdu_name), None) + desc_params = self._format_additional_params(kdur.get("additionalParams")) or {} + if primitive_params: + desc_params.update(primitive_params) + # TODO Check if we will need something at vnf level + index = 0 + for kdu in get_iterable(nsr_deployed, "K8s"): + if kdu_name == kdu["kdu-name"]: + db_dict = {"collection": "nsrs", "filter": {"_id": nsr_id}, + "path": "_admin.deployed.K8s.{}".format(index)} + if primitive == "upgrade": + if desc_params.get("kdu_model"): + kdu_model = desc_params.get("kdu_model") + del desc_params["kdu_model"] + else: + kdu_model = kdu.get("kdu-model") + parts = kdu_model.split(sep=":") + if len(parts) == 2: + kdu_model = parts[0] + + if kdu.get("k8scluster-type") == "chart": + output = await self.k8sclusterhelm.upgrade(cluster_uuid=kdu.get("k8scluster-uuid"), + kdu_instance=kdu.get("kdu-instance"), + atomic=True, kdu_model=kdu_model, + params=desc_params, db_dict=db_dict, + timeout=300) + elif kdu.get("k8scluster-type") == "juju": + # TODO Juju connector needed + pass + else: + msg = "k8scluster-type not defined" + raise LcmException(msg) + + self.logger.debug(logging_text + " Upgrade of kdu {} done".format(output)) + break + elif primitive == "rollback": + if kdu.get("k8scluster-type") == "chart": + output = await self.k8sclusterhelm.rollback(cluster_uuid=kdu.get("k8scluster-uuid"), + kdu_instance=kdu.get("kdu-instance"), + db_dict=db_dict) + elif kdu.get("k8scluster-type") == "juju": + # TODO Juju connector needed + pass + else: + msg = "k8scluster-type not defined" + raise LcmException(msg) + break + elif primitive == "status": + if kdu.get("k8scluster-type") == "chart": + output = await self.k8sclusterhelm.status_kdu(cluster_uuid=kdu.get("k8scluster-uuid"), + kdu_instance=kdu.get("kdu-instance")) + elif kdu.get("k8scluster-type") == "juju": + # TODO Juju connector needed + pass + else: + msg = "k8scluster-type not defined" + raise LcmException(msg) + break + index += 1 + + else: + raise LcmException("KDU '{}' not found".format(kdu_name)) + if output: + db_nslcmop_update["detailed-status"] = output + db_nslcmop_update["operationState"] = 'COMPLETED' + db_nslcmop_update["statusEnteredTime"] = time() + else: + db_nslcmop_update["detailed-status"] = '' + db_nslcmop_update["operationState"] = 'FAILED' + db_nslcmop_update["statusEnteredTime"] = time() + return elif vnf_index: for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): if config_primitive["name"] == primitive: @@ -1979,19 +2439,35 @@ class NsLcm(LcmBase): desc_params = {} if vnf_index: if db_vnfr.get("additionalParamsForVnf"): - desc_params.update(db_vnfr["additionalParamsForVnf"]) + desc_params = self._format_additional_params(db_vnfr["additionalParamsForVnf"]) + if vdu_id: + vdur = next((x for x in db_vnfr["vdur"] if x["vdu-id-ref"] == vdu_id), None) + if vdur.get("additionalParams"): + desc_params = self._format_additional_params(vdur["additionalParams"]) else: - if db_nsr.get("additionalParamsForVnf"): - desc_params.update(db_nsr["additionalParamsForNs"]) + if db_nsr.get("additionalParamsForNs"): + desc_params.update(self._format_additional_params(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, desc_params)) - db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = 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: @@ -2014,6 +2490,9 @@ class NsLcm(LcmBase): self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) if db_nsr: db_nsr_update["_admin.nslcmop"] = None + db_nsr_update["_admin.operation-type"] = None + db_nsr_update["_admin.nslcmop"] = None + db_nsr_update["_admin.current-operation"] = None self.update_db_2("nsrs", nsr_id, db_nsr_update) except DbException as e: self.logger.error(logging_text + "Cannot update database: {}".format(e)) @@ -2043,7 +2522,10 @@ class NsLcm(LcmBase): db_nslcmop = None db_nslcmop_update = {} nslcmop_operation_state = None - db_nsr_update = {"_admin.nslcmop": nslcmop_id} + db_nsr_update = {"_admin.nslcmop": nslcmop_id, + "_admin.current-operation": nslcmop_id, + "_admin.operation-type": "scale"} + self.update_db_2("nsrs", nsr_id, db_nsr_update) exc = None # in case of error, indicates what part of scale was failed to put nsr at error status scale_process = None @@ -2052,6 +2534,7 @@ class NsLcm(LcmBase): vnfr_scaled = False try: # wait for any previous tasks in process + step = "Waiting for previous operations to terminate" await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) step = "Getting nslcmop from database" @@ -2067,6 +2550,15 @@ class NsLcm(LcmBase): db_nsr_update["operational-status"] = "scaling" self.update_db_2("nsrs", nsr_id, db_nsr_update) nsr_deployed = db_nsr["_admin"].get("deployed") + + ####### + nsr_deployed = db_nsr["_admin"].get("deployed") + 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") + ####### + RO_nsr_id = nsr_deployed["RO"]["nsr_id"] vnf_index = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["member-vnf-index"] scaling_group = db_nslcmop["operationParams"]["scaleVnfData"]["scaleByStepData"]["scaling-group-descriptor"] @@ -2190,6 +2682,7 @@ class NsLcm(LcmBase): 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" primitive_params = self._map_primitive_params(config_primitive, {}, vnfr_params) @@ -2289,6 +2782,7 @@ class NsLcm(LcmBase): else: assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) else: + if ns_status == "ERROR": raise ROclient.ROClientException(ns_status_info) elif ns_status == "BUILD": @@ -2452,6 +2946,8 @@ class NsLcm(LcmBase): if db_nslcmop and db_nslcmop_update: self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) if db_nsr: + db_nsr_update["_admin.current-operation"] = None + db_nsr_update["_admin.operation-type"] = None db_nsr_update["_admin.nslcmop"] = None self.update_db_2("nsrs", nsr_id, db_nsr_update) except DbException as e: