From 1c06eb4a4491a31931c4e6d93208fba8207b1585 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Wed, 8 May 2019 10:57:25 +0000
Subject: [PATCH] Checked that a match was found when deriving equipment name
---
inventory_provider/tasks/worker.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 045bef10..a3fd3a27 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -448,6 +448,7 @@ def reload_router_config(self, hostname):
def _derive_router_hostnames(config):
+ logger = logging.getLogger(__name__)
r = get_redis(config)
junosspace_equipment = set()
for k in r.keys('junosspace:*'):
@@ -460,8 +461,11 @@ def _derive_router_hostnames(config):
m = re.match(
'opsdb:interface_services:([^:]+):.*$',
k.decode('utf-8'))
- opsdb_equipment.add(m.group(1))
-
+ if m:
+ opsdb_equipment.add(m.group(1))
+ else:
+ logger.info("Unable to derive router name from %s" %
+ k.decode('utf-8'))
return junosspace_equipment & opsdb_equipment
--
GitLab