From 8ccf4d066cb1358a937de57c850dac3200de53c7 Mon Sep 17 00:00:00 2001 From: Pelle Koster <pelle.koster@geant.org> Date: Wed, 26 Feb 2025 12:12:53 +0100 Subject: [PATCH] FIX: gws mapping based on interface-name and not sap-id --- inventory_provider/nokia.py | 6 +++--- test/test_worker.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory_provider/nokia.py b/inventory_provider/nokia.py index 43c7ba2..fa675fe 100644 --- a/inventory_provider/nokia.py +++ b/inventory_provider/nokia.py @@ -448,9 +448,9 @@ def get_all_bgp_peers(netconf_config): def get_gws_indirect_filters(netconf_config): for sap in netconf_config.xpath( 'configure/service/vprn[service-name/text()="IAS"]' - "/interface/sap[egress/filter/ip]" + "/interface[sap/egress/filter/ip]" ): yield { - "interface": sap.find("sap-id").text, - "ip_filter": sap.find("egress/filter/ip").text, + "interface": sap.find("interface-name").text.lower(), + "ip_filter": sap.find("sap/egress/filter/ip").text, } diff --git a/test/test_worker.py b/test/test_worker.py index 25edf02..7b548d7 100644 --- a/test/test_worker.py +++ b/test/test_worker.py @@ -1149,6 +1149,6 @@ def test_refresh_nokia_gws_indirect_ip_filters( result = json.loads(r.get(f"nokia-ip-filters:{hostname}")) assert result == { - "lag-11:333": "NREN_IAS_DFN_OUT", - "lag-17:252": "NREN_IAS_REDIRIS_OUT", + "lag-11.333": "NREN_IAS_DFN_OUT", + "lag-17.252": "NREN_IAS_REDIRIS_OUT", } -- GitLab