diff --git a/brian_polling_manager/interface_stats/services.py b/brian_polling_manager/interface_stats/services.py index bff2d45f4bf383dca34ab11f0ebc47cdb3bc6393..f124855f76417e4a8ad1bca14719f898f1bcdc22 100644 --- a/brian_polling_manager/interface_stats/services.py +++ b/brian_polling_manager/interface_stats/services.py @@ -1,3 +1,8 @@ +""" +@pelle: this module doesn't seem to serve any purpose, except +to wrap calls to influx.write_points (and the DI approach is not used) +... please simplify/remove it +""" import json import logging import sys @@ -5,7 +10,6 @@ from typing import Callable, Iterable from urllib.parse import urlparse from influxdb import InfluxDBClient - logger = logging.getLogger(__name__) DEFAULT_INFLUX_BATCH_SIZE = 100 diff --git a/brian_polling_manager/interface_stats/vendors/common.py b/brian_polling_manager/interface_stats/vendors/common.py index a2003803c974a524ea03595ec294ceeed122704e..8f85efc37090ece3968e8b03c064477e45351f1f 100644 --- a/brian_polling_manager/interface_stats/vendors/common.py +++ b/brian_polling_manager/interface_stats/vendors/common.py @@ -304,4 +304,3 @@ def parse_interface_xml(node, struct: dict, defaults=None): continue result[key] = parsed return result or None - diff --git a/test/interface_stats/conftest.py b/test/interface_stats/conftest.py index db730999caee9d65052068fa934e9f847f33e610..b610e1ba25df90f966226cb8a7a4a6f8bcf21216 100644 --- a/test/interface_stats/conftest.py +++ b/test/interface_stats/conftest.py @@ -70,14 +70,14 @@ def all_nokia_routers(): return NOKIA_ROUTERS -""" -@pelle: having a fixture that is used only in one place, and in a -separate file from where it is used only decreases readability. -Please move it ... or (to minimize ambiguity) use pytest.mark.parametrize -(this and the one below) -""" @pytest.fixture(params=JUNIPER_ROUTERS) def juniper_router_fqdn(request): + """ + @pelle: having a fixture that is used only in one place, and in a + separate file from where it is used only decreases readability. + Please move it ... or (to minimize ambiguity) use pytest.mark.parametrize + (this and the one below) + """ return request.param diff --git a/test/interface_stats/test_interface_stats.py b/test/interface_stats/test_interface_stats.py index d5c47981ba94bced05ac3f3a712f911615fc8814..421417f8af80f9f24be4c84fc4782478cd446a4e 100644 --- a/test/interface_stats/test_interface_stats.py +++ b/test/interface_stats/test_interface_stats.py @@ -19,6 +19,7 @@ from ncclient.operations.rpc import RPCReply fresh router configs to know if our code breaks """ + def test_sanity_check_snapshot_data(polled_interfaces, all_juniper_routers): """ verify that all routers with interfaces to be polled @@ -522,7 +523,7 @@ def test_prepare_influx_params(input_params, expected): @pytest.mark.parametrize( "hostname", - [ 'rt0.lon.uk.lab.office.geant.net', 'rt0.ams.nl.lab.office.geant.net' ] + ['rt0.lon.uk.lab.office.geant.net', 'rt0.ams.nl.lab.office.geant.net'] ) def test_nokia_counters(hostname): """