diff --git a/inventory_provider/db/opsdb.py b/inventory_provider/db/opsdb.py index a32e0c3887feed9aeb61ca92c7f0bd7c49a67262..74561174fde1f258fa6561d513ae26c9b34777e2 100644 --- a/inventory_provider/db/opsdb.py +++ b/inventory_provider/db/opsdb.py @@ -55,7 +55,7 @@ def _juniper_field_update(record): return '' def _empty(s): - return s is None or s == '' + return s is None or s == '' for end in ['', 'other_end_']: if not record[end + "interface_name"]: diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index 75e19a511fd62b3847063e4bd0de5d5c238e4aa1..dcf1c2a8f8b9bacd9c5d3d11a64da1ec2d7a28de 100644 --- a/inventory_provider/tasks/worker.py +++ b/inventory_provider/tasks/worker.py @@ -1,7 +1,6 @@ import json import logging import os -import re import time from celery import Task, states diff --git a/test/test_opsdb_queries.py b/test/test_opsdb_queries.py index e9a049290ba7afe99223810af23997e920024744..daba68fdad1b0dde7475ddd6940334ac76654e74 100644 --- a/test/test_opsdb_queries.py +++ b/test/test_opsdb_queries.py @@ -351,7 +351,7 @@ CIRCUIT_INFO_SCHEMA = { "additionalProperties": False } + def test_get_circuits(connection, cached_test_data): - import re for circuit in opsdb.get_circuits(connection): jsonschema.validate(circuit, CIRCUIT_INFO_SCHEMA)