Finished release 0.118.

Changelog.md

@@ -2,8 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.118] - 2024-04-17
+- POL1-803: Add dashboard tag for ANA graphs
+
 ## [0.117] - 2024-04-16
 - adding monitored id check for third party
+- POL1-704: Only tag ae12 subinterfaces for CAE-1 and IC-1 aggregate dashboards
 
 ## [0.116] - 2024-04-15
 - adding noc and planned noc details for third party circuit
@@ -15,7 +19,7 @@ All notable changes to this project will be documented in this file.
 - adding new api for mic third party
 - additional search for hostname in IMS cache
 - rewrote _load_interfaces to not parse the entire netconf docs
-- POL1-0703: add support for IC1 dashboard 
+- POL1-0703: add support for IC1 dashboard
 - DBOARD3-894 : Extract and persist interface-host information
 - DBOARD3-888 : Add netconf retrieval
 - added link-info and nokia-link-info routes
@@ -89,7 +93,7 @@ All notable changes to this project will be documented in this file.
 - DBOARD3-669: Only add contacts from Related Services
 
 ## [0.94] - 2022-09-06
-- DBOARD3-664: Added Planned Work email addresses to related-services 
+- DBOARD3-664: Added Planned Work email addresses to related-services
 
 ## [0.93] - 2022-09-05
 - POL1-533: Changed services api to include services with SIDs defined on ports
@@ -137,7 +141,7 @@ All notable changes to this project will be documented in this file.
 - 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 
+- POL1-521: handle RPC timeout error properly, and log errors
 
 ## [0.80] - 2022-02-16
 - POL1-487: Adjusted filtering for COPERNICUS dashboard (no longer overrides customer names)

inventory_provider/routes/poller.py

@@ -126,6 +126,7 @@ class BRIAN_DASHBOARDS(Enum):
     CAE1 = auto()
     IC1 = auto()
     COPERNICUS = auto()
+    ANA = auto()
 
     # NREN customer
     NREN = auto()
@@ -514,6 +515,8 @@ def _get_dashboards(interface):
     regex = r'(PHY|LAG|(SRV_(GLOBAL|LHCONE|MDVPN|IAS|CLS|L3VPN))) CUSTOMER\s'
     if re.match(regex, description):
         yield BRIAN_DASHBOARDS.NREN
+    if "GA-" in description and "ANA-" in description:
+        yield BRIAN_DASHBOARDS.ANA
 
 
 def _get_dashboard_data(ifc, customers):

setup.py

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

test/test_general_poller_routes.py

@@ -333,6 +333,26 @@ def test_ae12_aggregate_dashboards(router, interface, exp_dashboards):
     assert [d.name for d in dashboards] == exp_dashboards
 
 
+@pytest.mark.parametrize(
+    "description, has_ana",
+    [
+        ("PHY GA-1 ANA-100", True),
+        ("PHY ANA-100", False),
+        ("PHY GA-1", False),
+        ("PHY", False),
+    ],
+)
+def test_ana_aggregate_dashboard(description, has_ana):
+    interface = {
+        "router": "some.router",
+        "name": "ifc-1",
+        "description": description,
+    }
+    dashboards = poller._get_dashboards(interface)
+    expected = ["ANA"] if has_ana else []
+    assert [d.name for d in dashboards] == expected
+
+
 @pytest.mark.parametrize('interface,customers,dashboard_info', [
     ({
         'description': 'SRV_IAS CUSTOMER JISC #JISC-AP1-IAS IASPS | ASN786',