added project to circuits in circuit_hierarchy info

inventory_provider/db/opsdb.py

 from inventory_provider.db import db
 
 geant_lambda_sql = """SELECT
-                      absid AS id,
-                      name,
-                      LOWER(status) AS status
-                    FROM circuit
+                      c.absid AS id,
+                      c.name as name,
+                      LOWER(c.status) AS status,
+                      p.short_descr as project
+                    FROM vcircuitconns c
+                    left join events p
+                    on p.absid = c.PTR_project
                     WHERE
-                    status != 'terminated'
-                    AND service_type = 'geant lambda'"""
+                    c.status != 'terminated'
+                    AND c.service_type = 'geant lambda'"""
 
 circuit_hierarchy_query = """SELECT
                        pc.name AS parent_circuit,
                        pc.absid AS parent_circuit_id,
                        pc.circuit_type AS parent_circuit_type,
                        LOWER(pc.status) AS parent_circuit_status,
+                       pp.short_descr AS parent_project,
                        cc.name AS child_circuit,
                        cc.absid AS child_circuit_id,
                        cc.circuit_type AS child_circuit_type,
                        LOWER(cc.status) AS child_circuit_status,
+                       cp.short_descr AS child_project,
                        cg.segment_group AS segment_group
                      FROM circuit_glue cg
-                     INNER JOIN circuit pc ON pc.absid = cg.PTR_circuit
-                     INNER JOIN circuit cc ON cc.absid = cg.PTR_component"""
+                     INNER JOIN vcircuitconns pc ON pc.absid = cg.PTR_circuit
+                     INNER JOIN vcircuitconns cc ON cc.absid = cg.PTR_component
+                     LEFT JOIN events pp on pp.absid = pc.PTR_project
+                     LEFT JOIN events cp on cp.absid = cc.PTR_project"""
 
 
 retrieve_services_query = """SELECT *

inventory_provider/routes/classifier.py

@@ -66,7 +66,9 @@ def get_top_level_services(circuit_id, r):
                 tls.append(
                     {'name': c['parent_circuit'],
                      'status': c['parent_circuit_status'],
-                     'circuit_type': c['parent_circuit_type'].lower()})
+                     'circuit_type': c['parent_circuit_type'].lower(),
+                     'project': c['parent_project']
+                     })
             tls.extend(temp_parents)
     return tls