Finished release 0.33.

changelog

@@ -48,4 +48,5 @@
 0.30: DBOARD3-173 No service name for critical alarm
 0.31: Added top-level-services to the related services
       Fix canonicalization error of v6 addresses
-0.32: Ensured all Related Services are returned for juniper links
\ No newline at end of file
+0.32: Ensured all Related Services are returned for juniper links
+0.33: Added Related Services for Infinera info
\ No newline at end of file

inventory_provider/routes/classifier.py

@@ -294,11 +294,18 @@ def get_trap_metadata(source_equipment, interface, circuit_id):
         result = result.decode('utf-8')
     else:
         result = {}
+        top_level_services = []
 
         services = r.get(
             'opsdb:interface_services:%s:%s' % (source_equipment, interface))
         if services:
             result['services'] = json.loads(services.decode('utf=8'))
+            for s in result['services']:
+                tls = get_top_level_services(s['id'], r)
+                if tls:
+                    top_level_services.extend(tls)
+            if top_level_services:
+                result['related-services'] = top_level_services
 
         gl = r.get('opsdb:geant_lambdas:%s' % circuit_id.lower())
         if gl:

setup.py

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

test/test_infinera_classifier.py

@@ -81,6 +81,10 @@ INFINERA_LINK_METADATA = {
             "type": "array",
             "items": {"$ref": "#/definitions/service-info"}
         },
+        "related-services": {
+            "type": "array",
+            "items": {"$ref": "#/definitions/service-info"}
+        },
         "geant-lambda": {
             "$ref": "#/definitions/geant-lambda"
         },