X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=359bf111e1e32a5393f81e73bab3860540c2ba2e;hb=d5102d28ed49ab6ab61da512ca95b4c85572feb7;hp=951ad76147396c4251980ab6b2c8955b4ac946a4;hpb=da96482b5a0f4e2ad433f9ddd8a951eb59b322ba;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 951ad76..359bf11 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -29,7 +29,7 @@ from lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase from osm_common.dbbase import DbException from osm_common.fsbase import FsException -from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed +from n2vc.vnf import N2VC, N2VCPrimitiveExecutionFailed, NetworkServiceDoesNotExist from copy import copy, deepcopy from http import HTTPStatus @@ -99,6 +99,8 @@ class NsLcm(LcmBase): # 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'), ) def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None): @@ -197,7 +199,8 @@ class NsLcm(LcmBase): 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") + self.logger.error(logging_text + " Not present at nsr._admin.deployed.VCA. Received model_name={}". + format(model_name)) return if task: if task.cancelled(): @@ -242,6 +245,7 @@ class NsLcm(LcmBase): :return: The RO ns descriptor """ vim_2_RO = {} + wim_2_RO = {} # TODO feature 1417: Check that no instantiation is set over PDU # check if PDU forces a concrete vim-network-id and add it # check if PDU contains a SDN-assist info (dpid, switch, port) and pass it to RO @@ -258,6 +262,21 @@ class NsLcm(LcmBase): vim_2_RO[vim_account] = RO_vim_id return RO_vim_id + def wim_account_2_RO(wim_account): + if isinstance(wim_account, str): + if wim_account in wim_2_RO: + return wim_2_RO[wim_account] + + db_wim = self.db.get_one("wim_accounts", {"_id": wim_account}) + if db_wim["_admin"]["operationalState"] != "ENABLED": + raise LcmException("WIM={} is not available. operationalState={}".format( + wim_account, db_wim["_admin"]["operationalState"])) + RO_wim_id = db_wim["_admin"]["deployed"]["RO-account"] + wim_2_RO[wim_account] = RO_wim_id + return RO_wim_id + else: + return wim_account + def ip_profile_2_RO(ip_profile): RO_ip_profile = deepcopy((ip_profile)) if "dns-server" in RO_ip_profile: @@ -281,6 +300,7 @@ class NsLcm(LcmBase): # "name": ns_params["nsName"], # "description": ns_params.get("nsDescription"), "datacenter": vim_account_2_RO(ns_params["vimAccountId"]), + "wim_account": wim_account_2_RO(ns_params.get("wimAccountId")), # "scenario": ns_params["nsdId"], } if n2vc_key_list: @@ -402,6 +422,10 @@ class NsLcm(LcmBase): if "ip-profile" in vld_params: populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"), ip_profile_2_RO(vld_params["ip-profile"])) + + if "wimAccountId" in vld_params and vld_params["wimAccountId"] is not None: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "wim_account"), + wim_account_2_RO(vld_params["wimAccountId"])), if vld_params.get("vim-network-name"): RO_vld_sites = [] if isinstance(vld_params["vim-network-name"], dict): @@ -426,6 +450,12 @@ class NsLcm(LcmBase): RO_vld_sites.append({"netmap-use": vld_params["vim-network-id"]}) if RO_vld_sites: populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites) + if vld_params.get("ns-net"): + if isinstance(vld_params["ns-net"], dict): + for vld_id, instance_scenario_id in vld_params["ns-net"].items(): + RO_vld_ns_net = {"instance_scenario_id": instance_scenario_id, "osm_id": vld_id} + if RO_vld_ns_net: + populate_dict(RO_ns_params, ("networks", vld_params["name"], "use-network"), RO_vld_ns_net) if "vnfd-connection-point-ref" in vld_params: for cp_params in vld_params["vnfd-connection-point-ref"]: # look for interface @@ -539,7 +569,7 @@ class NsLcm(LcmBase): continue vnfr_update = {} if vnf_RO.get("ip_address"): - db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"] + db_vnfr["ip-address"] = vnfr_update["ip-address"] = vnf_RO["ip_address"].split(";")[0] elif not db_vnfr.get("ip-address"): raise LcmExceptionNoMgmtIP("ns member_vnf_index '{}' has no IP address".format(vnf_index)) @@ -554,7 +584,10 @@ class NsLcm(LcmBase): vdur_RO_count_index += 1 continue vdur["vim-id"] = vdur_RO.get("vim_vm_id") - vdur["ip-address"] = vdur_RO.get("ip_address") + if vdur_RO.get("ip_address"): + vdur["ip-address"] = vdur_RO["ip_address"].split(";")[0] + else: + vdur["ip-address"] = None vdur["vdu-id-ref"] = vdur_RO.get("vdu_osm_id") vdur["name"] = vdur_RO.get("vim_name") vdur["status"] = vdur_RO.get("status") @@ -645,8 +678,10 @@ class NsLcm(LcmBase): # 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 @@ -657,6 +692,10 @@ 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"): + populate_dict(db_nsr, ("_admin", "deployed", "RO", "vnfd"), []) + db_nsr_update["_admin.deployed.RO.vnfd"] = [] RO = ROclient.ROClient(self.loop, **self.ro_config) @@ -667,26 +706,39 @@ class NsLcm(LcmBase): # get vnfds, instantiate at RO for c_vnf in nsd.get("constituent-vnfd", ()): member_vnf_index = c_vnf["member-vnf-index"] + vnfd = db_vnfds_ref[c_vnf['vnfd-id-ref']] vnfd_ref = vnfd["id"] - step = db_nsr_update["detailed-status"] = "Creating vnfd={} at RO".format(vnfd_ref) + step = db_nsr_update["detailed-status"] = "Creating vnfd='{}' member-vnf-index='{}' at RO".format( + vnfd_ref, member_vnf_index) # self.logger.debug(logging_text + step) vnfd_id_RO = "{}.{}.{}".format(nsr_id, RO_descriptor_number, member_vnf_index[:23]) vnf_index_2_RO_id[member_vnf_index] = vnfd_id_RO RO_descriptor_number += 1 + # look position at deployed.RO.vnfd if not present it will be appended at the end + for index, vnf_deployed in enumerate(db_nsr["_admin"]["deployed"]["RO"]["vnfd"]): + if vnf_deployed["member-vnf-index"] == member_vnf_index: + break + else: + index = len(db_nsr["_admin"]["deployed"]["RO"]["vnfd"]) + db_nsr["_admin"]["deployed"]["RO"]["vnfd"].append(None) + # look if present + RO_update = {"member-vnf-index": member_vnf_index} vnfd_list = await RO.get_list("vnfd", filter_by={"osm_id": vnfd_id_RO}) if vnfd_list: - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnfd_id)] = vnfd_list[0]["uuid"] - self.logger.debug(logging_text + "vnfd={} exists at RO. Using RO_id={}".format( - vnfd_ref, vnfd_list[0]["uuid"])) + RO_update["id"] = vnfd_list[0]["uuid"] + self.logger.debug(logging_text + "vnfd='{}' member-vnf-index='{}' exists at RO. Using RO_id={}". + format(vnfd_ref, member_vnf_index, vnfd_list[0]["uuid"])) else: vnfd_RO = self.vnfd2RO(vnfd, vnfd_id_RO, db_vnfrs[c_vnf["member-vnf-index"]]. get("additionalParamsForVnf"), nsr_id) desc = await RO.create("vnfd", descriptor=vnfd_RO) - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnfd_id)] = desc["uuid"] - self.logger.debug(logging_text + "vnfd={} created at RO. RO_id={}".format( - vnfd_ref, desc["uuid"])) + RO_update["id"] = desc["uuid"] + self.logger.debug(logging_text + "vnfd='{}' member-vnf-index='{}' created at RO. RO_id={}".format( + vnfd_ref, member_vnf_index, desc["uuid"])) + db_nsr_update["_admin.deployed.RO.vnfd.{}".format(index)] = RO_update + db_nsr["_admin"]["deployed"]["RO"]["vnfd"][index] = RO_update self.update_db_2("nsrs", nsr_id, db_nsr_update) # create nsd at RO @@ -784,7 +836,7 @@ class NsLcm(LcmBase): while time() <= start_deploy + self.total_deploy_timeout: desc = await RO.show("ns", RO_nsr_id) ns_status, ns_status_info = RO.check_ns_status(desc) - db_nsr_update["admin.deployed.RO.nsr_status"] = ns_status + db_nsr_update["_admin.deployed.RO.nsr_status"] = ns_status if ns_status == "ERROR": raise ROclient.ROClientException(ns_status_info) elif ns_status == "BUILD": @@ -814,12 +866,20 @@ class NsLcm(LcmBase): # The parameters we'll need to deploy a charm number_to_configure = 0 - def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, charm_params, n2vc_info): - """An inner function to deploy the charm from either vnf or vdu - vnf_index is mandatory. vdu_id can be None for a vnf configuration or the id for vdu configuration + def deploy_charm(vnf_index, vdu_id, vdu_name, vdu_count_index, charm_params, n2vc_info, native_charm): + """An inner function to deploy the charm from either ns, vnf or vdu + For ns both vnf_index and vdu_id are None. + For vnf only vdu_id is None + For vdu both vnf_index and vdu_id contain a value """ - if not charm_params["rw_mgmt_ip"]: - raise LcmException("vnfd/vdu has not management ip address to configure it") + if not charm_params.get("rw_mgmt_ip") and vnf_index: # if NS skip mgmt_ip checking + raise LcmException("ns/vnfd/vdu has not management ip address to configure it") + + machine_spec = {} + if native_charm: + machine_spec["username"] = charm_params.get("username"), + machine_spec["username"] = charm_params.get("rw_mgmt_ip") + # Login to the VCA. # if number_to_configure == 0: # self.logger.debug("Logging into N2VC...") @@ -831,7 +891,8 @@ class NsLcm(LcmBase): # Note: The charm needs to exist on disk at the location # specified by charm_path. - base_folder = vnfd["_admin"]["storage"] + descriptor = vnfd if vnf_index else nsd + base_folder = descriptor["_admin"]["storage"] storage_params = self.fs.get_params() charm_path = "{}{}/{}/charms/{}".format( storage_params["path"], @@ -842,12 +903,10 @@ class NsLcm(LcmBase): # ns_name will be ignored in the current version of N2VC # but will be implemented for the next point release. - model_name = "default" # TODO bug 585 nsr_id - if vdu_id: - vdu_id_text = vdu_id + "-" - else: - vdu_id_text = "-" - application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index, vdu_id_text) + model_name = nsr_id + vdu_id_text = (str(vdu_id) if vdu_id else "") + "-" + vnf_index_text = (str(vnf_index) if vnf_index else "") + "-" + application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index_text, vdu_id_text) vca_index = len(vca_deployed_list) # trunk name and add two char index at the end to ensure that it is unique. It is assumed no more than @@ -882,10 +941,10 @@ class NsLcm(LcmBase): self.n2vc.DeployCharms( model_name, # The network service name application_name, # The application name - vnfd, # The vnf descriptor + descriptor, # The vnf/nsd descriptor charm_path, # Path to charm charm_params, # Runtime params, like mgmt ip - {}, # for native charms only + machine_spec, # for native charms only self.n2vc_callback, # Callback for status changes n2vc_info, # Callback parameter None, # Callback parameter (task) @@ -915,31 +974,59 @@ class NsLcm(LcmBase): vnf_config = vnfd.get("vnf-configuration") if vnf_config and vnf_config.get("juju"): proxy_charm = vnf_config["juju"]["charm"] + native_charm = vnf_config["juju"].get("proxy") is False - if proxy_charm: + if proxy_charm or native_charm: + if not vca_model_name: + step = "creating VCA model name '{}'".format(nsr_id) + self.logger.debug(logging_text + step) + await self.n2vc.CreateNetworkService(nsr_id) + vca_model_name = nsr_id + db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id + self.update_db_2("nsrs", nsr_id, db_nsr_update) step = "connecting to N2VC to configure vnf {}".format(vnf_index) vnfr_params["rw_mgmt_ip"] = db_vnfrs[vnf_index]["ip-address"] charm_params = { "user_values": vnfr_params, "rw_mgmt_ip": db_vnfrs[vnf_index]["ip-address"], - "initial-config-primitive": vnf_config.get('initial-config-primitive') or {} + "initial-config-primitive": vnf_config.get('initial-config-primitive') or {}, } + # 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 vnf_config.get("initial-config-primitive"): + for param in vnf_config["initial-config-primitive"][0].get("parameter", ()): + if param["name"] == "ssh-username": + charm_params["username"] = param["value"] + if vnf_config.get("config-access") and vnf_config["config-access"].get("ssh-access"): + if vnf_config["config-access"]["ssh-access"].get("required"): + charm_params["username"] = vnf_config["config-access"]["ssh-access"].get("default-user") + # Login to the VCA. If there are multiple calls to login(), # subsequent calls will be a nop and return immediately. await self.n2vc.login() - deploy_charm(vnf_index, None, None, None, charm_params, n2vc_info) + + deploy_charm(vnf_index, None, None, None, charm_params, n2vc_info, native_charm) number_to_configure += 1 # Deploy charms for each VDU that supports one. for vdu_index, vdu in enumerate(get_iterable(vnfd, 'vdu')): vdu_config = vdu.get('vdu-configuration') proxy_charm = None + native_charm = None if vdu_config and vdu_config.get("juju"): proxy_charm = vdu_config["juju"]["charm"] - - if proxy_charm: + native_charm = vdu_config["juju"].get("proxy") is False + + if proxy_charm or native_charm: + if not vca_model_name: + step = "creating VCA model name" + await self.n2vc.CreateNetworkService(nsr_id) + vca_model_name = nsr_id + db_nsr_update["_admin.deployed.VCA-model-name"] = nsr_id + self.update_db_2("nsrs", nsr_id, db_nsr_update) step = "connecting to N2VC to configure vdu {} from vnf {}".format(vdu["id"], vnf_index) await self.n2vc.login() vdur = db_vnfrs[vnf_index]["vdur"][vdu_index] @@ -953,10 +1040,66 @@ class NsLcm(LcmBase): "rw_mgmt_ip": vdur["ip-address"], "initial-config-primitive": vdu_config.get('initial-config-primitive') or {} } + + # 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 vdu_config.get("initial-config-primitive"): + for param in vdu_config["initial-config-primitive"][0].get("parameter", ()): + if param["name"] == "ssh-username": + charm_params["username"] = param["value"] + if vdu_config.get("config-access") and vdu_config["config-access"].get("ssh-access"): + if vdu_config["config-access"]["ssh-access"].get("required"): + charm_params["username"] = vdu_config["config-access"]["ssh-access"].get( + "default-user") + deploy_charm(vnf_index, vdu["id"], vdur.get("name"), vdur["count-index"], - charm_params, n2vc_info) + charm_params, n2vc_info, native_charm) number_to_configure += 1 + # Check if this NS has a charm configuration + + ns_config = nsd.get("ns-configuration") + if ns_config and ns_config.get("juju"): + proxy_charm = ns_config["juju"]["charm"] + native_charm = ns_config["juju"].get("proxy") is False + + if proxy_charm or native_charm: + step = "connecting to N2VC to configure ns" + # TODO is NS magmt IP address needed? + + # Get additional parameters + additional_params = {} + if db_nsr.get("additionalParamsForNs"): + additional_params = db_nsr["additionalParamsForNs"].copy() + for k, v in additional_params.items(): + if isinstance(v, str) and v.startswith("!!yaml "): + additional_params[k] = yaml.safe_load(v[7:]) + + # additional_params["rw_mgmt_ip"] = db_nsr["ip-address"] + charm_params = { + "user_values": additional_params, + "rw_mgmt_ip": db_nsr.get("ip-address"), + "initial-config-primitive": ns_config.get('initial-config-primitive') or {} + } + + # 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 ns_config.get("initial-config-primitive"): + for param in ns_config["initial-config-primitive"][0].get("parameter", ()): + if param["name"] == "ssh-username": + charm_params["username"] = param["value"] + if ns_config.get("config-access") and ns_config["config-access"].get("ssh-access"): + if ns_config["config-access"]["ssh-access"].get("required"): + charm_params["username"] = ns_config["config-access"]["ssh-access"].get("default-user") + + # Login to the VCA. If there are multiple calls to login(), + # subsequent calls will be a nop and return immediately. + await self.n2vc.login() + deploy_charm(None, None, None, None, charm_params, n2vc_info, native_charm) + number_to_configure += 1 + db_nsr_update["operational-status"] = "running" configuration_failed = False if number_to_configure: @@ -1105,6 +1248,112 @@ class NsLcm(LcmBase): await asyncio.sleep(10) timeout -= 10 + # Check if this VNFD has a configured terminate action + def _has_terminate_config_primitive(self, vnfd): + vnf_config = vnfd.get("vnf-configuration") + if vnf_config and vnf_config.get("terminate-config-primitive"): + return True + else: + return False + + # Get a numerically sorted list of the sequences for this VNFD's terminate action + def _get_terminate_config_primitive_seq_list(self, vnfd): + # No need to check for existing primitive twice, already done before + vnf_config = vnfd.get("vnf-configuration") + seq_list = vnf_config.get("terminate-config-primitive") + # Get all 'seq' tags in seq_list, order sequences numerically, ascending. + seq_list_sorted = sorted(seq_list, key=lambda x: int(x['seq'])) + return seq_list_sorted + + @staticmethod + def _create_nslcmop(nsr_id, operation, params): + """ + Creates a ns-lcm-opp content to be stored at database. + :param nsr_id: internal id of the instance + :param operation: instantiate, terminate, scale, action, ... + :param params: user parameters for the operation + :return: dictionary following SOL005 format + """ + # Raise exception if invalid arguments + if not (nsr_id and operation and params): + raise LcmException( + "Parameters 'nsr_id', 'operation' and 'params' needed to create primitive not provided") + now = time() + _id = str(uuid4()) + nslcmop = { + "id": _id, + "_id": _id, + # COMPLETED,PARTIALLY_COMPLETED,FAILED_TEMP,FAILED,ROLLING_BACK,ROLLED_BACK + "operationState": "PROCESSING", + "statusEnteredTime": now, + "nsInstanceId": nsr_id, + "lcmOperationType": operation, + "startTime": now, + "isAutomaticInvocation": False, + "operationParams": params, + "isCancelPending": False, + "links": { + "self": "/osm/nslcm/v1/ns_lcm_op_occs/" + _id, + "nsInstance": "/osm/nslcm/v1/ns_instances/" + nsr_id, + } + } + return nslcmop + + # Create a primitive with params from VNFD + # - Called from terminate() before deleting instance + # - Calls action() to execute the primitive + async def _terminate_action(self, db_nslcmop, nslcmop_id, nsr_id): + 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}) + # Loop over VNFRs + for vnfr in db_vnfrs_list: + vnfd_id = vnfr["vnfd-id"] + vnf_index = vnfr["member-vnf-index-ref"] + if vnfd_id not in db_vnfds: + step = "Getting vnfd={} id='{}' from db".format(vnfd_id, vnfd_id) + vnfd = self.db.get_one("vnfds", {"_id": vnfd_id}) + db_vnfds[vnfd_id] = vnfd + vnfd = db_vnfds[vnfd_id] + if not self._has_terminate_config_primitive(vnfd): + continue + # Get the primitive's sorted sequence list + seq_list = self._get_terminate_config_primitive_seq_list(vnfd) + for seq in seq_list: + # For each sequence in list, call terminate action + 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" + 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) + # 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): + raise LcmException( + "terminate_primitive_action for vnf_member_index={}", + " primitive={} fails with error {}".format( + vnf_index, seq.get("name"), nslcmop_operation_state_detail)) + async def terminate(self, nsr_id, nslcmop_id): logging_text = "Task ns={} terminate={} ".format(nsr_id, nslcmop_id) self.logger.debug(logging_text + "Enter") @@ -1116,6 +1365,7 @@ class NsLcm(LcmBase): db_nsr_update = {"_admin.nslcmop": nslcmop_id} db_nslcmop_update = {} nslcmop_operation_state = None + autoremove = False # autoremove after terminated try: step = "Getting nslcmop={} from db".format(nslcmop_id) db_nslcmop = self.db.get_one("nslcmops", {"_id": nslcmop_id}) @@ -1127,11 +1377,27 @@ class NsLcm(LcmBase): return # #TODO check if VIM is creating and wait # RO_vim_id = db_vim["_admin"]["deployed"]["RO"] + # Call internal terminate action + await self._terminate_action(db_nslcmop, nslcmop_id, nsr_id) db_nsr_update["operational-status"] = "terminating" db_nsr_update["config-status"] = "terminating" - if nsr_deployed and nsr_deployed.get("VCA"): + 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) + 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" @@ -1242,19 +1508,21 @@ class NsLcm(LcmBase): self.logger.error(logging_text + failed_detail[-1]) RO_fail = True - if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("vnfd_id"): - for vnf_id, RO_vnfd_id in nsr_deployed["RO"]["vnfd_id"].items(): - if not RO_vnfd_id: + if not RO_fail and nsr_deployed and nsr_deployed.get("RO") and nsr_deployed["RO"].get("vnfd"): + for index, vnf_deployed in enumerate(nsr_deployed["RO"]["vnfd"]): + if not vnf_deployed or not vnf_deployed["id"]: continue try: + RO_vnfd_id = vnf_deployed["id"] step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] =\ - "Deleting vnfd={} at RO".format(vnf_id) + "Deleting member-vnf-index={} RO_vnfd_id={} from RO".format( + vnf_deployed["member-vnf-index"], RO_vnfd_id) await RO.delete("vnfd", RO_vnfd_id) self.logger.debug(logging_text + "RO_vnfd_id={} deleted".format(RO_vnfd_id)) - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnf_id)] = None + db_nsr_update["_admin.deployed.RO.vnfd.{}.id".format(index)] = None except ROclient.ROClientException as e: if e.http_code == 404: # not found - db_nsr_update["_admin.deployed.RO.vnfd_id.{}".format(vnf_id)] = None + db_nsr_update["_admin.deployed.RO.vnfd.{}.id".format(index)] = None self.logger.debug(logging_text + "RO_vnfd_id={} already deleted ".format(RO_vnfd_id)) elif e.http_code == 409: # conflict failed_detail.append("RO_vnfd_id={} delete conflict: {}".format(RO_vnfd_id, e)) @@ -1288,18 +1556,6 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "; ".join(failed_detail) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() - elif db_nslcmop["operationParams"].get("autoremove"): - self.db.del_one("nsrs", {"_id": nsr_id}) - db_nsr = None - db_nsr_update.clear() - self.db.del_list("nslcmops", {"nsInstanceId": nsr_id}) - db_nslcmop = None - nslcmop_operation_state = "COMPLETED" - db_nslcmop_update.clear() - self.db.del_list("vnfrs", {"nsr-id-ref": nsr_id}) - self.db.set_list("pdus", {"_admin.usage.nsr_id": nsr_id}, - {"_admin.usageState": "NOT_IN_USE", "_admin.usage": None}) - self.logger.debug(logging_text + "Delete from database") else: db_nsr_update["operational-status"] = "terminated" db_nsr_update["detailed-status"] = "Done" @@ -1307,8 +1563,10 @@ class NsLcm(LcmBase): db_nslcmop_update["detailed-status"] = "Done" db_nslcmop_update["operationState"] = nslcmop_operation_state = "COMPLETED" db_nslcmop_update["statusEnteredTime"] = time() + if db_nslcmop["operationParams"].get("autoremove"): + autoremove = True - except (ROclient.ROClientException, DbException) as e: + except (ROclient.ROClientException, DbException, LcmException) as e: self.logger.error(logging_text + "Exit Exception {}".format(e)) exc = e except asyncio.CancelledError: @@ -1333,7 +1591,8 @@ class NsLcm(LcmBase): if nslcmop_operation_state: try: await self.msg.aiowrite("ns", "terminated", {"nsr_id": nsr_id, "nslcmop_id": nslcmop_id, - "operationState": nslcmop_operation_state}, + "operationState": nslcmop_operation_state, + "autoremove": autoremove}, loop=self.loop) except Exception as e: self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) @@ -1414,7 +1673,7 @@ class NsLcm(LcmBase): ) while time() - start_primitive_time < self.timeout_primitive: primitive_result_ = await self.n2vc.GetPrimitiveStatus(model_name, primitive_id) - if primitive_result_ == "running": + if primitive_result_ in ("running", "pending"): pass elif primitive_result_ in ("completed", "failed"): primitive_result = "COMPLETED" if primitive_result_ == "completed" else "FAILED" @@ -1440,6 +1699,7 @@ class NsLcm(LcmBase): db_nsr_update = {"_admin.nslcmop": nslcmop_id} db_nslcmop_update = {} nslcmop_operation_state = None + nslcmop_operation_state_detail = None exc = None try: step = "Getting information from database" @@ -1447,15 +1707,22 @@ class NsLcm(LcmBase): db_nsr = self.db.get_one("nsrs", {"_id": nsr_id}) nsr_deployed = db_nsr["_admin"].get("deployed") - vnf_index = db_nslcmop["operationParams"]["member_vnf_index"] + vnf_index = db_nslcmop["operationParams"].get("member_vnf_index") vdu_id = db_nslcmop["operationParams"].get("vdu_id") vdu_count_index = db_nslcmop["operationParams"].get("vdu_count_index") vdu_name = db_nslcmop["operationParams"].get("vdu_name") - step = "Getting vnfr from database" - db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id}) - step = "Getting vnfd from database" - db_vnfd = self.db.get_one("vnfds", {"_id": db_vnfr["vnfd-id"]}) + if vnf_index: + step = "Getting vnfr from database" + db_vnfr = self.db.get_one("vnfrs", {"member-vnf-index-ref": vnf_index, "nsr-id-ref": nsr_id}) + step = "Getting vnfd from database" + db_vnfd = self.db.get_one("vnfds", {"_id": db_vnfr["vnfd-id"]}) + else: + if db_nsr.get("nsd"): + db_nsd = db_nsr.get("nsd") # TODO this will be removed + else: + step = "Getting nsd from database" + db_nsd = self.db.get_one("nsds", {"_id": db_nsr["nsd-id"]}) # look if previous tasks in process task_name, task_dependency = self.lcm_tasks.lookfor_related("ns", nsr_id, nslcmop_id) @@ -1486,23 +1753,34 @@ class NsLcm(LcmBase): if config_primitive["name"] == primitive: config_primitive_desc = config_primitive break - for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): - if config_primitive["name"] == primitive: - config_primitive_desc = config_primitive - break + elif vnf_index: + for config_primitive in db_vnfd.get("vnf-configuration", {}).get("config-primitive", ()): + if config_primitive["name"] == primitive: + config_primitive_desc = config_primitive + break + else: + for config_primitive in db_nsd.get("ns-configuration", {}).get("config-primitive", ()): + if config_primitive["name"] == primitive: + config_primitive_desc = config_primitive + break + if not config_primitive_desc: - raise LcmException("Primitive {} not found at vnf-configuration:config-primitive or vdu:" - "vdu-configuration:config-primitive".format(primitive)) + raise LcmException("Primitive {} not found at [ns|vnf|vdu]-configuration:config-primitive ". + format(primitive)) - vnfr_params = {} - if db_vnfr.get("additionalParamsForVnf"): - vnfr_params.update(db_vnfr["additionalParamsForVnf"]) + desc_params = {} + if vnf_index: + if db_vnfr.get("additionalParamsForVnf"): + desc_params.update(db_vnfr["additionalParamsForVnf"]) + else: + if db_nsr.get("additionalParamsForVnf"): + desc_params.update(db_nsr["additionalParamsForNs"]) # TODO check if ns is in a proper status result, result_detail = await self._ns_execute_primitive( nsr_deployed, vnf_index, vdu_id, vdu_name, vdu_count_index, primitive, - self._map_primitive_params(config_primitive_desc, primitive_params, vnfr_params)) - db_nslcmop_update["detailed-status"] = result_detail + self._map_primitive_params(config_primitive_desc, primitive_params, desc_params)) + db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = result_detail 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)) @@ -1519,7 +1797,8 @@ class NsLcm(LcmBase): self.logger.critical(logging_text + "Exit Exception {} {}".format(type(e).__name__, e), exc_info=True) finally: if exc and db_nslcmop: - db_nslcmop_update["detailed-status"] = "FAILED {}: {}".format(step, exc) + db_nslcmop_update["detailed-status"] = nslcmop_operation_state_detail = \ + "FAILED {}: {}".format(step, exc) db_nslcmop_update["operationState"] = nslcmop_operation_state = "FAILED" db_nslcmop_update["statusEnteredTime"] = time() try: @@ -1540,6 +1819,7 @@ class NsLcm(LcmBase): self.logger.error(logging_text + "kafka_write notification Exception {}".format(e)) self.logger.debug(logging_text + "Exit") self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_action") + return nslcmop_operation_state, nslcmop_operation_state_detail async def scale(self, nsr_id, nslcmop_id): logging_text = "Task ns={} scale={} ".format(nsr_id, nslcmop_id) @@ -1695,7 +1975,7 @@ class NsLcm(LcmBase): "[vnf-config-primitive-name-ref='{}'] does not match any vnf-configuration:config-" "primitive".format(scaling_group, config_primitive)) - vnfr_params = {"": vdu_scaling_info} + vnfr_params = {"VDU_SCALE_INFO": vdu_scaling_info} if db_vnfr.get("additionalParamsForVnf"): vnfr_params.update(db_vnfr["additionalParamsForVnf"]) @@ -1805,7 +2085,7 @@ class NsLcm(LcmBase): step = db_nslcmop_update["detailed-status"] = \ "executing post-scale scaling-config-action '{}'".format(vnf_config_primitive) - vnfr_params = {"": vdu_scaling_info} + vnfr_params = {"VDU_SCALE_INFO": vdu_scaling_info} if db_vnfr.get("additionalParamsForVnf"): vnfr_params.update(db_vnfr["additionalParamsForVnf"])