Skip to content
Snippets Groups Projects
Commit 9335d3fb authored by Robert Latta's avatar Robert Latta
Browse files

Merge branch 'feature/add-coriant-tnms-config' into develop

parents 9c382d79 d03f2407
No related branches found
No related tags found
No related merge requests found
...@@ -58,6 +58,18 @@ CONFIG_SCHEMA = { ...@@ -58,6 +58,18 @@ CONFIG_SCHEMA = {
"required": ["name", "address"], "required": ["name", "address"],
"additionalProperties": False "additionalProperties": False
} }
},
"coriant-tnms": {
"type": "array",
"items": {
"type": "object",
"properties": {
"name": {"type": "string"},
"address": {"type": "string"}
},
"required": ["name", "address"],
"additionalProperties": False
}
} }
}, },
"required": [ "required": [
...@@ -67,7 +79,8 @@ CONFIG_SCHEMA = { ...@@ -67,7 +79,8 @@ CONFIG_SCHEMA = {
"routers_community.conf", "routers_community.conf",
"ssh", "ssh",
"redis", "redis",
"infinera-dna"], "infinera-dna",
"coriant-tnms"],
"additionalProperties": False "additionalProperties": False
} }
......
...@@ -36,6 +36,14 @@ def infinera_addresses(): ...@@ -36,6 +36,14 @@ def infinera_addresses():
return jsonify([dna['address'] for dna in infinera_config]) 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']) @routes.route("/juniper-server-addresses", methods=['GET', 'POST'])
@require_accepts_json @require_accepts_json
def juniper_addresses(): def juniper_addresses():
......
...@@ -47,6 +47,11 @@ def data_config_filename(tmp_dir_name): ...@@ -47,6 +47,11 @@ def data_config_filename(tmp_dir_name):
{"name": "name1", "address": "123.456.789.0"}, {"name": "name1", "address": "123.456.789.0"},
{"name": "name2", "address": "012.345.678.9"}, {"name": "name2", "address": "012.345.678.9"},
{"name": "name3", "address": "111.222.333.000"} {"name": "name3", "address": "111.222.333.000"}
],
"coriant-tnms": [
{"name": "name1", "address": "123.456.789.0"},
{"name": "name2", "address": "012.345.678.9"},
{"name": "name3", "address": "111.222.333.000"}
] ]
} }
......
...@@ -23,6 +23,22 @@ def test_infinera_addresses(client): ...@@ -23,6 +23,22 @@ def test_infinera_addresses(client):
response_schema) response_schema)
def test_coriant_addresses(client):
response_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "array",
"items": {"type": "string"}
}
rv = client.post(
"/classifier/coriant-tnms-addresses",
headers=DEFAULT_REQUEST_HEADERS)
assert rv.status_code == 200
jsonschema.validate(
json.loads(rv.data.decode("utf-8")),
response_schema)
def test_juniper_addresses(mocker, client): def test_juniper_addresses(mocker, client):
test_data = [ test_data = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment