From 481296d58a1d788a0c8e5bf5eec27b77cba15f8f Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sun, 7 Apr 2019 17:17:21 +0200
Subject: [PATCH] renamed classifier response cache keys
---
inventory_provider/routes/classifier.py | 6 +++---
inventory_provider/tasks/worker.py | 6 +++---
test/per_router/test_classifier_data.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index e7b1ed6e..b9a4886c 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -56,7 +56,7 @@ def related_interfaces(hostname, interface):
def get_juniper_link_info(source_equipment, interface):
r = common.get_redis()
- cache_key = 'classifier:cache:%s:%s' % (source_equipment, interface)
+ cache_key = 'classifier-cache:juniper:%s:%s' % (source_equipment, interface)
result = r.get(cache_key)
if result:
@@ -201,7 +201,7 @@ def peer_info(address):
r = common.get_redis()
- cache_key = 'classifier:peer-cache:%s' % address
+ cache_key = 'classifier-cache:peer:%s' % address
result = r.get(cache_key)
if result:
@@ -243,7 +243,7 @@ def peer_info(address):
def get_trap_metadata(source_equipment, interface):
r = common.get_redis()
- cache_key = 'classifier:infinera:cache:%s:%s' % (
+ cache_key = 'classifier-cache:infinera:%s:%s' % (
source_equipment, interface)
result = r.get(cache_key)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 19c94dbd..5a7a424c 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -279,11 +279,11 @@ def clear_cached_classifier_responses(hostname=None):
r = get_redis(InventoryTask.config)
def _hostname_keys():
- for k in r.keys('classifier:cache:%s:*' % hostname):
+ for k in r.keys('classifier-cache:juniper:%s:*' % hostname):
yield k
# TODO: very inefficient ... but logically simplest at this point
- for k in r.keys('classifier:peer-cache:*'):
+ for k in r.keys('classifier-cache:peer:*'):
value = r.get(k.decode('utf-8'))
if not value:
# deleted in another thread
@@ -294,7 +294,7 @@ def clear_cached_classifier_responses(hostname=None):
yield k
def _all_keys():
- return r.keys('classifier:*')
+ return r.keys('classifier-cache:*')
keys_to_delete = _hostname_keys() if hostname else _all_keys()
for k in keys_to_delete:
diff --git a/test/per_router/test_classifier_data.py b/test/per_router/test_classifier_data.py
index b0d7f5b0..74f26360 100644
--- a/test/per_router/test_classifier_data.py
+++ b/test/per_router/test_classifier_data.py
@@ -17,4 +17,4 @@ def test_clear_classifier_cache(
backend_db().update(classifier_cache_test_entries)
worker.clear_cached_classifier_responses(router)
for k in backend_db():
- assert not k.startswith('classifier:cache:%s:' % router)
+ assert not k.startswith('classifier-cache:%s:' % router)
--
GitLab