diff --git a/inventory_provider/routes/common.py b/inventory_provider/routes/common.py index 857d644e3e30b3704e58c3f627c93ff2a89cb9a8..3c9bcc297ed28a5080f5c847b437d0fab576124c 100644 --- a/inventory_provider/routes/common.py +++ b/inventory_provider/routes/common.py @@ -1,7 +1,6 @@ import functools -from flask import request, Response, current_app -import redis +from flask import request, Response def require_accepts_json(f): @@ -21,14 +20,3 @@ def require_accepts_json(f): mimetype="text/html") return f(*args, **kwargs) return decorated_function - - -def redis_connection(): - """ - just a common place for acquiring a redis connection - :return: a redis connection - """ - redis_config = current_app.config["INVENTORY_PROVIDER_CONFIG"]["redis"] - return redis.StrictRedis( - host=redis_config["hostname"], - port=redis_config["port"]) diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py index 962660e63122e1fea2fe185c02f72404b804e65d..6ff1f18ac217e6de4e877cc62ccadce5500bfd34 100644 --- a/inventory_provider/routes/poller.py +++ b/inventory_provider/routes/poller.py @@ -2,6 +2,7 @@ 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 @@ -11,7 +12,7 @@ routes = Blueprint('poller-support-routes', __name__) @routes.route('/interfaces/<hostname>', methods=['GET', 'POST']) @common.require_accepts_json def poller_interface_oids(hostname): - r = common.redis_connection() + r = db.get_redis() netconf_string = r.hget(hostname, 'netconf') if not netconf_string: