Finished release 0.88.

Changelog.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.88] - 2022-06-22
+- DBOARD3-596: Only include contacts with populated mail value
+- LG-46: Showing 'in-service' routers only
+
 ## [0.87] - 2022-06-15
 - POL1-526: added bgp all peerings endpoint for msr
 - POL1-526: return list of BRIAN dashboard info (one for each customer)

inventory_provider/db/ims_data.py

@@ -111,13 +111,13 @@ def get_customer_service_emails(ds: IMS):
     customer_contacts = defaultdict(set)
     for x in ds.get_filtered_entities(
         'customerrelatedcontact',
-        "contact.plannedworkmail != ''",
+        "contact.plannedworkmail != '' | contact.mail != ''",
         CUSTOMER_RELATED_CONTACT_PROPERTIES['Contact']
     ):
         customer_contacts[x['customerid']].add(x['contact']['mail'])
     for x in ds.get_filtered_entities(
         'customerrelatedcontact',
-        "contact.troubleticketMail != ''",
+        "contact.troubleticketMail != '' | contact.mail != ''",
         CUSTOMER_RELATED_CONTACT_PROPERTIES['Contact']
     ):
         customer_contacts[x['customerid']].add(x['contact']['mail'])
@@ -437,7 +437,9 @@ def lookup_lg_routers(ds: IMS):
     pattern = re.compile("vpn-proxy|vrr|taas", re.IGNORECASE)
 
     def _matching_node(node_):
-        if InventoryStatus(node_['inventorystatusid']) in STATUSES_TO_IGNORE:
+        # [LG-46]
+        if InventoryStatus(node_['inventorystatusid']) \
+                != InventoryStatus.IN_SERVICE:
             return False
 
         if pattern.match(node_['name']):
@@ -462,7 +464,8 @@ def lookup_lg_routers(ds: IMS):
         for node in nodes:
             if not _matching_node(node):
                 continue
-            if node['inventorystatusid'] in STATUSES_TO_IGNORE:
+            # [LG - 46]
+            if node['inventorystatusid'] != InventoryStatus.IN_SERVICE.value:
                 continue
 
             site = ds.get_entity_by_id('Site', node['siteid'], site_nav_props,

setup.py

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

test/test_ims_data.py

@@ -266,8 +266,8 @@ def test_lookup_lg_routers(mocker):
         'Name like MX',
         inventory_provider.db.ims.EQUIP_DEF_PROPERTIES['Nodes'])
 
-    assert ds.get_entity_by_id.call_count == 36
-    assert len(res) == 36
+    assert ds.get_entity_by_id.call_count == 35
+    assert len(res) == 35
 
     pop = {
         'name': 'pop name',