From e8f6dd4309199cfea4cc87df251b794e927f448f Mon Sep 17 00:00:00 2001 From: Robert Latta <robert.latta@geant.org> Date: Thu, 17 Jan 2019 10:32:24 +0000 Subject: [PATCH] Added coriant tnms addresses to the config and added route to classifiers for retrieving them --- inventory_provider/config.py | 15 ++++++++++++++- inventory_provider/routes/classifier.py | 8 ++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/inventory_provider/config.py b/inventory_provider/config.py index b84b479f..0f6bc1b3 100644 --- a/inventory_provider/config.py +++ b/inventory_provider/config.py @@ -58,6 +58,18 @@ CONFIG_SCHEMA = { "required": ["name", "address"], "additionalProperties": False } + }, + "coriant-tnms": { + "type": "array", + "items": { + "type": "object", + "properties": { + "name": {"type": "string"}, + "address": {"type": "string"} + }, + "required": ["name", "address"], + "additionalProperties": False + } } }, "required": [ @@ -67,7 +79,8 @@ CONFIG_SCHEMA = { "routers_community.conf", "ssh", "redis", - "infinera-dna"], + "infinera-dna", + "coriant-tnms"], "additionalProperties": False } diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py index 66cc126a..85dcbd77 100644 --- a/inventory_provider/routes/classifier.py +++ b/inventory_provider/routes/classifier.py @@ -36,6 +36,14 @@ def infinera_addresses(): return jsonify([dna['address'] for dna in infinera_config]) +@routes.route("/coriant-tnms-addresses", methods=['GET', 'POST']) +@require_accepts_json +def coriant_addresses(): + coriant_config = current_app.config[ + "INVENTORY_PROVIDER_CONFIG"]["coriant-tnms"] + return jsonify([tnms['address'] for tnms in coriant_config]) + + @routes.route("/juniper-server-addresses", methods=['GET', 'POST']) @require_accepts_json def juniper_addresses(): -- GitLab