diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py index 479a84a83c9c7e6c68b1c6b07251880abd91c49d..6d7476e0fd50a2ba20d64b13cea4a2c233555e0e 100644 --- a/inventory_provider/routes/poller.py +++ b/inventory_provider/routes/poller.py @@ -105,6 +105,7 @@ class BRIAN_DASHBOARDS(Enum): IAS_CUSTOMER = auto() IAS_UPSTREAM = auto() GWS_PHY_UPSTREAM = auto() + GBS_10G = auto() # aggregate dashboards CLS_PEERS = auto() @@ -112,13 +113,11 @@ class BRIAN_DASHBOARDS(Enum): GWS_UPSTREAMS = auto() LHCONE = auto() CAE1 = auto() + COPERNICUS = auto() # NREN customer NREN = auto() - # COPERNICUS - COPERNICUS = auto() - # only used in INTERFACE_LIST_SCHEMA and sphinx docs _DASHBOARD_IDS = [d.name for d in list(BRIAN_DASHBOARDS)] @@ -434,6 +433,8 @@ def _get_dashboards(interface): yield BRIAN_DASHBOARDS.IAS_CUSTOMER if 'SRV_IAS UPSTREAM' in description: yield BRIAN_DASHBOARDS.IAS_UPSTREAM + if 'SRV_10GGBS CUSTOMER' in description: + yield BRIAN_DASHBOARDS.GBS_10G if re.match('(SRV_GLOBAL|SRV_L3VPN|LAG) RE_INTERCONNECT', description): yield BRIAN_DASHBOARDS.RE_PEER if re.match(r'(PHY|LAG|SRV_GLOBAL) CUSTOMER', description): diff --git a/test/test_general_poller_routes.py b/test/test_general_poller_routes.py index cda06e6b496aeea370a6b90c2f3025b69ce59d07..01e17d43e355a67c24bec94ab878db90f5e4deae 100644 --- a/test/test_general_poller_routes.py +++ b/test/test_general_poller_routes.py @@ -298,7 +298,9 @@ def test_fw_counter_bytes_oid_values(customer, interface_name, expected_oid): ('SRV_L2CIRCUIT CUSTOMER TENET PSNC #lon-lon-GEANTOPEN-PSNC-TENET-18067 |', # noqa: E501 ['GEANTOPEN', 'L2_CIRCUIT']), ('SRV_L3VPN RE_INTERCONNECT REDCLARA #REDCLARA-MAD-COPERNICUS | ASN27750', - ['LHCONE', 'COPERNICUS', 'RE_PEER']) + ['LHCONE', 'COPERNICUS', 'RE_PEER']), + ('SRV_10GGBS CUSTOMER REDIRIS CERN #gen-mad-LHC-CERN-REDIRIS-07003 |', + ['GBS_10G']) ]) def test_interface_dashboard_mapping(description, expected_dashboards): interface = {