From 632cba0e3ebbff425e50f9f1d89f267b6e5218d4 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke.madsen@geant.org>
Date: Thu, 19 Aug 2021 12:25:37 +0200
Subject: [PATCH] Add parsing of dashboard name for GWS PHY UPSTREAM
---
inventory_provider/routes/poller.py | 5 +++++
test/test_general_poller_routes.py | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py
index 3abd16b8..76e964e8 100644
--- a/inventory_provider/routes/poller.py
+++ b/inventory_provider/routes/poller.py
@@ -486,6 +486,11 @@ def _get_dashboard_data(ifc):
name = description.split('|')
name = name[1].strip()
name = name.replace('( ', '(')
+ elif BRIAN_DASHBOARDS.GWS_PHY_UPSTREAM.name in dashboards:
+ name = description.split(' ')[2].strip().upper()
+ host = ifc['router']
+ location = host.split('.')[1].upper()
+ name = f'{name} - {location}'
else:
name = description.split(' ')[2].upper()
diff --git a/test/test_general_poller_routes.py b/test/test_general_poller_routes.py
index c528635a..f9244bb5 100644
--- a/test/test_general_poller_routes.py
+++ b/test/test_general_poller_routes.py
@@ -290,8 +290,9 @@ def test_interface_dashboard_mapping(description, expected_dashboards):
}, {'name': 'FCCN', 'interface_type': 'LOGICAL'}),
({
'description': 'PHY UPSTREAM TELIA SRF9940473 | Telia ID: IC-326863',
+ 'router': 'mx1.bud.hu.geant.net',
'dashboards': ['GWS_PHY_UPSTREAM']
- }, {'name': 'TELIA', 'interface_type': 'PHYSICAL'}),
+ }, {'name': 'TELIA - BUD', 'interface_type': 'PHYSICAL'}),
({
'description': 'SRV_IAS UPSTREAM COGENT #COGENT_GWS_VIE | ASN174',
'dashboards': ['IAS_UPSTREAM']
--
GitLab