From 4c900248e3878c83eadaf5c80741651ac1de34f1 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 23 Feb 2024 14:47:12 +0000
Subject: [PATCH] added additional search for matching lab routers. RE
DBOARD3-888
---
inventory_provider/tasks/worker.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 32859495..df66c2c5 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -461,8 +461,15 @@ def update_entry_point(self):
def _get_router_vendor(router):
return ims_rv.get(router.lower().split('.geant.')[0], 'unknown')
+ def _get_lab_router_vendor(router):
+ _rv = ims_rv.get(router.lower().split('.geant.')[0])
+ if not _rv:
+ _rv = ims_rv.get(router.lower().split('.office.')[0],
+ 'unknown')
+ return _rv
+
rv = {r: _get_router_vendor(r) for r in routers}
- lab_rv = {r: _get_router_vendor(r) for r in lab_routers}
+ lab_rv = {r: _get_lab_router_vendor(r) for r in lab_routers}
chord(
(
ims_task.s().on_error(task_error_handler.s()),
--
GitLab