X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=1a48cfb28c7f592c1603b5387beac8f4cf6d5c1b;hb=4d761ebb95fc7a809ccf63d8d86ceb1edd106c8f;hp=8742488ba52bc3b0811ff9064695db81eaa699c9;hpb=e64f7fb3e0efd6fcc78ea322c90106c7403a8a62;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 8742488..1a48cfb 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -53,7 +53,7 @@ def get_iterable(in_dict, in_key): def populate_dict(target_dict, key_list, value): """ - Upate target_dict creating nested dictionaries with the key_list. Last key_list item is asigned the value. + Update target_dict creating nested dictionaries with the key_list. Last key_list item is asigned the value. Example target_dict={K: J}; key_list=[a,b,c]; target_dict will be {K: J, a: {b: {c: value}}} :param target_dict: dictionary to be changed :param key_list: list of keys to insert at target_dict @@ -67,12 +67,31 @@ 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 timeout_charm_delete = 10 * 60 timeout_primitive = 10 * 60 # timeout for primitive execution + SUBOPERATION_STATUS_NOT_FOUND = -1 + SUBOPERATION_STATUS_NEW = -2 + SUBOPERATION_STATUS_SKIP = -3 + def __init__(self, db, msg, fs, lcm_tasks, ro_config, vca_config, loop): """ Init, Connect to database, filesystem storage, and messaging @@ -101,6 +120,7 @@ class NsLcm(LcmBase): artifacts=None, juju_public_key=vca_config.get('pubkey'), ca_cert=vca_config.get('cacert'), + api_proxy=vca_config.get('apiproxy') ) self.RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -309,7 +329,7 @@ class NsLcm(LcmBase): vdu_needed_access = [] mgmt_cp = None if vnfd.get("vnf-configuration"): - ssh_required = vnfd["vnf-configuration"].get("config-access", {}).get("ssh-access").get("required") + ssh_required = deep_get(vnfd, ("vnf-configuration", "config-access", "ssh-access", "required")) if ssh_required and vnfd.get("mgmt-interface"): if vnfd["mgmt-interface"].get("vdu-id"): vdu_needed_access.append(vnfd["mgmt-interface"]["vdu-id"]) @@ -318,7 +338,7 @@ class NsLcm(LcmBase): for vdu in vnfd.get("vdu", ()): if vdu.get("vdu-configuration"): - ssh_required = vdu["vdu-configuration"].get("config-access", {}).get("ssh-access").get("required") + ssh_required = deep_get(vdu, ("vdu-configuration", "config-access", "ssh-access", "required")) if ssh_required: vdu_needed_access.append(vdu["id"]) elif mgmt_cp: @@ -394,6 +414,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 @@ -427,6 +452,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"])), @@ -442,6 +472,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): @@ -459,7 +490,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 @@ -656,6 +687,7 @@ class NsLcm(LcmBase): exc = None try: # wait for any previous tasks in process + step = "Waiting for previous tasks" await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) step = "Getting nslcmop={} from db".format(nslcmop_id) @@ -700,8 +732,7 @@ class NsLcm(LcmBase): db_nsr_update["detailed-status"] = "creating" db_nsr_update["operational-status"] = "init" - if not db_nsr["_admin"].get("deployed") or not db_nsr["_admin"]["deployed"].get("RO") or \ - not db_nsr["_admin"]["deployed"]["RO"].get("vnfd"): + 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"] = [] @@ -724,7 +755,7 @@ class NsLcm(LcmBase): machine_spec = {} if native_charm: - machine_spec["username"] = charm_params.get("username"), + machine_spec["username"] = charm_params.get("username") machine_spec["hostname"] = charm_params.get("rw_mgmt_ip") # Note: The charm needs to exist on disk at the location @@ -851,7 +882,6 @@ class NsLcm(LcmBase): if vdu_config["juju"].get("proxy") is False: # native_charm, will be deployed after VM. Skip proxy_charm = None - if proxy_charm: if not vca_model_name: step = "creating VCA model name" @@ -885,7 +915,6 @@ class NsLcm(LcmBase): if ns_config["juju"].get("proxy") is False: # native_charm, will be deployed after VM. Skip proxy_charm = None - if proxy_charm: step = "deploying proxy charm to configure ns" # TODO is NS magmt IP address needed? @@ -1110,7 +1139,7 @@ class NsLcm(LcmBase): # Crate ns at RO # if present use it unless in error status - RO_nsr_id = db_nsr["_admin"].get("deployed", {}).get("RO", {}).get("nsr_id") + 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" @@ -1284,8 +1313,8 @@ class NsLcm(LcmBase): vnf_config = vnfd.get("vnf-configuration") if vnf_config and vnf_config.get("juju"): native_charm = vnf_config["juju"].get("proxy") is False - - if native_charm: + proxy_charm = vnf_config["juju"]["charm"] + if native_charm and proxy_charm: if not vca_model_name: step = "creating VCA model name '{}'".format(nsr_id) self.logger.debug(logging_text + step) @@ -1294,6 +1323,8 @@ class NsLcm(LcmBase): db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id self.update_db_2("nsrs", nsr_id, db_nsr_update) step = "deploying native charm for vnf_member_index={}".format(vnf_index) + self.logger.debug(logging_text + step) + vnfr_params["rw_mgmt_ip"] = db_vnfrs[vnf_index]["ip-address"] charm_params = { "user_values": vnfr_params, @@ -1326,8 +1357,8 @@ class NsLcm(LcmBase): if vdu_config and vdu_config.get("juju"): native_charm = vdu_config["juju"].get("proxy") is False - - if native_charm: + proxy_charm = vdu_config["juju"]["charm"] + if native_charm and proxy_charm: if not vca_model_name: step = "creating VCA model name" await self.n2vc.CreateNetworkService(nsr_id) @@ -1336,8 +1367,11 @@ class NsLcm(LcmBase): self.update_db_2("nsrs", nsr_id, db_nsr_update) step = "deploying native charm for vnf_member_index={} vdu_id={}".format(vnf_index, vdu["id"]) - await self.n2vc.login() + + self.logger.debug(logging_text + step) + vdur = db_vnfrs[vnf_index]["vdur"][vdu_index] + # TODO for the moment only first vdu_id contains a charm deployed if vdur["vdu-id-ref"] != vdu["id"]: raise LcmException("Mismatch vdur {}, vdu {} at index {} for vnf {}" @@ -1361,6 +1395,8 @@ class NsLcm(LcmBase): charm_params["username"] = vdu_config["config-access"]["ssh-access"].get( "default-user") + await self.n2vc.login() + deploy_charm(vnf_index, vdu["id"], vdur.get("name"), vdur["count-index"], charm_params, n2vc_info, native_charm) number_to_configure += 1 @@ -1370,8 +1406,8 @@ class NsLcm(LcmBase): ns_config = nsd.get("ns-configuration") if ns_config and ns_config.get("juju"): native_charm = ns_config["juju"].get("proxy") is False - - if native_charm: + proxy_charm = ns_config["juju"]["charm"] + if native_charm and proxy_charm: step = "deploying native charm to configure ns" # TODO is NS magmt IP address needed? @@ -1619,30 +1655,156 @@ class NsLcm(LcmBase): 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) + # sub-operations + + def _reintent_or_skip_suboperation(self, db_nslcmop, op_index): + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + if (op.get('operationState') == 'COMPLETED'): + # b. Skip sub-operation + # _ns_execute_primitive() or RO.create_action() will NOT be executed + return self.SUBOPERATION_STATUS_SKIP + else: + # c. Reintent executing sub-operation + # The sub-operation exists, and operationState != 'COMPLETED' + # Update operationState = 'PROCESSING' to indicate a reintent. + operationState = 'PROCESSING' + detailed_status = 'In progress' + self._update_suboperation_status( + db_nslcmop, op_index, operationState, detailed_status) + # Return the sub-operation index + # _ns_execute_primitive() or RO.create_action() will be called from scale() + # with arguments extracted from the sub-operation + return op_index + + # Find a sub-operation where all keys in a matching dictionary must match + # Returns the index of the matching sub-operation, or SUBOPERATION_STATUS_NOT_FOUND if no match + def _find_suboperation(self, db_nslcmop, match): + if (db_nslcmop and match): + op_list = db_nslcmop.get('_admin', {}).get('operations', []) + for i, op in enumerate(op_list): + if all(op.get(k) == match[k] for k in match): + return i + return self.SUBOPERATION_STATUS_NOT_FOUND + + # Update status for a sub-operation given its index + def _update_suboperation_status(self, db_nslcmop, op_index, operationState, detailed_status): + # Update DB for HA tasks + q_filter = {'_id': db_nslcmop['_id']} + update_dict = {'_admin.operations.{}.operationState'.format(op_index): operationState, + '_admin.operations.{}.detailed-status'.format(op_index): detailed_status} + self.db.set_one("nslcmops", + q_filter=q_filter, + update_dict=update_dict, + fail_on_empty=False) + + # Add sub-operation, return the index of the added sub-operation + # Optionally, set operationState, detailed-status, and operationType + # Status and type are currently set for 'scale' sub-operations: + # 'operationState' : 'PROCESSING' | 'COMPLETED' | 'FAILED' + # 'detailed-status' : status message + # 'operationType': may be any type, in the case of scaling: 'PRE-SCALE' | 'POST-SCALE' + # Status and operation type are currently only used for 'scale', but NOT for 'terminate' sub-operations. + def _add_suboperation(self, db_nslcmop, vnf_index, vdu_id, vdu_count_index, + vdu_name, primitive, mapped_primitive_params, + operationState=None, detailed_status=None, operationType=None, + RO_nsr_id=None, RO_scaling_info=None): + if not (db_nslcmop): + return self.SUBOPERATION_STATUS_NOT_FOUND + # Get the "_admin.operations" list, if it exists + db_nslcmop_admin = db_nslcmop.get('_admin', {}) + op_list = db_nslcmop_admin.get('operations') + # Create or append to the "_admin.operations" list new_op = {'member_vnf_index': vnf_index, 'vdu_id': vdu_id, 'vdu_count_index': vdu_count_index, 'primitive': primitive, 'primitive_params': mapped_primitive_params} - if 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) + if operationState: + new_op['operationState'] = operationState + if detailed_status: + new_op['detailed-status'] = detailed_status + if operationType: + new_op['lcmOperationType'] = operationType + if RO_nsr_id: + new_op['RO_nsr_id'] = RO_nsr_id + if RO_scaling_info: + new_op['RO_scaling_info'] = RO_scaling_info + if not op_list: + # No existing operations, create key 'operations' with current operation as first list element + db_nslcmop_admin.update({'operations': [new_op]}) + op_list = db_nslcmop_admin.get('operations') + else: + # Existing operations, append operation to list + op_list.append(new_op) + + db_nslcmop_update = {'_admin.operations': op_list} + self.update_db_2("nslcmops", db_nslcmop['_id'], db_nslcmop_update) + op_index = len(op_list) - 1 + return op_index + + # Helper methods for scale() sub-operations + + # pre-scale/post-scale: + # Check for 3 different cases: + # a. New: First time execution, return SUBOPERATION_STATUS_NEW + # b. Skip: Existing sub-operation exists, operationState == 'COMPLETED', return SUBOPERATION_STATUS_SKIP + # c. Reintent: Existing sub-operation exists, operationState != 'COMPLETED', return op_index to re-execute + def _check_or_add_scale_suboperation(self, db_nslcmop, vnf_index, + vnf_config_primitive, primitive_params, operationType, + RO_nsr_id=None, RO_scaling_info=None): + # Find this sub-operation + if (RO_nsr_id and RO_scaling_info): + operationType = 'SCALE-RO' + match = { + 'member_vnf_index': vnf_index, + 'RO_nsr_id': RO_nsr_id, + 'RO_scaling_info': RO_scaling_info, + } + else: + match = { + 'member_vnf_index': vnf_index, + 'primitive': vnf_config_primitive, + 'primitive_params': primitive_params, + 'lcmOperationType': operationType + } + op_index = self._find_suboperation(db_nslcmop, match) + if (op_index == self.SUBOPERATION_STATUS_NOT_FOUND): + # a. New sub-operation + # The sub-operation does not exist, add it. + # _ns_execute_primitive() will be called from scale() as usual, with non-modified arguments + # The following parameters are set to None for all kind of scaling: + vdu_id = None + vdu_count_index = None + vdu_name = None + if (RO_nsr_id and RO_scaling_info): + vnf_config_primitive = None + primitive_params = None else: - # Not first operation, append operation to existing list - op_list.append(new_op) + RO_nsr_id = None + RO_scaling_info = None + # Initial status for sub-operation + operationState = 'PROCESSING' + detailed_status = 'In progress' + # Add sub-operation for pre/post-scaling (zero or more operations) + self._add_suboperation(db_nslcmop, + vnf_index, + vdu_id, + vdu_count_index, + vdu_name, + vnf_config_primitive, + primitive_params, + operationState, + detailed_status, + operationType, + RO_nsr_id, + RO_scaling_info) + return self.SUBOPERATION_STATUS_NEW + else: + # Return either SUBOPERATION_STATUS_SKIP (operationState == 'COMPLETED'), + # or op_index (operationState != 'COMPLETED') + return self._reintent_or_skip_suboperation(db_nslcmop, op_index) - db_nslcmop_update['_admin.operations'] = op_list - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + # Helper methods for terminate() async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id): """ Create a primitive with params from VNFD @@ -1677,7 +1839,7 @@ class NsLcm(LcmBase): 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 + # Add sub-operation self._add_suboperation(db_nslcmop, nslcmop_id, vnf_index, @@ -1686,7 +1848,7 @@ class NsLcm(LcmBase): vdu_name, primitive, mapped_primitive_params) - # Suboperations: Call _ns_execute_primitive() instead of action() + # 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( @@ -2327,12 +2489,12 @@ class NsLcm(LcmBase): }) vdu_delete = vdu_scaling_info.pop("vdu-delete") - # execute primitive service PRE-SCALING + # PRE-SCALE BEGIN step = "Executing pre-scale vnf-config-primitive" if scaling_descriptor.get("scaling-config-action"): for scaling_config_action in scaling_descriptor["scaling-config-action"]: - if scaling_config_action.get("trigger") and scaling_config_action["trigger"] == "pre-scale-in" \ - and scaling_type == "SCALE_IN": + if (scaling_config_action.get("trigger") == "pre-scale-in" and scaling_type == "SCALE_IN") \ + or (scaling_config_action.get("trigger") == "pre-scale-out" and scaling_type == "SCALE_OUT"): vnf_config_primitive = scaling_config_action["vnf-config-primitive-name-ref"] step = db_nslcmop_update["detailed-status"] = \ "executing pre-scale scaling-config-action '{}'".format(vnf_config_primitive) @@ -2350,108 +2512,169 @@ 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" - result, result_detail = await self._ns_execute_primitive( - nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, - self._map_primitive_params(config_primitive, {}, vnfr_params)) - self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( - vnf_config_primitive, result, result_detail)) + primitive_params = self._map_primitive_params(config_primitive, {}, vnfr_params) + + # Pre-scale reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, nslcmop_id, vnf_index, vnf_config_primitive, primitive_params, 'PRE-SCALE') + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + + "vnf_config_primitive={} Skipped sub-operation, result {} {}".format( + vnf_config_primitive, result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "vnf_config_primitive={} New sub-operation". + format(vnf_config_primitive)) + else: + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + vnf_index = op.get('member_vnf_index') + vnf_config_primitive = op.get('primitive') + primitive_params = op.get('primitive_params') + self.logger.debug(logging_text + "vnf_config_primitive={} Sub-operation reintent". + format(vnf_config_primitive)) + # Execute the primitive, either with new (first-time) or registered (reintent) args + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, primitive_params) + self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( + vnf_config_primitive, result, result_detail)) + # Update operationState = COMPLETED | FAILED + self._update_suboperation_status( + db_nslcmop, op_index, result, result_detail) + if result == "FAILED": raise LcmException(result_detail) db_nsr_update["config-status"] = old_config_status scale_process = None + # PRE-SCALE END + # SCALE RO - BEGIN + # Should this block be skipped if 'RO_nsr_id' == None ? + # if (RO_nsr_id and RO_scaling_info): if RO_scaling_info: scale_process = "RO" - RO_desc = await self.RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info}) - db_nsr_update["_admin.scaling-group.{}.nb-scale-op".format(admin_scale_index)] = nb_scale_op - db_nsr_update["_admin.scaling-group.{}.time".format(admin_scale_index)] = time() - # wait until ready - RO_nslcmop_id = RO_desc["instance_action_id"] - db_nslcmop_update["_admin.deploy.RO"] = RO_nslcmop_id - - RO_task_done = False - step = detailed_status = "Waiting RO_task_id={} to complete the scale action.".format(RO_nslcmop_id) - detailed_status_old = None - self.logger.debug(logging_text + step) - - deployment_timeout = 1 * 3600 # One hour - while deployment_timeout > 0: - if not RO_task_done: - desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", - extra_item_id=RO_nslcmop_id) - ns_status, ns_status_info = self.RO.check_action_status(desc) - if ns_status == "ERROR": - raise ROclient.ROClientException(ns_status_info) - elif ns_status == "BUILD": - detailed_status = step + "; {}".format(ns_status_info) - elif ns_status == "ACTIVE": - RO_task_done = True - step = detailed_status = "Waiting 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) + # Scale RO reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, vnf_index, None, None, 'SCALE-RO', RO_nsr_id, RO_scaling_info) + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + "Skipped sub-operation RO, result {} {}".format( + result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "New sub-operation RO") else: - desc = await 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": - detailed_status = step + "; {}".format(ns_status_info) - elif ns_status == "ACTIVE": - step = detailed_status = \ - "Waiting for management IP address reported by the VIM. Updating VNFRs" - if not vnfr_scaled: - self.scale_vnfr(db_vnfr, vdu_create=vdu_create, vdu_delete=vdu_delete) - vnfr_scaled = True - try: - desc = await self.RO.show("ns", RO_nsr_id) - # nsr_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc) - self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc) - break - except LcmExceptionNoMgmtIP: - pass + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + RO_nsr_id = op.get('RO_nsr_id') + RO_scaling_info = op.get('RO_scaling_info') + self.logger.debug(logging_text + "Sub-operation RO reintent".format( + vnf_config_primitive)) + + RO_desc = await self.RO.create_action("ns", RO_nsr_id, {"vdu-scaling": RO_scaling_info}) + db_nsr_update["_admin.scaling-group.{}.nb-scale-op".format(admin_scale_index)] = nb_scale_op + db_nsr_update["_admin.scaling-group.{}.time".format(admin_scale_index)] = time() + # wait until ready + RO_nslcmop_id = RO_desc["instance_action_id"] + db_nslcmop_update["_admin.deploy.RO"] = RO_nslcmop_id + + RO_task_done = False + step = detailed_status = "Waiting RO_task_id={} to complete the scale action.".format(RO_nslcmop_id) + detailed_status_old = None + self.logger.debug(logging_text + step) + + deployment_timeout = 1 * 3600 # One hour + while deployment_timeout > 0: + if not RO_task_done: + desc = await self.RO.show("ns", item_id_name=RO_nsr_id, extra_item="action", + extra_item_id=RO_nslcmop_id) + ns_status, ns_status_info = self.RO.check_action_status(desc) + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + elif ns_status == "BUILD": + detailed_status = step + "; {}".format(ns_status_info) + elif ns_status == "ACTIVE": + RO_task_done = True + step = detailed_status = "Waiting ns ready at RO. RO_id={}".format(RO_nsr_id) + self.logger.debug(logging_text + step) + else: + assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) else: - assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) - if detailed_status != detailed_status_old: - detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status - self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + if ns_status == "ERROR": + raise ROclient.ROClientException(ns_status_info) + elif ns_status == "BUILD": + detailed_status = step + "; {}".format(ns_status_info) + elif ns_status == "ACTIVE": + step = detailed_status = \ + "Waiting for management IP address reported by the VIM. Updating VNFRs" + if not vnfr_scaled: + self.scale_vnfr(db_vnfr, vdu_create=vdu_create, vdu_delete=vdu_delete) + vnfr_scaled = True + try: + desc = await self.RO.show("ns", RO_nsr_id) + # nsr_deployed["nsr_ip"] = RO.get_ns_vnf_info(desc) + self.ns_update_vnfr({db_vnfr["member-vnf-index-ref"]: db_vnfr}, desc) + break + except LcmExceptionNoMgmtIP: + pass + else: + assert False, "ROclient.check_ns_status returns unknown {}".format(ns_status) + if detailed_status != detailed_status_old: + self._update_suboperation_status( + db_nslcmop, op_index, 'COMPLETED', detailed_status) + detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) - await asyncio.sleep(5, loop=self.loop) - deployment_timeout -= 5 - if deployment_timeout <= 0: - raise ROclient.ROClientException("Timeout waiting ns to be ready") - - # update VDU_SCALING_INFO with the obtained ip_addresses - if vdu_scaling_info["scaling_direction"] == "OUT": - for vdur in reversed(db_vnfr["vdur"]): - if vdu_scaling_info["vdu-create"].get(vdur["vdu-id-ref"]): - vdu_scaling_info["vdu-create"][vdur["vdu-id-ref"]] -= 1 - vdu_scaling_info["vdu"].append({ - "name": vdur["name"], - "vdu_id": vdur["vdu-id-ref"], - "interface": [] - }) - for interface in vdur["interfaces"]: - vdu_scaling_info["vdu"][-1]["interface"].append({ - "name": interface["name"], - "ip_address": interface["ip-address"], - "mac_address": interface.get("mac-address"), + await asyncio.sleep(5, loop=self.loop) + deployment_timeout -= 5 + if deployment_timeout <= 0: + self._update_suboperation_status( + db_nslcmop, nslcmop_id, op_index, 'FAILED', "Timeout when waiting for ns to get ready") + raise ROclient.ROClientException("Timeout waiting ns to be ready") + + # update VDU_SCALING_INFO with the obtained ip_addresses + if vdu_scaling_info["scaling_direction"] == "OUT": + for vdur in reversed(db_vnfr["vdur"]): + if vdu_scaling_info["vdu-create"].get(vdur["vdu-id-ref"]): + vdu_scaling_info["vdu-create"][vdur["vdu-id-ref"]] -= 1 + vdu_scaling_info["vdu"].append({ + "name": vdur["name"], + "vdu_id": vdur["vdu-id-ref"], + "interface": [] }) - del vdu_scaling_info["vdu-create"] + for interface in vdur["interfaces"]: + vdu_scaling_info["vdu"][-1]["interface"].append({ + "name": interface["name"], + "ip_address": interface["ip-address"], + "mac_address": interface.get("mac-address"), + }) + del vdu_scaling_info["vdu-create"] + + self._update_suboperation_status(db_nslcmop, op_index, 'COMPLETED', 'Done') + # SCALE RO - END scale_process = None if db_nsr_update: self.update_db_2("nsrs", nsr_id, db_nsr_update) + # POST-SCALE BEGIN # execute primitive service POST-SCALING step = "Executing post-scale vnf-config-primitive" if scaling_descriptor.get("scaling-config-action"): for scaling_config_action in scaling_descriptor["scaling-config-action"]: - if scaling_config_action.get("trigger") and scaling_config_action["trigger"] == "post-scale-out" \ - and scaling_type == "SCALE_OUT": + if (scaling_config_action.get("trigger") == "post-scale-in" and scaling_type == "SCALE_IN") \ + or (scaling_config_action.get("trigger") == "post-scale-out" and scaling_type == "SCALE_OUT"): vnf_config_primitive = scaling_config_action["vnf-config-primitive-name-ref"] step = db_nslcmop_update["detailed-status"] = \ "executing post-scale scaling-config-action '{}'".format(vnf_config_primitive) @@ -2471,16 +2694,46 @@ class NsLcm(LcmBase): config_primitive)) scale_process = "VCA" db_nsr_update["config-status"] = "configuring post-scaling" + primitive_params = self._map_primitive_params(config_primitive, {}, vnfr_params) + + # Post-scale reintent check: Check if this sub-operation has been executed before + op_index = self._check_or_add_scale_suboperation( + db_nslcmop, nslcmop_id, vnf_index, vnf_config_primitive, primitive_params, 'POST-SCALE') + if (op_index == self.SUBOPERATION_STATUS_SKIP): + # Skip sub-operation + result = 'COMPLETED' + result_detail = 'Done' + self.logger.debug(logging_text + + "vnf_config_primitive={} Skipped sub-operation, result {} {}". + format(vnf_config_primitive, result, result_detail)) + else: + if (op_index == self.SUBOPERATION_STATUS_NEW): + # New sub-operation: Get index of this sub-operation + op_index = len(db_nslcmop.get('_admin', {}).get('operations')) - 1 + self.logger.debug(logging_text + "vnf_config_primitive={} New sub-operation". + format(vnf_config_primitive)) + else: + # Reintent: Get registered params for this existing sub-operation + op = db_nslcmop.get('_admin', {}).get('operations', [])[op_index] + vnf_index = op.get('member_vnf_index') + vnf_config_primitive = op.get('primitive') + primitive_params = op.get('primitive_params') + self.logger.debug(logging_text + "vnf_config_primitive={} Sub-operation reintent". + format(vnf_config_primitive)) + # Execute the primitive, either with new (first-time) or registered (reintent) args + result, result_detail = await self._ns_execute_primitive( + nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, primitive_params) + self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( + vnf_config_primitive, result, result_detail)) + # Update operationState = COMPLETED | FAILED + self._update_suboperation_status( + db_nslcmop, op_index, result, result_detail) - result, result_detail = await self._ns_execute_primitive( - nsr_deployed, vnf_index, None, None, None, vnf_config_primitive, - self._map_primitive_params(config_primitive, {}, vnfr_params)) - self.logger.debug(logging_text + "vnf_config_primitive={} Done with result {} {}".format( - vnf_config_primitive, result, result_detail)) if result == "FAILED": raise LcmException(result_detail) db_nsr_update["config-status"] = old_config_status scale_process = None + # POST-SCALE END db_nslcmop_update["operationState"] = nslcmop_operation_state = "COMPLETED" db_nslcmop_update["statusEnteredTime"] = time()