diff --git a/README.md b/README.md index 4e85d1f04d4cb93e9acbf4121d9c44d404526d70..f8953e5866cf2264c3752120a11a6791314aec5c 100644 --- a/README.md +++ b/README.md @@ -595,10 +595,12 @@ Any non-empty responses are JSON formatted messages. "circuit": { "type": "object", "properties": { + "name": {"type": "string"}, + "status": {"type": "string"}, "type": {"type": "string"}, "id": {"type": "integer"} }, - "required": ["type", "id"], + "required": ["name", "status", "type", "id"], "additionalProperties": False } }, diff --git a/inventory_provider/routes/poller.py b/inventory_provider/routes/poller.py index 3fe2b94bb39b0627f8717eb657a927241d609257..d644272fde99d988c445e0604eb6e1105c3d15ab 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 07450bfe964a135fb51f86883f52060bbbceced7..be5ce39c49d8f2cd9c9c44cebaf9cba6459a945c 100644 --- a/test/per_router/test_poller_routes.py +++ b/test/per_router/test_poller_routes.py @@ -16,10 +16,12 @@ 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"} }, - "required": ["type", "id"], + "required": ["name", "status", "type", "id"], "additionalProperties": False } },