X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=24b314289756c95cdc3ff84ce7d521cc3c23511e;hp=3a2d9e31f403a7f2da678c02701166ddebf04e73;hb=4395cfa6c7d0d80980c00d9f078440e0333fd826;hpb=2962f3e7aba84b4584d2deac30d1c163f6441a03 diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 3a2d9e3..24b3142 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -371,17 +371,17 @@ class K8sJujuConnector(K8sConnector): cluster_uuid, kdu_instance, filter=db_dict["filter"], - vca_id=kwargs.get("vca_id") + vca_id=kwargs.get("vca_id"), ) return True async def scale( - self, - kdu_instance: str, - scale: int, - resource_name: str, - total_timeout: float = 1800, - **kwargs, + self, + kdu_instance: str, + scale: int, + resource_name: str, + total_timeout: float = 1800, + **kwargs, ) -> bool: """Scale an application in a model @@ -402,20 +402,21 @@ class K8sJujuConnector(K8sConnector): model_name=kdu_instance, application_name=resource_name, scale=scale, - total_timeout=total_timeout + total_timeout=total_timeout, ) except Exception as e: error_msg = "Error scaling application {} in kdu instance {}: {}".format( - resource_name, kdu_instance, e) + resource_name, kdu_instance, e + ) self.log.error(error_msg) raise K8sException(message=error_msg) return True async def get_scale_count( - self, - resource_name: str, - kdu_instance: str, - **kwargs, + self, + resource_name: str, + kdu_instance: str, + **kwargs, ) -> int: """Get an application scale count @@ -431,7 +432,8 @@ class K8sJujuConnector(K8sConnector): return len(status.applications[resource_name].units) except Exception as e: error_msg = "Error getting scale count from application {} in kdu instance {}: {}".format( - resource_name, kdu_instance, e) + resource_name, kdu_instance, e + ) self.log.error(error_msg) raise K8sException(message=error_msg) @@ -577,7 +579,9 @@ class K8sJujuConnector(K8sConnector): "status is not completed: {} output: {}".format(status, output) ) if self.on_update_db: - await self.on_update_db(cluster_uuid, kdu_instance, filter=db_dict["filter"]) + await self.on_update_db( + cluster_uuid, kdu_instance, filter=db_dict["filter"] + ) return output @@ -711,16 +715,19 @@ class K8sJujuConnector(K8sConnector): try: for model_name in vcastatus: # Adding executed actions - vcastatus[model_name]["executedActions"] = \ - await libjuju.get_executed_actions(kdu_instance) + vcastatus[model_name][ + "executedActions" + ] = await libjuju.get_executed_actions(kdu_instance) for application in vcastatus[model_name]["applications"]: # Adding application actions - vcastatus[model_name]["applications"][application]["actions"] = \ - await libjuju.get_actions(application, kdu_instance) + vcastatus[model_name]["applications"][application][ + "actions" + ] = await libjuju.get_actions(application, kdu_instance) # Adding application configs - vcastatus[model_name]["applications"][application]["configs"] = \ - await libjuju.get_application_configs(kdu_instance, application) + vcastatus[model_name]["applications"][application][ + "configs" + ] = await libjuju.get_application_configs(kdu_instance, application) except Exception as e: self.log.debug("Error in updating vca status: {}".format(str(e)))