X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=f66c23ae7bf46fbb0672d60171e2e28601ebf2c2;hb=refs%2Fchanges%2F66%2F8266%2F4;hp=ce5dcf3fa1715567c02d1d87254dec2a6fefb02f;hpb=73d8bd00fd53c8864fa0803f2ae48e93fb06c791;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index ce5dcf3..f66c23a 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -24,7 +24,8 @@ 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 @@ -67,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 @@ -113,6 +99,8 @@ class NsLcm(LcmBase): 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( @@ -123,10 +111,18 @@ class NsLcm(LcmBase): url='{}:{}'.format(self.vca_config['host'], self.vca_config['port']), username=self.vca_config.get('user', None), vca_config=self.vca_config, - on_update_db=self._on_update_n2vc_db - # TODO - # New N2VC argument - # api_proxy=vca_config.get('apiproxy') + on_update_db=self._on_update_n2vc_db, + # ca_cert=self.vca_config.get('cacert'), + # api_proxy=self.vca_config.get('apiproxy'), + ) + + self.k8sclusterhelm = K8sHelmConnector( + kubectl_command=self.vca_config.get("kubectlpath"), + helm_command=self.vca_config.get("helmpath"), + fs=self.fs, + log=self.logger, + db=self.db, + on_update_db=None, ) # create RO client @@ -134,27 +130,30 @@ class NsLcm(LcmBase): def _on_update_n2vc_db(self, table, filter, path, updated_data): - self.logger.debug('_on_update_n2vc_db(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')) + # # ro_list = deep_get(target_dict=nsr, key_list=('_admin', 'deployed', 'RO')) # for vca in vca_list: - # status = vca.get('status') - # detailed_status = vca.get('detailed-status') - # for ro in ro_list: - # pass + # # 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('_on_update_n2vc_db(table={},filter={},path={},updated_data={}) Error updating db: {}' - # .format(table, filter, path, updated_data, e)) + # self.logger.error('Error writing NS status to db: {}'.format(e)) def vnfd2RO(self, vnfd, new_id=None, additionalParams=None, nsrId=None): """ @@ -173,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 @@ -368,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 @@ -401,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"])), @@ -416,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): @@ -606,6 +618,57 @@ class NsLcm(LcmBase): else: raise LcmException("ns_update_vnfr: Not found member_vnf_index={} from VIM info".format(vnf_index)) + @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): @@ -613,17 +676,21 @@ class NsLcm(LcmBase): 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 @@ -654,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]) @@ -685,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: @@ -702,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 @@ -726,17 +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" + # 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) @@ -754,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") @@ -770,18 +844,29 @@ 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"] = "Deployed at VIM" - db_nsr_update["detailed-status"] = "Deployed at VIM" + 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) + self._on_update_n2vc_db("nsrs", {"_id": nsr_id}, "_admin.deployed", db_nsr_update) step = "Deployed at VIM" self.logger.debug(logging_text + step) - # wait for ip addres at RO, and optionally, insert public key in virtual machine - # returns IP address - async def insert_key_ro(self, logging_text, nsr_id, vnfr_id, vdu_id, vdu_index, pub_key=None, user=None): + 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 @@ -807,9 +892,9 @@ class NsLcm(LcmBase): 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": + if vdur.get("status") == "ACTIVE": target_vdu_id = vdur["vdu-id-ref"] - elif vdur["status"] == "ERROR": + elif vdur.get("status") == "ERROR": raise LcmException("Cannot inject ssh-key because target VM is in error state") break else: @@ -820,8 +905,11 @@ class NsLcm(LcmBase): if not target_vdu_id: continue + # 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( @@ -840,29 +928,30 @@ class NsLcm(LcmBase): 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 >= 10: + if nb_tries >= 20: raise LcmException("Reaching max tries injecting key. Error: {}".format(e)) - self.logger.debug(logging_text + "error injecting key: {}".format(e)) else: - # no user or pub_key ---> break while true break return ip_address async def instantiate_N2VC(self, logging_text, vca_index, nsi_id, db_nsr, db_vnfr, vdu_id, - vdu_index, config_descriptor, deploy_params, base_folder): + 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) + logging_text += "member_vnf_index={} vdu_id={}, vdu_index={} ".format(db_vnfr["member-vnf-index-ref"], + vdu_id, vdu_index) step = "" try: @@ -898,35 +987,35 @@ class NsLcm(LcmBase): 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 - ) - + ee_id, credentials = await self.n2vc.create_execution_environment(namespace=namespace, + reuse_ee_id=ee_id, + db_dict=db_dict) else: - step = "register execution envioronment" - # TODO wait until deployed by RO, when IP address has been filled. By pooling???? - credentials = {} # TODO db_credentials["ip_address"] + 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 config_descriptor.get("initial-config-primitive"): - for param in config_descriptor["initial-config-primitive"][0].get("parameter", ()): - if param["name"] == "ssh-username": - credentials["username"] = param["value"] - if config_descriptor.get("config-access") and config_descriptor["config-access"].get("ssh-access"): - if config_descriptor["config-access"]["ssh-access"].get("required"): - credentials["username"] = \ - config_descriptor["config-access"]["ssh-access"].get("default-user") - + 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": + 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 + + 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 - ) + 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" @@ -938,59 +1027,58 @@ class NsLcm(LcmBase): db_update_entry + "ee_id": ee_id}) # n2vc_redesign STEP 3.3 - # TODO check if already done + step = "Install configuration Software" + # 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 - ) + await self.n2vc.install_configuration_sw(ee_id=ee_id, artifact_path=artifact_path, db_dict=db_dict) # if SSH access is required, then get execution environment SSH public - required = deep_get(config_descriptor, ("config-access", "ssh-access", "required")) - if is_proxy_charm and required: - + if is_proxy_charm: # if native charm we have waited already to VM be UP pub_key = None - pub_key = await self.n2vc.get_ee_ssh_public__key( - ee_id=ee_id, - db_dict=db_dict - ) + 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")) + 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" + else: + step = "Waiting to VM being up and getting IP address" + self.logger.debug(logging_text + step) - user = deep_get(config_descriptor, ("config-access", "ssh-access", "default-user")) - # insert pub_key into VM # n2vc_redesign STEP 5.1 - step = "Insert public key into VM" - self.logger.debug(logging_text + step) + # wait for RO (ip-address) 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) - # wait for RO (ip-address) - rw_mgmt_ip = await self.insert_key_ro( - logging_text=logging_text, - nsr_id=nsr_id, - vnfr_id=vnfr_id, - vdu_id=vdu_id, - vdu_index=vdu_index, - user=user, - pub_key=pub_key - ) + self.logger.debug(logging_text + ' VM_ip_address={}'.format(rw_mgmt_ip)) - # store rw_mgmt_ip in deploy params for later substitution - self.logger.debug('rw_mgmt_ip={}'.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: - self.logger.warn(logging_text + 'Cannot sort by "seq" field' + step) + 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.exec_primitive( @@ -1034,7 +1122,10 @@ class NsLcm(LcmBase): db_nslcmop = None # update operation on nsrs - db_nsr_update = {"_admin.nslcmop": nslcmop_id} + 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 = {} @@ -1042,12 +1133,11 @@ class NsLcm(LcmBase): nslcmop_operation_state = None db_vnfrs = {} # vnf's info indexed by member-index # n2vc_info = {} - # n2vc_key_list = [] # list of public keys to be injected as authorized to VMs task_instantiation_list = [] exc = None try: # wait for any previous tasks in process - step = "Waiting for previous tasks" + step = "Waiting for previous operations to terminate" await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id) # STEP 0: Reading database (nslcmops, nsrs, nsds, vnfrs, vnfds) @@ -1065,6 +1155,7 @@ class NsLcm(LcmBase): # 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}) # read from db: vnfd's for every vnf @@ -1081,6 +1172,7 @@ class NsLcm(LcmBase): 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}) # store vnfd @@ -1113,10 +1205,24 @@ 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.get_public_key() + 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( @@ -1128,7 +1234,7 @@ class NsLcm(LcmBase): db_nslcmop=db_nslcmop, db_vnfrs=db_vnfrs, db_vnfds_ref=db_vnfds_ref, - n2vc_key_list=[n2vc_key] + n2vc_key_list=n2vc_key_list ) ) self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "instantiate_RO", task_ro) @@ -1149,14 +1255,12 @@ class NsLcm(LcmBase): vdu_id = None vdu_index = 0 vdu_name = None + 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"): @@ -1169,6 +1273,7 @@ class NsLcm(LcmBase): 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, @@ -1182,6 +1287,11 @@ class NsLcm(LcmBase): 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"]): @@ -1192,6 +1302,7 @@ 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"] self._deploy_n2vc( @@ -1203,14 +1314,50 @@ class NsLcm(LcmBase): 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, + 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") @@ -1219,15 +1366,14 @@ 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"] self._deploy_n2vc( logging_text=logging_text, @@ -1238,6 +1384,7 @@ class NsLcm(LcmBase): 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, @@ -1283,8 +1430,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 @@ -1307,6 +1452,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) @@ -1323,8 +1470,108 @@ class NsLcm(LcmBase): self.logger.debug(logging_text + "Exit") self.lcm_tasks.remove("ns", nsr_id, nslcmop_id, "ns_instantiate") + async def deploy_kdus(self, logging_text, nsr_id, db_nsr, db_vnfrs): + # Launch kdus if present in the descriptor + + 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, - member_vnf_index, vdu_index, vdu_name, deploy_params, descriptor_config, + 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 @@ -1337,6 +1584,7 @@ class NsLcm(LcmBase): 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: @@ -1344,6 +1592,7 @@ class NsLcm(LcmBase): 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 @@ -1364,6 +1613,7 @@ class NsLcm(LcmBase): 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, @@ -1425,6 +1675,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 = {} @@ -1669,13 +1926,17 @@ class NsLcm(LcmBase): db_nslcmop = None exc = None failed_detail = [] # annotates all failed error messages - 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) @@ -1691,6 +1952,8 @@ 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" @@ -1706,6 +1969,33 @@ class NsLcm(LcmBase): 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 @@ -1857,6 +2147,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)) @@ -1919,6 +2211,11 @@ 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, @@ -1986,13 +2283,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" @@ -2002,6 +2303,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") @@ -2035,6 +2337,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: @@ -2053,10 +2428,14 @@ 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 output, detail = await self._ns_execute_primitive( @@ -2100,6 +2479,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)) @@ -2129,7 +2511,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 @@ -2138,6 +2523,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" @@ -2153,6 +2539,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"] @@ -2540,6 +2935,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: