From 1eded5c716e9e89f1e566a8df01a5153d31da5a5 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 15 Jan 2020 21:40:37 +0100
Subject: [PATCH] added location to coriant response
---
inventory_provider/routes/classifier.py | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index d56c5c2d..ccff949f 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -412,9 +412,6 @@ def get_coriant_info(equipment_name, entity_string):
equipment_name, entity_string)
result = r.get(cache_key)
- # this is just for development to save deleting the cache every time
- # result = False
-
if result:
result = result.decode('utf-8')
else:
@@ -431,7 +428,8 @@ def get_coriant_info(equipment_name, entity_string):
result = {
'equipment name': equipment_name,
'card id': m.group(1),
- 'port number': m.group(2)
+ 'port number': m.group(2),
+ 'locations': []
}
config = current_app.config['INVENTORY_PROVIDER_CONFIG']
@@ -442,6 +440,18 @@ def get_coriant_info(equipment_name, entity_string):
if path:
result['path'] = path
+ result['locations'] += [{
+ 'a': {
+ 'equipment': path['a']['equipment name'],
+ 'name': path['a']['pop']['name'],
+ 'abbreviation': path['a']['pop']['abbreviation']
+ },
+ 'b': {
+ 'equipment': path['b']['equipment name'],
+ 'name': path['b']['pop']['name'],
+ 'abbreviation': path['b']['pop']['abbreviation']
+ }
+ }]
top_level_services = get_top_level_services(path['id'], r)
if top_level_services:
--
GitLab