From 9fd250713a5179a3c8f586af594a2aff079fdc8b Mon Sep 17 00:00:00 2001 From: Erik Reid <erik.reid@geant.org> Date: Thu, 12 Dec 2019 16:27:41 +0100 Subject: [PATCH] gave a method a better name --- inventory_provider/tasks/worker.py | 4 ++-- test/test_general_poller_routes.py | 4 ++-- test/test_worker_utils.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index e39f3d12..9e7c90fc 100644 --- a/inventory_provider/tasks/worker.py +++ b/inventory_provider/tasks/worker.py @@ -560,7 +560,7 @@ def refresh_finalizer(self, pending_task_ids_json): _wait_for_tasks(task_ids, update_callback=_update) _build_subnet_db(update_callback=_update) - _build_interface_services(update_callback=_update) + _build_service_category_interface_list(update_callback=_update) except (jsonschema.ValidationError, json.JSONDecodeError, @@ -574,7 +574,7 @@ def refresh_finalizer(self, pending_task_ids_json): logger.debug('<<< refresh_finalizer') -def _build_interface_services(update_callback=lambda s: None): +def _build_service_category_interface_list(update_callback=lambda s: None): logger.debug('>>> _build_interface_services') r = get_next_redis(InventoryTask.config) diff --git a/test/test_general_poller_routes.py b/test/test_general_poller_routes.py index 0e88d1e6..e530c94b 100644 --- a/test/test_general_poller_routes.py +++ b/test/test_general_poller_routes.py @@ -34,7 +34,7 @@ INTERFACE_LIST_SCHEMA = { @pytest.mark.parametrize('category', ['mdvpn', 'lhcone', 'MDVpn', 'LHCONE']) def test_service_category(client, mocked_worker_module, category): - worker._build_interface_services() + worker._build_service_category_interface_list() rv = client.get( f'/poller/services/{category}', headers=DEFAULT_REQUEST_HEADERS) @@ -47,7 +47,7 @@ def test_service_category(client, mocked_worker_module, category): @pytest.mark.parametrize('category', ['mdvpn ', ' mdvpn', 'mdvpn1', 'aaa']) def test_service_category_not_found(client, mocked_worker_module, category): - worker._build_interface_services() + worker._build_service_category_interface_list() rv = client.get( f'/poller/services/{category}', headers=DEFAULT_REQUEST_HEADERS) diff --git a/test/test_worker_utils.py b/test/test_worker_utils.py index f94d2dab..b62e9cb0 100644 --- a/test/test_worker_utils.py +++ b/test/test_worker_utils.py @@ -40,7 +40,7 @@ def test_build_interface_services(mocked_worker_module): } db = backend_db() # also forces initialization - worker._build_interface_services() + worker._build_service_category_interface_list() seen_types = set() for k, v in db.items(): -- GitLab