From e95b33fd1dcaba43490cecccf9d4033af8546a3e Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Wed, 17 Jul 2019 13:56:54 +0000
Subject: [PATCH] Corrected SQL to include extra services
---
inventory_provider/db/opsdb.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/inventory_provider/db/opsdb.py b/inventory_provider/db/opsdb.py
index 092d3486..f70ab307 100644
--- a/inventory_provider/db/opsdb.py
+++ b/inventory_provider/db/opsdb.py
@@ -109,15 +109,15 @@ retrieve_services_query = """SELECT *
ON pop_a.absid = cc.PTR_pop_a
LEFT JOIN pop pop_b
ON pop_b.absid = cc.PTR_pop_b
- INNER JOIN equipment e_a
+ LEFT JOIN equipment e_a
ON e_a.absid = cc.PTR_equip_a
- LEFT JOIN equipment e_b
+ INNER JOIN equipment e_b
ON e_b.absid = cc.PTR_equip_b
LEFT JOIN events
ON events.absid = cc.PTR_project
- INNER JOIN equipment_card ec_a
+ LEFT JOIN equipment_card ec_a
ON ec_a.absid = cc.PTR_card_a
- LEFT JOIN equipment_card ec_b
+ INNER JOIN equipment_card ec_b
ON ec_b.absid = cc.PTR_card_b
LEFT JOIN organisation o
ON o.absid = ec_a.manufacturer
--
GitLab