whitespace

inventory_provider/db/opsdb.py

@@ -127,37 +127,24 @@ FROM (SELECT
   LOWER(o.name) AS manufacturer,
   LOWER(ec_a.card_id) AS card_id,
   LOWER(ec_b.card_id) AS other_end_card_id,
-  LOWER(
-    IF(pp_a.interface_name IS NULL,
-    '', pp_a.interface_name)) AS interface_name,
-  LOWER(
-    IF(pp_b.interface_name IS NULL,
-    '', pp_b.interface_name)) AS other_end_interface_name
+  LOWER(IF(pp_a.interface_name IS NULL, '', pp_a.interface_name))
+    AS interface_name,
+  LOWER(IF(pp_b.interface_name IS NULL, '', pp_b.interface_name))
+    AS other_end_interface_name
 FROM circuit c
-  INNER JOIN circuit_connections cc
-    ON cc.circ_absid = c.absid
-  LEFT JOIN pop pop_a
-    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
-    ON e_a.absid = cc.PTR_equip_a
-  LEFT 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
-    ON ec_a.absid = cc.PTR_card_a
-  LEFT JOIN equipment_card ec_b
-    ON ec_b.absid = cc.PTR_card_b
-  LEFT JOIN organisation o
-    ON o.absid = ec_a.manufacturer
+  INNER JOIN circuit_connections cc ON cc.circ_absid = c.absid
+  LEFT JOIN pop pop_a 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 ON e_a.absid = cc.PTR_equip_a
+  LEFT 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 ON ec_a.absid = cc.PTR_card_a
+  LEFT JOIN equipment_card ec_b ON ec_b.absid = cc.PTR_card_b
+  LEFT JOIN organisation o ON o.absid = ec_a.manufacturer
   LEFT JOIN port_plugin pp_a
-    ON pp_a.PTR_card = cc.PTR_card_a
-     AND pp_a.port = cc.port_a
+    ON pp_a.PTR_card = cc.PTR_card_a AND pp_a.port = cc.port_a
   LEFT JOIN port_plugin pp_b
-    ON pp_b.PTR_card = cc.PTR_card_b
-     AND pp_b.port = cc.port_b
+    ON pp_b.PTR_card = cc.PTR_card_b AND pp_b.port = cc.port_b
 WHERE c.status != 'terminated' AND is_circuit = 1
 UNION
 SELECT
@@ -180,37 +167,24 @@ SELECT
   LOWER(o.name) AS manufacturer,
   LOWER(ec_b.card_id) AS card_id,
   LOWER(ec_a.card_id) AS other_end_card_id,
-  LOWER(
-    IF(pp_b.interface_name IS NULL,
-    '', pp_b.interface_name)) AS interface_name,
-  LOWER(
-    IF(pp_a.interface_name IS NULL,
-    '', pp_a.interface_name)) AS other_end_interface_name
+  LOWER(IF(pp_b.interface_name IS NULL, '', pp_b.interface_name))
+    AS interface_name,
+  LOWER(IF(pp_a.interface_name IS NULL, '', pp_a.interface_name))
+    AS other_end_interface_name
 FROM circuit c
-  INNER JOIN circuit_connections cc
-    ON cc.circ_absid = c.absid
-  LEFT JOIN pop pop_a
-    ON pop_a.absid = cc.PTR_pop_a
-  LEFT JOIN pop pop_b
-    ON pop_b.absid = cc.PTR_pop_b
-  LEFT JOIN equipment e_a
-    ON e_a.absid = cc.PTR_equip_a
-  INNER JOIN equipment e_b
-    ON e_b.absid = cc.PTR_equip_b
-  LEFT JOIN events
-    ON events.absid = cc.PTR_project
-  LEFT JOIN equipment_card ec_a
-    ON ec_a.absid = cc.PTR_card_a
-  INNER JOIN equipment_card ec_b
-    ON ec_b.absid = cc.PTR_card_b
-  LEFT JOIN organisation o
-    ON o.absid = ec_b.manufacturer
+  INNER JOIN circuit_connections cc ON cc.circ_absid = c.absid
+  LEFT JOIN pop pop_a ON pop_a.absid = cc.PTR_pop_a
+  LEFT JOIN pop pop_b ON pop_b.absid = cc.PTR_pop_b
+  LEFT JOIN equipment e_a ON e_a.absid = cc.PTR_equip_a
+  INNER JOIN equipment e_b ON e_b.absid = cc.PTR_equip_b
+  LEFT JOIN events ON events.absid = cc.PTR_project
+  LEFT JOIN equipment_card ec_a ON ec_a.absid = cc.PTR_card_a
+  INNER JOIN equipment_card ec_b ON ec_b.absid = cc.PTR_card_b
+  LEFT JOIN organisation o ON o.absid = ec_b.manufacturer
   LEFT JOIN port_plugin pp_a
-    ON pp_a.PTR_card = cc.PTR_card_a
-     AND pp_a.port = cc.port_a
+    ON pp_a.PTR_card = cc.PTR_card_a AND pp_a.port = cc.port_a
   LEFT JOIN port_plugin pp_b
-    ON pp_b.PTR_card = cc.PTR_card_b
-     AND pp_b.port = cc.port_b
+    ON pp_b.PTR_card = cc.PTR_card_b AND pp_b.port = cc.port_b
 WHERE c.status != 'terminated' AND is_circuit = 1)
 AS inner_query
 WHERE
@@ -535,7 +509,6 @@ def get_service_users(connection, service_ids):
                 yield {'service_id': r[0], 'user': r[1]}
 
 
-
 if __name__ == '__main__':
 
     from inventory_provider.db import db