moved get_redis from db.py to routes/common.py

inventory_provider/db.py

 import contextlib
 import mysql.connector
-import redis
-
-from flask import current_app, g
-
-
-def get_redis():  # pragma: no cover
-    if 'redis_db' not in g:
-        config = current_app.config['INVENTORY_PROVIDER_CONFIG']
-        g.redis_db = redis.Redis(
-            host=config['redis']['hostname'],
-            port=config['redis']['port'])
-
-    return g.redis_db
 
 
 @contextlib.contextmanager

inventory_provider/routes/classifier.py

@@ -4,7 +4,7 @@ from flask import Blueprint, request, Response, current_app, jsonify
 import json
 import jsonschema
 
-from inventory_provider import db
+from inventory_provider.routes import common
 
 routes = Blueprint("inventory-data-classifier-support-routes", __name__)
 
@@ -59,7 +59,7 @@ def juniper_addresses():
         }
     }
 
-    servers = db.get_redis().get('alarmsdb:juniper_servers')
+    servers = common.get_redis().get('alarmsdb:juniper_servers')
     if not servers:
         return Response(
             response="no juniper server data found",
@@ -77,7 +77,7 @@ def juniper_addresses():
 def get_trap_metadata(trap_type, source_equipment, interface):
     # todo - Move this to config
     interface_info_key = "interface_services"
-    r = db.get_redis()
+    r = common.get_redis()
 
     # todo - Change this to a call to the yet-to-be-created one source of all
     #        relevant information

inventory_provider/routes/common.py

 import functools
 
-from flask import request, Response
+from flask import request, Response, current_app, g
+import redis
+
+
+def get_redis():
+    if 'redis_db' not in g:
+        config = current_app.config['INVENTORY_PROVIDER_CONFIG']
+        g.redis_db = redis.StrictRedis(
+            host=config['redis']['hostname'],
+            port=config['redis']['port'])
+
+    return g.redis_db
 
 
 def require_accepts_json(f):

inventory_provider/routes/data.py

@@ -6,7 +6,8 @@ from flask import Blueprint, jsonify, request, Response, current_app
 from lxml import etree
 import redis
 
-from inventory_provider import db, juniper
+from inventory_provider import juniper
+from inventory_provider.routes import common
 
 routes = Blueprint("inventory-data-query-routes", __name__)
 
@@ -168,7 +169,7 @@ def bgp_configs(hostname):
               methods=['GET', 'POST'])
 @require_accepts_json
 def interface_statuses(hostname, interface):
-    r = db.get_redis()
+    r = common.get_redis()
     result = r.hget("interface_statuses",
                     "{}::{}".format(hostname, interface))
     if not result:
@@ -182,7 +183,7 @@ def interface_statuses(hostname, interface):
 @routes.route("/services/<hostname>/<path:interface>",
               methods=['GET', 'POST'])
 def services_for_interface(hostname, interface):
-    r = db.get_redis()
+    r = common.get_redis()
     result = r.hget("interface_services",
                     "{}::{}".format(hostname, interface))
     if not result:

inventory_provider/routes/opsdb.py

@@ -2,7 +2,7 @@ import functools
 import json
 
 from flask import Blueprint, request, Response
-from inventory_provider import db
+from inventory_provider.routes import common
 
 routes = Blueprint("inventory-opsdb-query-routes", __name__)
 
@@ -38,7 +38,7 @@ def _decode_utf8_dict(d):
 
 @routes.route("/interfaces")
 def get_all_interface_details():
-    r = db.get_redis()
+    r = common.get_redis()
     result = _decode_utf8_dict(
             r.hgetall(interfaces_key))
 
@@ -49,7 +49,7 @@ def get_all_interface_details():
 
 @routes.route("/interfaces/<equipment_name>")
 def get_interface_details_for_equipment(equipment_name):
-    r = db.get_redis()
+    r = common.get_redis()
     result = {}
     for t in r.hscan_iter(interfaces_key, "{}::*".format(equipment_name)):
         result[t[0].decode("utf8")] = json.loads(t[1])
@@ -61,7 +61,7 @@ def get_interface_details_for_equipment(equipment_name):
 
 @routes.route("/interfaces/<equipment_name>/<path:interface>")
 def get_interface_details(equipment_name, interface):
