From 576444b8c29b2c7679a3ee0c2d758247854e02a9 Mon Sep 17 00:00:00 2001 From: Robert Latta <robert.latta@geant.org> Date: Mon, 21 Oct 2019 10:23:55 +0000 Subject: [PATCH] added parent and child circuit types to circuit_hierachy_query; added circuit absid to coriant path response --- inventory_provider/db/opsdb.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventory_provider/db/opsdb.py b/inventory_provider/db/opsdb.py index 548cadc6..5e6466ba 100644 --- a/inventory_provider/db/opsdb.py +++ b/inventory_provider/db/opsdb.py @@ -12,9 +12,11 @@ geant_lambda_sql = """SELECT 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, 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, cg.segment_group AS segment_group FROM circuit_glue cg @@ -350,6 +352,7 @@ SELECT } return { + 'id': row['absid'], 'category': row['category'], 'circuit_type': row['circuit_type'], 'service_type': row['service_type'], -- GitLab