From 5fd2eaba7faec9a6888bdbd9ae311c9627efb383 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Tue, 19 Mar 2019 11:54:40 +0100
Subject: [PATCH] added service status and name to poller response
---
inventory_provider/routes/poller.py | 9 ++++++---
test/per_router/test_poller_routes.py | 2 ++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py
index 3fe2b94b..d644272f 100644
--- a/inventory_provider/routes/poller.py
+++ b/inventory_provider/routes/poller.py
@@ -68,9 +68,12 @@ def poller_interface_oids(hostname):
'opsdb:interface_services:%s:%s' % (hostname, ifc['name']))
if circuits:
ifc_data['circuits'] = [
- {'type': c['circuit_type'], 'id': c['id']}
- for c in json.loads(circuits.decode('utf-8'))
-
+ {
+ 'id': c['id'],
+ 'name': c['name'],
+ 'type': c['service_type'],
+ 'status': c['status']
+ } for c in json.loads(circuits.decode('utf-8'))
]
result.append(ifc_data)
diff --git a/test/per_router/test_poller_routes.py b/test/per_router/test_poller_routes.py
index 07450bfe..9b6fcd59 100644
--- a/test/per_router/test_poller_routes.py
+++ b/test/per_router/test_poller_routes.py
@@ -16,6 +16,8 @@ def test_router_interfaces(router, client_with_mocked_data):
"circuit": {
"type": "object",
"properties": {
+ "name": {"type": "string"},
+ "status": {"type": "string"},
"type": {"type": "string"},
"id": {"type": "integer"}
},
--
GitLab