X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=8742488ba52bc3b0811ff9064695db81eaa699c9;hb=e64f7fb3e0efd6fcc78ea322c90106c7403a8a62;hp=caadce1847952f8f15a80f961f2e3cbb783d3ab0;hpb=14cca5a957ab2770b5d0f17f604a773ba0f605a5;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index caadce1..8742488 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -24,12 +24,12 @@ 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, NetworkServiceDoesNotExist +from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed, NetworkServiceDoesNotExist, PrimitiveDoesNotExist from copy import copy, deepcopy from http import HTTPStatus @@ -102,6 +102,7 @@ class NsLcm(LcmBase): juju_public_key=vca_config.get('pubkey'), ca_cert=vca_config.get('cacert'), ) + self.RO = ROclient.ROClient(self.loop, **self.ro_config) def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None): """ @@ -303,36 +304,39 @@ class NsLcm(LcmBase): "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 = vnfd["vnf-configuration"].get("config-access", {}).get("ssh-access").get("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 = vdu["vdu-configuration"].get("config-access", {}).get("ssh-access").get("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"] @@ -600,12 +604,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"): @@ -618,16 +623,22 @@ 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(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={} instantiate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") # get all needed from database @@ -644,6 +655,9 @@ class NsLcm(LcmBase): n2vc_key_list = [] # list of public keys to be injected as authorized to VMs exc = None 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) @@ -652,17 +666,6 @@ class NsLcm(LcmBase): 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") - step = "Getting vnfrs from db" db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id}) db_vnfds_ref = {} @@ -935,17 +938,28 @@ class NsLcm(LcmBase): .format(vca_deployed["member-vnf-index"], vca_deployed["vdu_id"]) self.logger.debug(logging_text + step) - primitive_id = await self.n2vc.ExecutePrimitive( - vca_deployed["model"], - vca_deployed["application"], - "get-ssh-public-key", - None, - ) - vca_deployed["step"] = db_nsr_update[database_entry + "step"] = "get-ssh-public-key" - vca_deployed["primitive_id"] = db_nsr_update[database_entry + "primitive_id"] =\ - primitive_id - db_nsr_update[database_entry + "operational-status"] =\ - vca_deployed["operational-status"] + try: + primitive_id = await self.n2vc.ExecutePrimitive( + vca_deployed["model"], + vca_deployed["application"], + "get-ssh-public-key", + None, + ) + vca_deployed["step"] = db_nsr_update[database_entry + "step"] = "get-ssh-public-key" + vca_deployed["primitive_id"] = db_nsr_update[database_entry + "primitive_id"] =\ + primitive_id + db_nsr_update[database_entry + "operational-status"] =\ + vca_deployed["operational-status"] + except PrimitiveDoesNotExist: + ssh_public_key = None + vca_deployed["step"] = db_nsr_update[database_entry + "step"] =\ + "ssh-public-key-obtained" + vca_deployed["ssh-public-key"] = db_nsr_update[database_entry + "ssh-public-key"] =\ + ssh_public_key + step = "charm ssh-public-key for member_vnf_index={} vdu_id={} not needed".format( + vca_deployed["member-vnf-index"], vca_deployed["vdu_id"]) + self.logger.debug(logging_text + step) + elif vca_deployed["step"] in ("get-ssh-public-key", "retry-get-ssh-public-key"): primitive_id = vca_deployed["primitive_id"] primitive_status = await self.n2vc.GetPrimitiveStatus(vca_deployed["model"], @@ -1025,7 +1039,6 @@ class NsLcm(LcmBase): .format(vca_deployed["member-vnf-index"], vca_deployed["vdu_id"])) # deploy RO - RO = ROclient.ROClient(self.loop, **self.ro_config) # get vnfds, instantiate at RO for c_vnf in nsd.get("constituent-vnfd", ()): member_vnf_index = c_vnf["member-vnf-index"] @@ -1048,7 +1061,7 @@ class NsLcm(LcmBase): # 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}) + 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={}". @@ -1056,7 +1069,7 @@ class NsLcm(LcmBase): 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) + 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"])) @@ -1071,7 +1084,7 @@ class NsLcm(LcmBase): 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}) + 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( @@ -1089,7 +1102,7 @@ class NsLcm(LcmBase): 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) + 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)) @@ -1102,18 +1115,18 @@ class NsLcm(LcmBase): 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) + 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 = RO.check_ns_status(desc) + 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 RO.delete("ns", RO_nsr_id) + 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" @@ -1142,10 +1155,10 @@ class NsLcm(LcmBase): n2vc_key_list.append(n2vc_key) RO_ns_params = self.ns_params_2_RO(ns_params, nsd, db_vnfds_ref, n2vc_key_list) - 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) + 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" @@ -1153,13 +1166,13 @@ class NsLcm(LcmBase): 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) + step = ns_status_detailed = detailed_status = "Waiting VIM to deploy ns. 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) + 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) @@ -1228,10 +1241,11 @@ class NsLcm(LcmBase): if isinstance(v, str) and v.startswith("!!yaml "): add_params[k] = yaml.safe_load(v[7:]) add_params["rw_mgmt_ip"] = None + initial_config_primitive_list = nsd["ns-configuration"].get('initial-config-primitive', []) # add primitive verify-ssh-credentials to the list after config only when is a vnf or vdu charm initial_config_primitive_list = initial_config_primitive_list.copy() - if initial_config_primitive_list and vnf_index: + if initial_config_primitive_list and vnf_index and vca_deployed.get("ssh-public-key"): initial_config_primitive_list.insert(1, {"name": "verify-ssh-credentials", "parameter": []}) for initial_config_primitive in initial_config_primitive_list: @@ -1396,6 +1410,7 @@ class NsLcm(LcmBase): # waiting all charms are ok configuration_failed = False if number_to_configure: + step = "Waiting all charms are active" old_status = "configuring: init: {}".format(number_to_configure) db_nsr_update["config-status"] = old_status db_nsr_update["detailed-status"] = old_status @@ -1549,8 +1564,9 @@ class NsLcm(LcmBase): else: return False - # Get a numerically sorted list of the sequences for this VNFD's terminate action - def _get_terminate_config_primitive_seq_list(self, vnfd): + @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") @@ -1592,13 +1608,49 @@ class NsLcm(LcmBase): } return nslcmop - # Create a primitive with params from VNFD - # - Called from terminate() before deleting instance - # - Calls action() to execute the primitive + 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) + + def _add_suboperation(self, db_nslcmop, nslcmop_id, vnf_index, vdu_id, vdu_count_index, + vdu_name, primitive, mapped_primitive_params): + # Create the "_admin.operations" array, or append operation if array already exists + key_admin = '_admin' + key_operations = 'operations' + db_nslcmop_update = {} + db_nslcmop_admin = db_nslcmop.get(key_admin, {}) + op_list = db_nslcmop_admin.get(key_operations) + 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 db_nslcmop_admin: + if not op_list: + # First operation, create key 'operations' with current operation as first list element + db_nslcmop_admin.update({key_operations: [new_op]}) + op_list = db_nslcmop_admin.get(key_operations) + else: + # Not first operation, append operation to existing list + op_list.append(new_op) + + db_nslcmop_update['_admin.operations'] = op_list + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + 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_vnfds = {} 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"] @@ -1613,41 +1665,51 @@ class NsLcm(LcmBase): # 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, call terminate action + # 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 - operation = "action" - # primitive, i.e. "primitive": "touch" + # Create the primitive for each sequence, i.e. "primitive": "touch" primitive = seq.get('name') - primitive_params = {} - params = { - "member_vnf_index": vnf_index, - "primitive": primitive, - "primitive_params": primitive_params, - } - nslcmop_primitive = self._create_nslcmop(nsr_id, operation, params) - # Get a copy of db_nslcmop 'admin' part - db_nslcmop_action = {"_admin": deepcopy(db_nslcmop["_admin"])} - # Update db_nslcmop with the primitive data - db_nslcmop_action.update(nslcmop_primitive) - # Create a new db entry for the created primitive, returns the new ID. - # (The ID is normally obtained from Kafka.) - nslcmop_terminate_action_id = self.db.create( - "nslcmops", db_nslcmop_action) - # Execute the primitive - nslcmop_operation_state, nslcmop_operation_state_detail = await self.action( - nsr_id, nslcmop_terminate_action_id) + 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 suboperation + self._add_suboperation(db_nslcmop, + nslcmop_id, + vnf_index, + vdu_id, + vdu_count_index, + vdu_name, + primitive, + mapped_primitive_params) + # Suboperations: 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) + + # 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'] - nslcmop_operation_states_ok = ['COMPLETED', 'PARTIALLY_COMPLETED'] - if nslcmop_operation_state not in nslcmop_operation_states_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"), nslcmop_operation_state_detail)) + vnf_index, seq.get("name"), result_detail)) 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 @@ -1660,6 +1722,9 @@ class NsLcm(LcmBase): nslcmop_operation_state = None autoremove = False # autoremove after terminated 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) @@ -1714,7 +1779,6 @@ class NsLcm(LcmBase): # remove from RO RO_fail = False - RO = ROclient.ROClient(self.loop, **self.ro_config) # Delete ns RO_nsr_id = RO_delete_action = None @@ -1723,11 +1787,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 @@ -1741,9 +1806,9 @@ 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": @@ -1784,8 +1849,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: @@ -1810,7 +1875,7 @@ class NsLcm(LcmBase): step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ "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: @@ -1996,6 +2061,12 @@ class NsLcm(LcmBase): return "FAILED", str(e) 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 @@ -2007,6 +2078,9 @@ class NsLcm(LcmBase): 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}) @@ -2029,17 +2103,6 @@ class NsLcm(LcmBase): step = "Getting nsd from database" db_nsd = self.db.get_one("nsds", {"_id": db_nsr["nsd-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") - # for backward compatibility if nsr_deployed and isinstance(nsr_deployed.get("VCA"), dict): nsr_deployed["VCA"] = list(nsr_deployed["VCA"].values()) @@ -2127,6 +2190,12 @@ class NsLcm(LcmBase): 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 @@ -2142,16 +2211,8 @@ class NsLcm(LcmBase): old_config_status = "" vnfr_scaled = False try: - # 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") + # 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") @@ -2198,7 +2259,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}]}) @@ -2215,15 +2276,13 @@ 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"]) - - # self.logger.debug("MAX_INSTANCE_COUNT is {}".format(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)) - + 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"] = {} @@ -2306,8 +2365,7 @@ class NsLcm(LcmBase): 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}) + 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 @@ -2322,22 +2380,22 @@ class NsLcm(LcmBase): 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) + 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) + step = detailed_status = "Waiting VIM to deploy ns. 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: - desc = await RO.show("ns", RO_nsr_id) - ns_status, ns_status_info = RO.check_ns_status(desc) + desc = await self.RO.show("ns", RO_nsr_id) + ns_status, ns_status_info = self.RO.check_ns_status(desc) if ns_status == "ERROR": raise ROclient.ROClientException(ns_status_info) elif ns_status == "BUILD": @@ -2349,7 +2407,7 @@ class NsLcm(LcmBase): 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) + 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