Finished release 0.82.

Changelog.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.82] - 2022-02-24
+- POL1-487: Made filtering for COPERNICUS dashboard more specific
+- POL1-560: Added GBS_10G dashboard tag for circuits related to 10G Guaranteed Bandwidth Service
+
 ## [0.81] - 2022-02-17
 - POL1-521: handle RPC timeout error properly, and log errors 
 

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)]
@@ -418,7 +417,7 @@ def _get_dashboards(interface):
     router = interface.get('router', '').lower()
     ifc_name = interface.get('name', '')
     description = interface.get('description', '').strip()
-    if re.search(r'COPERNICUS.*?\|', description, flags=re.IGNORECASE):
+    if 'SRV_L3VPN' in description and 'COPERNICUS' in description:
         yield BRIAN_DASHBOARDS.COPERNICUS
     if 'SRV_CLS' in description:
         yield BRIAN_DASHBOARDS.CLS
@@ -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):

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='inventory-provider',
-    version="0.81",
+    version="0.82",
     author='GEANT',
     author_email='swd@geant.org',
     description='Dashboard inventory provider',

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 = {