From 2b2dc52b95660e3b4a5564914aa1f490d88a2b9f Mon Sep 17 00:00:00 2001 From: Patricia Reinoso Date: Wed, 1 Feb 2023 16:14:39 +0000 Subject: [PATCH] Reformat files according to new black validation Change-Id: Ifebf4e97ae22b0131d0e84c58a18468b454ee6a7 Signed-off-by: Patricia Reinoso --- n2vc/k8s_conn.py | 1 - n2vc/k8s_helm3_conn.py | 8 -------- n2vc/k8s_helm_base_conn.py | 10 ---------- n2vc/k8s_helm_conn.py | 5 ----- n2vc/libjuju.py | 4 ---- n2vc/loggable.py | 2 -- n2vc/n2vc_conn.py | 1 - n2vc/n2vc_juju_conn.py | 2 -- n2vc/tests/unit/test_juju_watcher.py | 1 - n2vc/tests/unit/test_k8s_helm3_conn.py | 2 -- n2vc/tests/unit/test_libjuju.py | 5 ----- n2vc/tests/unit/test_n2vc_juju_conn.py | 1 - n2vc/tests/unit/utils.py | 1 - 13 files changed, 43 deletions(-) diff --git a/n2vc/k8s_conn.py b/n2vc/k8s_conn.py index 1c88653..3a1a5ef 100644 --- a/n2vc/k8s_conn.py +++ b/n2vc/k8s_conn.py @@ -484,7 +484,6 @@ class K8sConnector(abc.ABC, Loggable): self.log.debug("status={}".format(status)) try: - the_table = db_dict["collection"] the_filter = db_dict["filter"] the_path = db_dict["path"] diff --git a/n2vc/k8s_helm3_conn.py b/n2vc/k8s_helm3_conn.py index 3d7e3b2..037ed66 100644 --- a/n2vc/k8s_helm3_conn.py +++ b/n2vc/k8s_helm3_conn.py @@ -149,7 +149,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return True async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str: - self.log.debug( "inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url) ) @@ -250,7 +249,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return namespace in namespaces if namespaces else False async def _get_namespaces(self, cluster_id: str): - self.log.debug("get namespaces cluster_id {}".format(cluster_id)) # init config, env @@ -272,7 +270,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return namespaces async def _create_namespace(self, cluster_id: str, namespace: str): - self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}") # init config, env @@ -293,7 +290,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): async def _get_services( self, cluster_id: str, kdu_instance: str, namespace: str, kubeconfig: str ): - # init config, env paths, env = self._init_paths_env( cluster_name=cluster_id, create_if_not_exist=True @@ -333,7 +329,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): pass async def _instances_list(self, cluster_id: str): - # init paths, env paths, env = self._init_paths_env( cluster_name=cluster_id, create_if_not_exist=True @@ -389,7 +384,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): yaml_format: bool = False, show_error_log: bool = False, ) -> Union[str, dict]: - self.log.debug( "status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace) ) @@ -448,7 +442,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): timeout: float, kubeconfig: str, ) -> str: - timeout_str = "" if timeout: timeout_str = "--timeout {}s".format(timeout) @@ -614,7 +607,6 @@ class K8sHelm3Connector(K8sHelmBaseConnector): def _get_uninstall_command( self, kdu_instance: str, namespace: str, kubeconfig: str ) -> str: - return "env KUBECONFIG={} {} uninstall {} --namespace={}".format( kubeconfig, self._helm_command, kdu_instance, namespace ) diff --git a/n2vc/k8s_helm_base_conn.py b/n2vc/k8s_helm_base_conn.py index 65f898c..5588c3d 100644 --- a/n2vc/k8s_helm_base_conn.py +++ b/n2vc/k8s_helm_base_conn.py @@ -450,7 +450,6 @@ class K8sHelmBaseConnector(K8sConnector): output, rc = exec_task.result() else: - output, rc = await self._local_async_exec( command=command, raise_exception_on_error=False, env=env ) @@ -534,7 +533,6 @@ class K8sHelmBaseConnector(K8sConnector): self.log.debug("upgrading: {}".format(command)) if atomic: - # exec helm in a task exec_task = asyncio.ensure_future( coro_or_future=self._local_async_exec( @@ -560,7 +558,6 @@ class K8sHelmBaseConnector(K8sConnector): output, rc = exec_task.result() else: - output, rc = await self._local_async_exec( command=command, raise_exception_on_error=False, env=env ) @@ -1048,7 +1045,6 @@ class K8sHelmBaseConnector(K8sConnector): async def get_service( self, cluster_uuid: str, service_name: str, namespace: str ) -> object: - self.log.debug( "get service, service_name: {}, namespace: {}, cluster_uuid: {}".format( service_name, namespace, cluster_uuid @@ -1131,7 +1127,6 @@ class K8sHelmBaseConnector(K8sConnector): async def get_values_kdu( self, kdu_instance: str, namespace: str, kubeconfig: str ) -> str: - self.log.debug("get kdu_instance values {}".format(kdu_instance)) return await self._exec_get_command( @@ -1163,7 +1158,6 @@ class K8sHelmBaseConnector(K8sConnector): ) async def help_kdu(self, kdu_model: str, repo_url: str = None) -> str: - self.log.debug( "inspect kdu_model {} readme.md from repo: {}".format(kdu_model, repo_url) ) @@ -1173,7 +1167,6 @@ class K8sHelmBaseConnector(K8sConnector): ) async def synchronize_repos(self, cluster_uuid: str): - self.log.debug("synchronize repos for cluster helm-id: {}".format(cluster_uuid)) try: db_repo_ids = self._get_helm_chart_repos_ids(cluster_uuid) @@ -1546,7 +1539,6 @@ class K8sHelmBaseConnector(K8sConnector): encode_utf8: bool = False, env: dict = None, ) -> (str, int): - command = K8sHelmBaseConnector._remove_multiple_spaces(command) self.log.debug( "Executing async local command: {}, env: {}".format(command, env) @@ -1621,7 +1613,6 @@ class K8sHelmBaseConnector(K8sConnector): encode_utf8: bool = False, env: dict = None, ): - command1 = K8sHelmBaseConnector._remove_multiple_spaces(command1) command2 = K8sHelmBaseConnector._remove_multiple_spaces(command2) command = "{} | {}".format(command1, command2) @@ -1967,7 +1958,6 @@ class K8sHelmBaseConnector(K8sConnector): # params for use in -f file # returns values file option and filename (in order to delete it at the end) def _params_to_file_option(self, cluster_id: str, params: dict) -> (str, str): - if params and len(params) > 0: self._init_paths_env(cluster_name=cluster_id, create_if_not_exist=True) diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py index 0ea8920..84879c8 100644 --- a/n2vc/k8s_helm_conn.py +++ b/n2vc/k8s_helm_conn.py @@ -164,7 +164,6 @@ class K8sHelmConnector(K8sHelmBaseConnector): return True async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str: - self.log.debug( "inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url) ) @@ -235,7 +234,6 @@ class K8sHelmConnector(K8sHelmBaseConnector): return paths, env async def _get_services(self, cluster_id, kdu_instance, namespace, kubeconfig): - # init config, env paths, env = self._init_paths_env( cluster_name=cluster_id, create_if_not_exist=True @@ -422,7 +420,6 @@ class K8sHelmConnector(K8sHelmBaseConnector): self.log.debug("namespace not found") async def _instances_list(self, cluster_id): - # init paths, env paths, env = self._init_paths_env( cluster_name=cluster_id, create_if_not_exist=True @@ -469,7 +466,6 @@ class K8sHelmConnector(K8sHelmBaseConnector): yaml_format: bool = False, show_error_log: bool = False, ) -> Union[str, dict]: - self.log.debug( "status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace) ) @@ -606,7 +602,6 @@ class K8sHelmConnector(K8sHelmBaseConnector): timeout, kubeconfig, ) -> str: - timeout_str = "" if timeout: timeout_str = "--timeout {}".format(timeout) diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py index 053aaa8..1785caa 100644 --- a/n2vc/libjuju.py +++ b/n2vc/libjuju.py @@ -598,7 +598,6 @@ class Libjuju: application = self._get_application(model, application_name) if application is not None: - # Checks if the given machine id in the model, # otherwise function raises an error _machine, _series = self._get_machine_info(model, machine_id) @@ -753,7 +752,6 @@ class Libjuju: try: if application_name not in model.applications: - if machine_id is not None: machine, series = self._get_machine_info(model, machine_id) @@ -893,7 +891,6 @@ class Libjuju: return application async def resolve_application(self, model_name: str, application_name: str): - controller = await self.get_controller() model = await self.get_model(controller, model_name) @@ -927,7 +924,6 @@ class Libjuju: await self.disconnect_controller(controller) async def resolve(self, model_name: str): - controller = await self.get_controller() model = await self.get_model(controller, model_name) all_units_active = False diff --git a/n2vc/loggable.py b/n2vc/loggable.py index d588a1d..cbaa116 100644 --- a/n2vc/loggable.py +++ b/n2vc/loggable.py @@ -31,7 +31,6 @@ import time class Loggable: def __init__(self, log, log_to_console: bool = False, prefix: str = ""): - self._last_log_time = None # used for time increment in logging self._log_to_console = log_to_console self._prefix = prefix @@ -93,7 +92,6 @@ class Loggable: include_thread: bool = False, include_coroutine: bool = True, ) -> str: - # time increment from last log now = time.perf_counter() if self._last_log_time is None: diff --git a/n2vc/n2vc_conn.py b/n2vc/n2vc_conn.py index d38bcad..5752da7 100644 --- a/n2vc/n2vc_conn.py +++ b/n2vc/n2vc_conn.py @@ -456,7 +456,6 @@ class N2VCConnector(abc.ABC, Loggable): # .format(str(status.value), detailed_status, vca_status, entity_type)) try: - the_table = db_dict["collection"] the_filter = db_dict["filter"] the_path = db_dict["path"] diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py index 2c2f6af..cbca396 100644 --- a/n2vc/n2vc_juju_conn.py +++ b/n2vc/n2vc_juju_conn.py @@ -1096,7 +1096,6 @@ class N2VCJujuConnector(N2VCConnector): ) try: - await libjuju.upgrade_charm( application_name=application_name, path=path, @@ -1156,7 +1155,6 @@ class N2VCJujuConnector(N2VCConnector): return Libjuju(vca_connection, loop=self.loop, log=self.log, n2vc=self) def _write_ee_id_db(self, db_dict: dict, ee_id: str): - # write ee_id to database: _admin.deployed.VCA.x try: the_table = db_dict["collection"] diff --git a/n2vc/tests/unit/test_juju_watcher.py b/n2vc/tests/unit/test_juju_watcher.py index 07b2127..b9e9e36 100644 --- a/n2vc/tests/unit/test_juju_watcher.py +++ b/n2vc/tests/unit/test_juju_watcher.py @@ -181,7 +181,6 @@ class EntityStateTest(TestCase): os.path.join(os.path.dirname(__file__), "testdata", filename), "r", ) as self.upgrade_file: - all_changes = AsyncMock() all_changes.Next.side_effect = self._fetch_next_delta mock_all_watcher.return_value = all_changes diff --git a/n2vc/tests/unit/test_k8s_helm3_conn.py b/n2vc/tests/unit/test_k8s_helm3_conn.py index 33add05..a2e75e1 100644 --- a/n2vc/tests/unit/test_k8s_helm3_conn.py +++ b/n2vc/tests/unit/test_k8s_helm3_conn.py @@ -134,7 +134,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): @asynctest.fail_on(active_handles=True) async def test_repo_list(self): - self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) await self.helm_conn.repo_list(self.cluster_uuid) @@ -150,7 +149,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): @asynctest.fail_on(active_handles=True) async def test_repo_remove(self): - self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) repo_name = "bitnami" await self.helm_conn.repo_remove(self.cluster_uuid, repo_name) diff --git a/n2vc/tests/unit/test_libjuju.py b/n2vc/tests/unit/test_libjuju.py index 1bbe556..3de4aee 100644 --- a/n2vc/tests/unit/test_libjuju.py +++ b/n2vc/tests/unit/test_libjuju.py @@ -778,7 +778,6 @@ class ExecuteActionTest(LibjujuTestCase): mock_get_model, mock_get_controller, ): - mock_get_model.return_value = juju.model.Model() mock__get_application.return_value = FakeApplication() output = None @@ -1295,7 +1294,6 @@ class ConfigureApplicationTest(LibjujuTestCase): mock_get_model, mock_get_controller, ): - mock_get_application.return_value = FakeApplication() self.loop.run_until_complete( @@ -1317,7 +1315,6 @@ class ConfigureApplicationTest(LibjujuTestCase): mock_get_model, mock_get_controller, ): - mock_get_application.side_effect = Exception() with self.assertRaises(Exception): @@ -1339,7 +1336,6 @@ class ConfigureApplicationTest(LibjujuTestCase): mock_get_model, mock_get_controller, ): - result = {"error": "not found", "response": "response", "request-id": 1} mock_get_controller.side_effect = JujuAPIError(result) @@ -1364,7 +1360,6 @@ class ConfigureApplicationTest(LibjujuTestCase): mock_get_model, mock_get_controller, ): - result = {"error": "not found", "response": "response", "request-id": 1} mock_get_model.side_effect = JujuAPIError(result) diff --git a/n2vc/tests/unit/test_n2vc_juju_conn.py b/n2vc/tests/unit/test_n2vc_juju_conn.py index df7be50..deb98ce 100644 --- a/n2vc/tests/unit/test_n2vc_juju_conn.py +++ b/n2vc/tests/unit/test_n2vc_juju_conn.py @@ -397,7 +397,6 @@ class UpgradeCharmTest(N2VCJujuConnTestCase): class GenerateApplicationNameTest(N2VCJujuConnTestCase): - vnf_id = "dbfbd751-3de4-4e68-bd40-ec5ae0a53898" def setUp(self): diff --git a/n2vc/tests/unit/utils.py b/n2vc/tests/unit/utils.py index b2d5c60..807c892 100644 --- a/n2vc/tests/unit/utils.py +++ b/n2vc/tests/unit/utils.py @@ -130,7 +130,6 @@ class FakeManualMachine(MagicMock): class FakeWatcher(AsyncMock): - delta_to_return = None async def Next(self): -- 2.17.1