From 1a05eb5119024e43542025b333df51ed1eb93c19 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 15 Jan 2020 21:08:32 +0100
Subject: [PATCH] added (service-based only) location data to infinera response
---
inventory_provider/routes/classifier.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index be1349a4..d56c5c2d 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -364,7 +364,9 @@ def get_trap_metadata(source_equipment, interface, circuit_id):
if result:
result = result.decode('utf-8')
else:
- result = {}
+ result = {
+ 'locations': []
+ }
top_level_services = []
services = r.get(
@@ -377,6 +379,8 @@ def get_trap_metadata(source_equipment, interface, circuit_id):
top_level_services.extend(tls)
if top_level_services:
result['related-services'] = top_level_services
+ l = [_location_from_service_dict(s) for s in result['services']]
+ result['locations'] += l
gl = r.get('opsdb:geant_lambdas:%s' % circuit_id.lower())
if gl:
--
GitLab