X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=4fb8d5dbcd5db89bf8ba68193723133fbea20275;hb=refs%2Fchanges%2F07%2F12707%2F2;hp=2b2cadc1f7c3580fe6d2a53d73602ec261c79c87;hpb=e539a8d7d65be857fc64afa593893e6e6b0b52c0;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 2b2cadc..4fb8d5d 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -5288,7 +5288,9 @@ class NsLcm(LcmBase): if len(parts) == 2: kdu_model = parts[0] if desc_params.get("kdu_atomic_upgrade"): - atomic_upgrade = desc_params.get("kdu_atomic_upgrade").lower() in ("yes", "true", "1") + atomic_upgrade = desc_params.get( + "kdu_atomic_upgrade" + ).lower() in ("yes", "true", "1") del desc_params["kdu_atomic_upgrade"] else: atomic_upgrade = True @@ -5843,7 +5845,7 @@ class NsLcm(LcmBase): current_charm_artifact_path, target_charm_artifact_path, charm_artifact_paths, - helm_artifacts + helm_artifacts, ) = ([], [], [], []) step = "Checking if revision has changed in VNFD" @@ -5923,29 +5925,34 @@ class NsLcm(LcmBase): # add chart to list and all parameters step = "Getting helm chart name" chart_name = ee_item.get("helm-chart") - if ee_item.get("helm-version") and ee_item.get("helm-version") == "v2": + if ( + ee_item.get("helm-version") + and ee_item.get("helm-version") == "v2" + ): vca_type = "helm" else: vca_type = "helm-v3" step = "Setting Helm chart artifact paths" - helm_artifacts.append({ - "current_artifact_path": get_charm_artifact_path( - current_base_folder, - chart_name, - vca_type, - current_vnf_revision, - ), - "target_artifact_path": get_charm_artifact_path( - latest_base_folder, - chart_name, - vca_type, - latest_vnfd_revision, - ), - "ee_id": ee_id, - "vca_index": vca_index, - "vdu_index": vdu_count_index, - }) + helm_artifacts.append( + { + "current_artifact_path": get_charm_artifact_path( + current_base_folder, + chart_name, + vca_type, + current_vnf_revision, + ), + "target_artifact_path": get_charm_artifact_path( + latest_base_folder, + chart_name, + vca_type, + latest_vnfd_revision, + ), + "ee_id": ee_id, + "vca_index": vca_index, + "vdu_index": vdu_count_index, + } + ) charm_artifact_paths = zip( current_charm_artifact_path, target_charm_artifact_path @@ -6040,17 +6047,18 @@ class NsLcm(LcmBase): # helm base EE for item in helm_artifacts: - if ( - not ( - item["current_artifact_path"] - and item["target_artifact_path"] - and self.check_charm_hash_changed( - item["current_artifact_path"], item["target_artifact_path"] - ) - ) + if not ( + item["current_artifact_path"] + and item["target_artifact_path"] + and self.check_charm_hash_changed( + item["current_artifact_path"], + item["target_artifact_path"], + ) ): continue - db_update_entry = "_admin.deployed.VCA.{}.".format(item["vca_index"]) + db_update_entry = "_admin.deployed.VCA.{}.".format( + item["vca_index"] + ) vnfr_id = db_vnfr["_id"] osm_config = {"osm": {"ns_id": nsr_id, "vnf_id": vnfr_id}} db_dict = { @@ -6059,9 +6067,7 @@ class NsLcm(LcmBase): "path": db_update_entry, } vca_type, namespace, helm_id = get_ee_id_parts(item["ee_id"]) - await self.vca_map[ - vca_type - ].upgrade_execution_environment( + await self.vca_map[vca_type].upgrade_execution_environment( namespace=namespace, helm_id=helm_id, db_dict=db_dict, @@ -6074,20 +6080,27 @@ class NsLcm(LcmBase): self.logger.debug("get ssh key block") rw_mgmt_ip = None if deep_get( - config_descriptor, ("config-access", "ssh-access", "required") + 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.vca_map[vca_type].get_ee_ssh_public__key( + step = ( + "Install configuration Software, getting public ssh key" + ) + pub_key = await self.vca_map[ + vca_type + ].get_ee_ssh_public__key( ee_id=ee_id, db_dict=db_dict, vca_id=vca_id ) - step = "Insert public key into VM user={} ssh_key={}".format( - user, pub_key + step = ( + "Insert public key into VM user={} ssh_key={}".format( + user, pub_key + ) ) self.logger.debug(logging_text + step) @@ -6106,7 +6119,11 @@ class NsLcm(LcmBase): "initial-config-primitive" ) config_primitive = next( - (p for p in initial_config_primitive_list if p["name"] == "config"), + ( + p + for p in initial_config_primitive_list + if p["name"] == "config" + ), None, ) if not config_primitive: @@ -6117,7 +6134,9 @@ class NsLcm(LcmBase): deploy_params["rw_mgmt_ip"] = rw_mgmt_ip if db_vnfr.get("additionalParamsForVnf"): deploy_params.update( - parse_yaml_strings(db_vnfr["additionalParamsForVnf"].copy()) + parse_yaml_strings( + db_vnfr["additionalParamsForVnf"].copy() + ) ) primitive_params_ = self._map_primitive_params( config_primitive, {}, deploy_params @@ -7766,17 +7785,12 @@ class NsLcm(LcmBase): self.update_db_2("nsrs", nsr_id, db_nsr_update) step = "Sending heal order to VIM" - task_ro = asyncio.ensure_future( - self.heal_RO( - logging_text=logging_text, - nsr_id=nsr_id, - db_nslcmop=db_nslcmop, - stage=stage, - ) + await self.heal_RO( + logging_text=logging_text, + nsr_id=nsr_id, + db_nslcmop=db_nslcmop, + stage=stage, ) - self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "heal_RO", task_ro) - tasks_dict_info[task_ro] = "Healing at VIM" - # VCA tasks # read from db: nsd stage[1] = "Getting nsd={} from db.".format(db_nsr["nsd-id"])