Finished release 0.125.

Changelog.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.125] - 2024-07-18
+- DBOARD3-971: Added handling for GRV 10G interfaces
+- POL1-836: Included PHY RE_INTERCONNECT in R&E Peer dashboards
+
 ## [0.124] - 2024-07-11
 - DBOARD3-921: GAP/InventoryProvider integration
 - Updated Nokia parsing and tests

inventory_provider/routes/classifier.py

@@ -1013,7 +1013,7 @@ def get_coriant_info(equipment_name: str, entity_string: str) -> Response:
 
     if not result:
 
-        m = re.match(r'^(\d+\-\d+)\.(\d+)', ims_interface)
+        m = re.match(r'^(\d+\-\d+)\.((\d+)(\.\d+)*)', ims_interface)
         if not m:
             logger.error(
                 f'invalid coriant entity string format: {ims_interface}')

inventory_provider/routes/poller.py

@@ -481,7 +481,7 @@ def _get_dashboards(interface):
         yield BRIAN_DASHBOARDS.IAS_UPSTREAM
     if re.match(r'SRV_10GGBS CUSTOMER\s', description):
         yield BRIAN_DASHBOARDS.GBS_10G
-    if re.match(r'(SRV_GLOBAL|SRV_L3VPN|LAG) RE_INTERCONNECT\s', description):
+    if re.match(r'(SRV_GLOBAL|SRV_L3VPN|LAG|PHY) RE_INTERCONNECT\s', description):
         yield BRIAN_DASHBOARDS.RE_PEER
     if re.match(r'(PHY|LAG|SRV_GLOBAL) CUSTOMER\s', description):
         yield BRIAN_DASHBOARDS.RE_CUST

requirements.txt

 click
 mysql-connector
-pysnmp
+pysnmp==4.4.12
 pyasn1==0.4.8
 jsonschema
 paramiko
@@ -24,4 +24,4 @@ sphinx
 sphinx-rtd-theme
 
 # glitchtip/sentry integration
-sentry-sdk[flask,celery]
+sentry-sdk[flask,celery]
\ No newline at end of file

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='inventory-provider',
-    version="0.124",
+    version="0.125",
     author='GEANT',
     author_email='swd@geant.org',
     description='Dashboard inventory provider',
@@ -13,7 +13,7 @@ setup(
         'click',
         'mysql-connector',
         'pyasn1==0.4.8',
-        'pysnmp',
+        'pysnmp==4.4.12',
         'jsonschema',
         'paramiko',
         'flask',

test/test_classifier_routes.py

@@ -121,12 +121,12 @@ def test_peer_not_found(client):
     assert response_data == {'locations': [], "contacts": []}
 
 
-@pytest.mark.parametrize('equipment,entity_name', [
-    ('grv3.ams.nl.geant.net', '1-1.3.1-100GbE-ODU4-TTP1'),
+@pytest.mark.parametrize('equipment,entity_name,expected_card_id,expected_port', [
+    ('grv3.ams.nl.geant.net', '1-3.3.1-Optical-10GbE-TTP', '1/3', '3.1'),
     ('bogus-hostname.with&special.char',
-     '234-2345234.7878i234crazynamewithslash/1-2.3')
+     '234-2345234.7878i234crazynamewithslash/1-2.3', '234/2345234', '7878')
 ])
-def test_coriant_info(client, equipment, entity_name):
+def test_coriant_info(client, equipment, entity_name, expected_card_id, expected_port):
     rv = client.get(
         f'/classifier/coriant-info/{equipment}/{entity_name}',
         headers=DEFAULT_REQUEST_HEADERS)
@@ -134,6 +134,8 @@ def test_coriant_info(client, equipment, entity_name):
     assert rv.is_json
     response_data = json.loads(rv.data.decode('utf-8'))
     jsonschema.validate(response_data, CORIANT_INFO_RESPONSE_SCHEMA)
+    assert response_data['card id'] == expected_card_id
+    assert response_data['port number'] == expected_port
 
 
 def test_coriant_info_not_found(client):