From 3ad6403d989968e80de9eae68363a527c8f94ef7 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Mon, 21 Mar 2022 14:43:59 +0000
Subject: [PATCH] Reinstated hostname conversion; removed redundant code
---
inventory_provider/routes/poller.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py
index 22b699ed..beef91db 100644
--- a/inventory_provider/routes/poller.py
+++ b/inventory_provider/routes/poller.py
@@ -525,20 +525,6 @@ def _get_dashboard_data(ifc):
}
-def _add_dashboards(interfaces):
- """
- generator that dashboards to each interfaces.
-
- :param interfaces: result of _load_interfaces
- :return: generator with `dashboards` populated in each element
- """
-
- for ifc in interfaces:
- dashboards = _get_dashboards(ifc)
- ifc['dashboards'] = sorted([d.name for d in dashboards])
- yield _get_dashboard_data(ifc)
-
-
def _load_interface_bundles(config, hostname=None, use_next_redis=False):
result = dict()
@@ -569,8 +555,8 @@ def _load_interface_bundles(config, hostname=None, use_next_redis=False):
def _load_services(config, hostname=None, use_next_redis=False):
- # if hostname:
- # hostname = get_ims_equipment_name(hostname)
+ if hostname:
+ hostname = get_ims_equipment_name(hostname)
result = dict()
key_pattern = f'ims:interface_services:{hostname}:*' \
--
GitLab