add redis current/next data

test/conftest.py

@@ -39,6 +39,7 @@ def data_config_filename():
                 "hostname": "xxxxxx",
                 "port": 6379
             },
+            "redis-databases": [0,7],
             "junosspace": {
                 "api": "bogus-url",
                 "username": "bogus-username",
@@ -75,6 +76,11 @@ class MockedRedis(object):
                 "router-info.json")
             with open(test_data_filename) as f:
                 MockedRedis.db = json.loads(f.read())
+                MockedRedis.db['db:latch'] = json.dumps({
+                    'current': 0,
+                    'next': 0,
+                    'this': 0
+                })
 
     def set(self, name, value):
         MockedRedis.db[name] = value

test/per_router/test_celery_worker.py

@@ -3,12 +3,16 @@ just checks that the worker methods call the right functions
 and some data ends up in the right place ... otherwise not very detailed
 """
 from inventory_provider.tasks import worker
-from inventory_provider.tasks.common import get_redis
+from inventory_provider.tasks.common import _get_redis
 
 
 def backend_db():
-    return get_redis({
-        'redis': {'hostname': None, 'port': None}
+    return _get_redis({
+        'redis': {
+            'hostname': None,
+            'port': None
+        },
+        'redis-databases': [0, 7]
     }).db
 
 

test/per_router/test_classifier_data.py

 from inventory_provider.tasks import worker
-from inventory_provider.tasks.common import get_redis
+from inventory_provider.tasks.common import _get_redis
 
 
 def backend_db():
-    return get_redis({
-        'redis': {'hostname': None, 'port': None}
+    return _get_redis({
+        'redis': {
+            'hostname': None,
+            'port': None
+        },
+        'redis-databases': [0, 7]
     }).db
 
 

test/test_celery_worker_global.py

@@ -6,12 +6,16 @@ import contextlib
 
 from inventory_provider.tasks import worker
 
-from inventory_provider.tasks.common import get_redis
+from inventory_provider.tasks.common import _get_redis
 
 
 def backend_db():
-    return get_redis({
-        'redis': {'hostname': None, 'port': None}
+    return _get_redis({
+        'redis': {
+            'hostname': None,
+            'port': None
+        },
+        'redis-databases': [0, 7]
     }).db
 
 
@@ -20,7 +24,7 @@ def _mocked_connection(x):
     yield x
 
 
-def test_update_locations(mocker, mocked_worker_module):
+def test_update_locations(mocker, mocked_worker_module, mocked_redis):
 
     mocker.patch(
         'inventory_provider.db.opsdb.lookup_pop_info',

test/test_junosspace_io.py

@@ -47,7 +47,8 @@ def test_router_hostname_derivation(mocked_redis):
         'redis': {
             'hostname': None,
             'port': None
-        }
+        },
+        'redis-databases': [0,11]
     }
     hostnames = list(worker._derive_router_hostnames(config))
     assert hostnames  # test data is non-empty