diff --git a/inventory_provider/routes/default.py b/inventory_provider/routes/default.py index b4f7da6a333f4647057c1e1f841d3e96141f9b6f..d50792f9486b4d059dadba53cc4856373e8d07d0 100644 --- a/inventory_provider/routes/default.py +++ b/inventory_provider/routes/default.py @@ -1,6 +1,3 @@ -import csv -import os - import pkg_resources from flask import Blueprint, jsonify, current_app diff --git a/inventory_provider/routes/ims_jobs.py b/inventory_provider/routes/ims_jobs.py index c57b686af3627d562874086159037a6583aa83f1..25a9c71e9d5fe6fc7bf9a4449603a96d2b1ebc37 100644 --- a/inventory_provider/routes/ims_jobs.py +++ b/inventory_provider/routes/ims_jobs.py @@ -1,10 +1,6 @@ -import json -import logging - from distutils.util import strtobool from flask import Blueprint, current_app, jsonify, Response, request -from inventory_provider.tasks import monitor from inventory_provider.tasks import ims_worker from inventory_provider.routes import common from inventory_provider.tasks.common import get_current_redis, get_latch diff --git a/inventory_provider/tasks/ims_worker.py b/inventory_provider/tasks/ims_worker.py index 913d0cf4e2bb00bf82eb5928220b2a0d75e8a94d..a6126ad04c80d1e5e92c0f5bd748751503e643cd 100644 --- a/inventory_provider/tasks/ims_worker.py +++ b/inventory_provider/tasks/ims_worker.py @@ -15,14 +15,14 @@ from redis import RedisError from inventory_provider.db import ims_data from inventory_provider.db.ims import IMS from inventory_provider import environment, config -from inventory_provider.tasks import monitor, data +from inventory_provider.tasks import monitor from inventory_provider.tasks.app import app from inventory_provider.tasks.common import get_current_redis, \ - get_next_redis, update_latch_status, get_latch, set_latch + get_next_redis, update_latch_status from inventory_provider.tasks.worker import InventoryTask, \ log_task_entry_and_exit, import_unmanaged_interfaces, \ - reload_router_config, refresh_finalizer, update_neteng_managed_device_list, \ - _erase_next_db + reload_router_config, refresh_finalizer, \ + update_neteng_managed_device_list, _erase_next_db environment.setup_logging() @@ -82,7 +82,6 @@ def internal_refresh_phase_2_ims(self): routers = r.get('netdash') assert routers netdash_equipment = json.loads(routers.decode('utf-8')) - # for hostname in data.derive_router_hostnames(InventoryTask.config): for hostname in netdash_equipment: logger.debug(f'queueing router refresh jobs for {hostname}') subtasks.append(reload_router_config.apply_async(args=[hostname])) diff --git a/test/test_ims_classifier_routes.py b/test/test_ims_classifier_routes.py index 1cbe730e4ec45e6988c0893f4d1a94d92049c86e..17d260fdaebbf4aa7d1a503a3fdd119e7850d3d7 100644 --- a/test/test_ims_classifier_routes.py +++ b/test/test_ims_classifier_routes.py @@ -1,4 +1,3 @@ -import contextlib import json import jsonschema import pytest @@ -6,7 +5,7 @@ import pytest from inventory_provider.routes.classifier_schema \ import JUNIPER_LINK_RESPONSE_SCHEMA, PEER_INFO_RESPONSE_SCHEMA, \ INFINERA_LAMBDA_INFO_RESPONSE_SCHEMA, CORIANT_INFO_RESPONSE_SCHEMA, \ - CORIANT_INFO_RESPONSE_SCHEMA_NEW, INFINERA_FIBERLINK_INFO_RESPONSE_SCHEMA + INFINERA_FIBERLINK_INFO_RESPONSE_SCHEMA DEFAULT_REQUEST_HEADERS = { "Content-type": "application/json", diff --git a/test/test_ims_data.py b/test/test_ims_data.py index d907593a4aeeca1cfc0a0ccbc020ad74090a4aca..29e67e0ccfa57c91dc16153610514ba5b350adbf 100644 --- a/test/test_ims_data.py +++ b/test/test_ims_data.py @@ -100,7 +100,6 @@ def test_get_port_details(mocker): assert res == predicted - def test_get_port_id_services(mocker): called = False