From 810afa3e077c4c351b2abfdb61985bc90941a189 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Mon, 28 Jan 2019 14:47:09 +0100
Subject: [PATCH] use db.get_redis
---
inventory_provider/routes/common.py | 14 +-------------
inventory_provider/routes/poller.py | 3 ++-
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/inventory_provider/routes/common.py b/inventory_provider/routes/common.py
index 857d644e..3c9bcc29 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 962660e6..6ff1f18a 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:
--
GitLab