Skip to content
Snippets Groups Projects
Commit 1c06eb4a authored by Robert Latta's avatar Robert Latta
Browse files

Checked that a match was found when deriving equipment name

parent d26b162e
No related branches found
No related tags found
No related merge requests found
...@@ -448,6 +448,7 @@ def reload_router_config(self, hostname): ...@@ -448,6 +448,7 @@ def reload_router_config(self, hostname):
def _derive_router_hostnames(config): def _derive_router_hostnames(config):
logger = logging.getLogger(__name__)
r = get_redis(config) r = get_redis(config)
junosspace_equipment = set() junosspace_equipment = set()
for k in r.keys('junosspace:*'): for k in r.keys('junosspace:*'):
...@@ -460,8 +461,11 @@ def _derive_router_hostnames(config): ...@@ -460,8 +461,11 @@ def _derive_router_hostnames(config):
m = re.match( m = re.match(
'opsdb:interface_services:([^:]+):.*$', 'opsdb:interface_services:([^:]+):.*$',
k.decode('utf-8')) 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 return junosspace_equipment & opsdb_equipment
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment