Changed reference for variables, and PEP8

inventory_provider/routes/opsdb.py

@@ -3,7 +3,6 @@ import json
 
 from flask import Blueprint, request, Response
 from inventory_provider import db
-from inventory_provider.storage import external_inventory
 
 routes = Blueprint("inventory-opsdb-query-routes", __name__)
 

test/test_external_inventory_routes.py

 import json
-from inventory_provider.storage import external_inventory
+from inventory_provider.tasks import worker
 
 DEFAULT_REQUEST_HEADERS = {
     "Content-type": "application/json",
@@ -31,7 +31,7 @@ def test_get_one_equipment_location(mocker, client):
     assert dummy_data == json.loads(rv.data.decode("utf-8"))
 
     mocked_hget.assert_called_with(
-        external_inventory.equipment_locations_key,
+        worker.equipment_locations_key,
         "dummy-equipment"
     )
 
@@ -48,7 +48,7 @@ def test_get_equipment_location(mocker, client):
     assert rv.is_json
 
     mocked_hgetall.assert_called_with(
-        external_inventory.equipment_locations_key
+        worker.equipment_locations_key
     )
 
 
@@ -64,7 +64,7 @@ def test_get_interface_info(mocker, client):
     assert rv.is_json
 
     mocked_hgetall.assert_called_with(
-        external_inventory.interfaces_key
+        worker.interfaces_key
     )
 
 
@@ -80,7 +80,7 @@ def test_get_interface_info_for_equipment(mocker, client):
     assert rv.is_json
 
     mocked_hscan_iter.assert_called_with(
-        external_inventory.interfaces_key, "dummy-equipment::*"
+        worker.interfaces_key, "dummy-equipment::*"
     )
 
 
@@ -96,7 +96,7 @@ def test_get_interface_info_for_equipment_and_interface(mocker, client):
     assert rv.is_json
 
     mocked_hget.assert_called_with(
-        external_inventory.interfaces_key, "dummy-equipment::xe-2/3/1"
+        worker.interfaces_key, "dummy-equipment::xe-2/3/1"
     )
 
 
@@ -112,7 +112,7 @@ def test_get_children(mocker, client):
     assert rv.is_json
 
     mocked_hget.assert_called_with(
-        external_inventory.service_parent_to_children_key,
+        worker.service_parent_to_children_key,
         "22987"
     )
 
@@ -129,6 +129,6 @@ def test_get_parents(mocker, client):
     assert rv.is_json
 
     mocked_hget.assert_called_with(
-        external_inventory.service_parent_to_children_key,
+        worker.service_parent_to_children_key,
         "22987"
     )