diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 0b691f7fa419254e0e266e8d7c0a91d4143f034e..5335b0b5a0b3c3ba41522d2bc4857f01b1670745 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -144,14 +144,8 @@ def update_equipment_locations():
for k in r.scan_iter('opsdb:location:*'):
r.delete(k)
- hostnames = []
- for k in r.keys('netconf:*'):
- m = re.match('^netconf:(.+)$', k.decode('utf-8'))
- assert m
- hostnames.append(m.group(1))
-
with db.connection(InventoryTask.config["ops-db"]) as cx:
- for h in hostnames:
+ for h in _derive_router_hostnames(InventoryTask.config):
for ld in opsdb.lookup_pop_info(cx, h):
r.set('opsdb:location:%s' % h, json.dumps(ld))
diff --git a/test/conftest.py b/test/conftest.py
index 0a9a3cec059287e5068958351e8d21a81a578808..dcc66f45fd54ebb62a5939c1816da7a7cc85ada6 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -6,9 +6,12 @@ import re
import shutil
import tempfile
+from lxml import etree
import pytest
+
import inventory_provider
from inventory_provider import config
+from inventory_provider.tasks import worker
TEST_DATA_DIRNAME = os.path.realpath(os.path.join(
inventory_provider.__path__[0],
@@ -106,14 +109,24 @@ class MockedRedis(object):
return None
return value.encode('utf-8')
- def keys(self, glob=None):
+ def delete(self, key):
+ if isinstance(key, bytes):
+ key = key.decode('utf-8')
+ del MockedRedis.db[key]
+
+ def scan_iter(self, glob=None):
if not glob:
- return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
+ for k in MockedRedis.db.keys():
+ yield k.encode('utf-8')
+
m = re.match(r'^([^*]+)\*$', glob)
- assert m # all expected global are like this
- return list([
- k.encode("utf-8") for k in MockedRedis.db.keys()
- if k.startswith(m.group(1))])
+ assert m # all expected globs are like this
+ for k in MockedRedis.db.keys():
+ if k.startswith(m.group(1)):
+ yield k.encode('utf-8')
+
+ def keys(self, glob=None):
+ return list(self.scan_iter(glob))
def flushdb(self):
# only called from testing routes (hopefully)
@@ -197,3 +210,23 @@ def mocked_netifaces(mocker):
data = ast.literal_eval(s)
mocker.patch('netifaces.interfaces', lambda: data.keys())
mocker.patch('netifaces.ifaddresses', lambda n: data[n])
+
+
+@pytest.fixture
+def mocked_worker_module(
+ mocker, mocked_redis, data_config,
+ cached_test_data, mocked_netifaces):
+
+ worker.InventoryTask.config = data_config
+
+ def _mocked_snmp_interfaces(hostname, community, _):
+ return json.loads(cached_test_data['snmp-interfaces:' + hostname])
+ mocker.patch(
+ 'inventory_provider.snmp.get_router_interfaces',
+ _mocked_snmp_interfaces)
+
+ def _mocked_load_juniper_netconf_config(hostname, _):
+ return etree.XML(cached_test_data['netconf:' + hostname])
+ mocker.patch(
+ 'inventory_provider.juniper.load_config',
+ _mocked_load_juniper_netconf_config)
diff --git a/test/per_router/conftest.py b/test/per_router/conftest.py
index 798252d3da84150a245a86161c948d9089fe7e2c..f8faaf845704553ec09940e810d3da74d4fa11b5 100644
--- a/test/per_router/conftest.py
+++ b/test/per_router/conftest.py
@@ -15,42 +15,6 @@ TEST_DATA_DIRNAME = os.path.realpath(os.path.join(
"data"))
-class MockedRedis(object):
-
- db = None
-
- def __init__(self, *args, **kwargs):
- if MockedRedis.db is None:
- test_data_filename = os.path.join(
- TEST_DATA_DIRNAME,
- "router-info.json")
- with open(test_data_filename) as f:
- MockedRedis.db = json.loads(f.read())
-
- def set(self, name, value):
- MockedRedis.db[name] = value
-
- def get(self, name):
- value = MockedRedis.db.get(name, None)
- if value is None:
- return None
- return value.encode('utf-8')
-
- def keys(self, glob=None):
- if not glob:
- return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
- m = re.match(r'^([^*]+)\*$', glob)
- assert m # all expected global are like this
- return list([
- k.encode("utf-8") for k in MockedRedis.db.keys()
- if k.startswith(m.group(1))])
-
- def delete(self, key):
- if isinstance(key, bytes):
- key = key.decode('utf-8')
- del MockedRedis.db[key]
-
-
@pytest.fixture
def classifier_cache_test_entries():
filename = os.path.join(
@@ -59,14 +23,6 @@ def classifier_cache_test_entries():
return json.loads(f.read())
-@pytest.fixture
-def mocked_redis(mocker):
- mocker.patch(
- 'inventory_provider.tasks.common.redis.StrictRedis',
- MockedRedis)
- return MockedRedis()
-
-
def pytest_generate_tests(metafunc):
def _junosspace_hosts():
diff --git a/test/per_router/test_celery_worker.py b/test/per_router/test_celery_worker.py
index 37a676a9731d2c588be288e9f31d095cc1db9ed7..e3e636c8b5bcb4772ffc7ef1ea9dae6bba89eea6 100644
--- a/test/per_router/test_celery_worker.py
+++ b/test/per_router/test_celery_worker.py
@@ -2,10 +2,6 @@
just checks that the worker methods call the right functions
and some data ends up in the right place ... otherwise not very detailed
"""
-import json
-
-from lxml import etree
-import pytest
from inventory_provider.tasks import worker
from inventory_provider.tasks.common import get_redis
@@ -16,26 +12,6 @@ def backend_db():
}).db
-@pytest.fixture
-def mocked_worker_module(
- mocker, mocked_redis, data_config,
- cached_test_data, mocked_netifaces):
-
- worker.InventoryTask.config = data_config
-
- def _mocked_snmp_interfaces(hostname, community, _):
- return json.loads(cached_test_data['snmp-interfaces:' + hostname])
- mocker.patch(
- 'inventory_provider.snmp.get_router_interfaces',
- _mocked_snmp_interfaces)
-
- def _mocked_load_juniper_netconf_config(hostname, _):
- return etree.XML(cached_test_data['netconf:' + hostname])
- mocker.patch(
- 'inventory_provider.juniper.load_config',
- _mocked_load_juniper_netconf_config)
-
-
def test_netconf_refresh_config(mocked_worker_module, router):
del backend_db()['netconf:' + router]
worker.netconf_refresh_config(router)
diff --git a/test/test_celery_worker_global.py b/test/test_celery_worker_global.py
new file mode 100644
index 0000000000000000000000000000000000000000..3592cc3e9b2f149a82e92df633a80ae240793d79
--- /dev/null
+++ b/test/test_celery_worker_global.py
@@ -0,0 +1,43 @@
+"""
+just checks that the worker methods call the right functions
+and some data ends up in the right place ... otherwise not very detailed
+"""
+import contextlib
+
+from inventory_provider.tasks import worker
+from inventory_provider.tasks.common import get_redis
+
+
+def backend_db():
+ return get_redis({
+ 'redis': {'hostname': None, 'port': None}
+ }).db
+
+
+@contextlib.contextmanager
+def _mocked_connection(x):
+ yield x
+
+
+def test_update_locations(mocker, mocked_worker_module):
+
+ mocker.patch(
+ 'inventory_provider.db.opsdb.lookup_pop_info',
+ lambda c, h: [{'C': c, 'H': h}])
+ mocker.patch(
+ 'inventory_provider.db.db.connection',
+ _mocked_connection)
+
+ def _cached_locations():
+ db = backend_db()
+ for k in db.keys():
+ if k.startswith('opsdb:location:'):
+ yield k
+
+ db = backend_db()
+ for k in list(_cached_locations()):
+ del db[k]
+
+ assert len(list(_cached_locations())) == 0 # sanity
+ worker.update_equipment_locations()
+ assert len(list(_cached_locations())) > 0