-    r = db.get_redis()
+    r = common.get_redis()
     return Response(
         r.hget(
             interfaces_key,
@@ -71,7 +71,7 @@ def get_interface_details(equipment_name, interface):
 
 @routes.route("/equipment-location")
 def get_all_equipment_locations():
-    r = db.get_redis()
+    r = common.get_redis()
     result = list(
         _decode_utf8_dict(
             r.hgetall(equipment_locations_key)).values())
@@ -83,7 +83,7 @@ def get_all_equipment_locations():
 
 @routes.route("/equipment-location/<path:equipment_name>")
 def get_equipment_location(equipment_name):
-    r = db.get_redis()
+    r = common.get_redis()
     return Response(
         r.hget(equipment_locations_key, equipment_name),
         mimetype="application/json")
@@ -91,7 +91,7 @@ def get_equipment_location(equipment_name):
 
 @routes.route("/circuit-hierarchy/children/<parent_id>")
 def get_children(parent_id):
-    r = db.get_redis()
+    r = common.get_redis()
     return Response(
         r.hget(
             service_parent_to_children_key,
@@ -101,7 +101,7 @@ def get_children(parent_id):
 
 @routes.route("/circuit-hierarchy/parents/<child_id>")
 def get_parents(child_id):
-    r = db.get_redis()
+    r = common.get_redis()
     return Response(
         r.hget(
             service_child_to_parents_key,

inventory_provider/routes/poller.py

@@ -2,7 +2,6 @@ import json
 
 from flask import Blueprint, Response, jsonify
 from lxml import etree
-from inventory_provider import db
 from inventory_provider import juniper
 from inventory_provider.routes import common
 
@@ -12,7 +11,7 @@ routes = Blueprint('poller-support-routes', __name__)
 @routes.route('/interfaces/<hostname>', methods=['GET', 'POST'])
 @common.require_accepts_json
 def poller_interface_oids(hostname):
-    r = db.get_redis()
+    r = common.get_redis()
 
     netconf_string = r.hget(hostname, 'netconf')
     if not netconf_string:

test/per_router/test_data_routes.py

@@ -52,7 +52,7 @@ class MockedRedis(object):
 @pytest.fixture
 def client_with_mocked_data(mocker, client):
     mocker.patch(
-        'inventory_provider.routes.data.redis.StrictRedis',
+        'inventory_provider.routes.common.redis.StrictRedis',
         MockedRedis)
     return client
 

test/per_router/test_poller_routes.py

@@ -58,8 +58,8 @@ class MockedRedis(object):
 @pytest.fixture
 def client_with_mocked_data(mocker, client):
     mocker.patch(
-        'inventory_provider.routes.classifier.db.get_redis',
-        return_value=MockedRedis())
+        'inventory_provider.routes.common.redis.StrictRedis',
+        MockedRedis)
     return client
 
 

test/test_classifier_routes.py

@@ -49,15 +49,15 @@ def test_juniper_addresses(mocker, client):
     ]
 
     class MockedRedis():
-        def __init__(self):
+        def __init__(self, *args, **kwargs):
             pass
 
         def get(self, ignored):
             return json.dumps(test_data).encode('utf-8')
 
     mocker.patch(
-        'inventory_provider.routes.classifier.db.get_redis',
-        return_value=MockedRedis())
+        'inventory_provider.routes.common.redis.StrictRedis',
+        MockedRedis)
 
     response_schema = {
             "$schema": "http://json-schema.org/draft-07/schema#",
@@ -93,7 +93,7 @@ def test_trap_metadata(mocker, client):
         }
     ]
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.classifier.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_redis.return_value.hget.return_value = json.dumps(test_data)\
         .encode("utf-8")
 

test/test_external_inventory_routes.py

@@ -9,7 +9,7 @@ DEFAULT_REQUEST_HEADERS = {
 
 def test_get_one_equipment_location(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hget = mocked_redis.return_value.hget
     dummy_data = {
         "absid": 1404,
@@ -38,7 +38,7 @@ def test_get_one_equipment_location(mocker, client):
 
 def test_get_equipment_location(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hgetall = mocked_redis.return_value.hgetall
 
     rv = client.get(
@@ -54,7 +54,7 @@ def test_get_equipment_location(mocker, client):
 
 def test_get_interface_info(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hgetall = mocked_redis.return_value.hgetall
 
     rv = client.get(
@@ -70,7 +70,7 @@ def test_get_interface_info(mocker, client):
 
 def test_get_interface_info_for_equipment(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hscan_iter = mocked_redis.return_value.hscan_iter
 
     rv = client.get(
@@ -86,7 +86,7 @@ def test_get_interface_info_for_equipment(mocker, client):
 
 def test_get_interface_info_for_equipment_and_interface(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hget = mocked_redis.return_value.hget
 
     rv = client.get(
@@ -102,7 +102,7 @@ def test_get_interface_info_for_equipment_and_interface(mocker, client):
 
 def test_get_children(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hget = mocked_redis.return_value.hget
 
     rv = client.get(
@@ -119,7 +119,7 @@ def test_get_children(mocker, client):
 
 def test_get_parents(mocker, client):
     mocked_redis = mocker.patch(
-        "inventory_provider.routes.opsdb.db.get_redis")
+        "inventory_provider.routes.common.get_redis")
     mocked_hget = mocked_redis.return_value.hget
 
     rv = client.get(