From 34a30945a6878e62ad7250313848b7cecb2edcc7 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sat, 13 Apr 2019 11:57:01 +0200
Subject: [PATCH] use _derive_router_hostnames for list of hostnames
---
inventory_provider/tasks/worker.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 0b691f7f..5335b0b5 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))
--
GitLab