Skip to content
Snippets Groups Projects
Commit 11b1841f authored by Erik Reid's avatar Erik Reid
Browse files

refactor how schema defs are written

parent eb389b77
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/test_classifier_routes.py
+ 212
− 206
View file @ 11b1841f
...@@ -8,129 +8,139 @@ DEFAULT_REQUEST_HEADERS = { ...@@ -8,129 +8,139 @@ DEFAULT_REQUEST_HEADERS = {
"Accept": ["application/json"] "Accept": ["application/json"]
} }
LOCATION_END_DEFINITION = { LOCATIONS_DEFINITIONS = {
"type": "object", "location-endpoint": {
"properties": { "type": "object",
"equipment": {"type": "string"}, "properties": {
"name": {"type": "string"}, "equipment": {"type": "string"},
"abbreviation": {"type": "string"} "name": {"type": "string"},
"abbreviation": {"type": "string"}
},
"required": ["equipment", "name", "abbreviation"],
"additionalProperties": False
}, },
"required": ["equipment", "name", "abbreviation"], "location": {
"additionalProperties": False "type": "object",
"properties": {
"a": {"$ref": "#/definitions/location-endpoint"},
"b": {"$ref": "#/definitions/location-endpoint"}
},
"required": ["a"],
"additionalProperties": False
},
"locations-list": {
"type": "array",
"items": {"$ref": "#/definitions/location"}
}
} }
LOCATION_DEFINITION = {
"type": "object", JUNIPER_LINK_METADATA_DEFINITIONS = {
"properties": { "ip-address": {
"a": LOCATION_END_DEFINITION, "type": "string",
"b": LOCATION_END_DEFINITION "oneOf": [
{"pattern": r'^(\d+\.){3}\d+$'},
{"pattern": r'^([a-f\d]{4}:){7}[a-f\d]{4}$'}
]
}, },
"required": ["a"], "ipv4-interface-address": {
"additionalProperties": False "type": "string",
"pattern": r'^(\d+\.){3}\d+/\d+$'
},
"ipv6-interface-address": {
"type": "string",
"pattern": r'^[a-f\d:]+/\d+$'
},
"interface-info": {
"type": "object",
"properties": {
"name": {"type": "string"},
"description": {"type": "string"},
"ipv4": {
"type": "array",
"items": {"$ref": "#/definitions/ipv4-interface-address"}
},
"ipv6": {
"type": "array",
"items": {"$ref": "#/definitions/ipv6-interface-address"}
},
# TODO: check what's changed: added to make tests pass
'bundle': {"type": "array"}
},
"required": ["name", "description", "ipv4", "ipv6"],
"additionalProperties": False
},
"service-info": {
"type": "object",
"properties": {
"id": {"type": "integer"},
"name": {"type": "string"},
"status": {
"type": "string",
"enum": ["operational", "installed", "planned", "ordered"]
},
"circuit_type": {
"type": "string",
"enum": ["path", "service", "l2circuit"]
},
"service_type": {"type": "string"},
"project": {"type": "string"},
"equipment": {"type": "string"},
"pop": {"type": "string"},
"pop_abbreviation": {"type": "string"},
"other_end_pop": {"type": "string"},
"other_end_pop_abbreviation": {"type": "string"},
"other_end_equipment": {"type": "string"},
"port": {"type": "string"},
"other_end_port": {"type": "string"},
"logical_unit": {
"oneOf": [
{"type": "integer"},
{"type": "string", "maxLength": 0}
]
},
"other_end_logical_unit": {
"oneOf": [
{"type": "integer"},
{"type": "string", "maxLength": 0}
]
},
"manufacturer": {
"type": "string",
"enum": ["juniper", "coriant", "infinera",
"cisco", "hewlett packard",
"corsa", "graham smith uk ltd",
"unknown", ""]
},
"card_id": {"type": "string"},
"other_end_card_id": {"type": "string"},
"interface_name": {"type": "string"},
"other_end_interface_name": {"type": "string"},
# TODO: check what's changed: added to make tests pass
'other_end_pop_name': {"type": "string"},
'pop_name': {"type": "string"}
},
# TODO: modify service-info so that "" entries are just omitted
# (... rather than requiring 'oneOf')
# TODO: put 'other_end_*' params in a sub dictionary
# "required": [
# "id", "name", "status",
# "circuit_type", "service_type",
# "project", "port", "manufacturer",
# "equipment", "logical_unit", "card_id", "interface_name"
# ],
"additionalProperties": False
}
} }
JUNIPER_LINK_METADATA = { JUNIPER_LINK_METADATA = {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"type": "object", "type": "object",
"definitions": { "definitions": {
"location": LOCATION_DEFINITION, **JUNIPER_LINK_METADATA_DEFINITIONS, **LOCATIONS_DEFINITIONS
"ip-address": {
"type": "string",
"oneOf": [
{"pattern": r'^(\d+\.){3}\d+$'},
{"pattern": r'^([a-f\d]{4}:){7}[a-f\d]{4}$'}
]
},
"ipv4-interface-address": {
"type": "string",
"pattern": r'^(\d+\.){3}\d+/\d+$'
},
"ipv6-interface-address": {
"type": "string",
"pattern": r'^[a-f\d:]+/\d+$'
},
"interface-info": {
"type": "object",
"properties": {
"name": {"type": "string"},
"description": {"type": "string"},
"ipv4": {
"type": "array",
"items": {"$ref": "#/definitions/ipv4-interface-address"}
},
"ipv6": {
"type": "array",
"items": {"$ref": "#/definitions/ipv6-interface-address"}
},
# TODO: check what's changed: added to make tests pass
'bundle': {"type": "array"}
},
"required": ["name", "description", "ipv4", "ipv6"],
"additionalProperties": False
},
"service-info": {
"type": "object",
"properties": {
"id": {"type": "integer"},
"name": {"type": "string"},
"status": {
"type": "string",
"enum": ["operational", "installed", "planned", "ordered"]
},
"circuit_type": {
"type": "string",
"enum": ["path", "service", "l2circuit"]
},
"service_type": {"type": "string"},
"project": {"type": "string"},
"equipment": {"type": "string"},
"pop": {"type": "string"},
"pop_abbreviation": {"type": "string"},
"other_end_pop": {"type": "string"},
"other_end_pop_abbreviation": {"type": "string"},
"other_end_equipment": {"type": "string"},
"port": {"type": "string"},
"other_end_port": {"type": "string"},
"logical_unit": {
"oneOf": [
{"type": "integer"},
{"type": "string", "maxLength": 0}
]
},
"other_end_logical_unit": {
"oneOf": [
{"type": "integer"},
{"type": "string", "maxLength": 0}
]
},
"manufacturer": {
"type": "string",
"enum": ["juniper", "coriant", "infinera",
"cisco", "hewlett packard",
"corsa", "graham smith uk ltd",
"unknown", ""]
},
"card_id": {"type": "string"},
"other_end_card_id": {"type": "string"},
"interface_name": {"type": "string"},
"other_end_interface_name": {"type": "string"},
# TODO: check what's changed: added to make tests pass
'other_end_pop_name': {"type": "string"},
'pop_name': {"type": "string"}
},
# TODO: modify service-info so that "" entries are just omitted
# (... rather than requiring 'oneOf')
# TODO: put 'other_end_*' params in a sub dictionary
# "required": [
# "id", "name", "status",
# "circuit_type", "service_type",
# "project", "port", "manufacturer",
# "equipment", "logical_unit", "card_id", "interface_name"
# ],
"additionalProperties": False
}
}, },
"type": "object", "type": "object",
...@@ -144,10 +154,7 @@ JUNIPER_LINK_METADATA = { ...@@ -144,10 +154,7 @@ JUNIPER_LINK_METADATA = {
"type": "array", "type": "array",
"items": {"$ref": "#/definitions/service-info"} "items": {"$ref": "#/definitions/service-info"}
}, },
"locations": { "locations": {"$ref": "#/definitions/locations-list"}
"type": "array",
"items": {"$ref": "#/definitions/location"}
}
}, },
# "required": ["interface"], # "required": ["interface"],
"additionalProperties": False "additionalProperties": False
...@@ -203,96 +210,98 @@ IX_PUBLIC_PEER_INFO_KEYS = {'ix-public-peer-info', 'interfaces', 'locations'} ...@@ -203,96 +210,98 @@ IX_PUBLIC_PEER_INFO_KEYS = {'ix-public-peer-info', 'interfaces', 'locations'}
) )
def test_peer_info( def test_peer_info(
client, peer_address, expected_response_keys): client, peer_address, expected_response_keys):
response_schema = { response_schema_definitions = {
"$schema": "http://json-schema.org/draft-07/schema#", "ip-address": {
"type": "object", "type": "string",
"oneOf": [
"definitions": { {"pattern": r'^(\d+\.){3}\d+$'},
"location": LOCATION_DEFINITION, {"pattern": r'^([a-f\d]{4}:){7}[a-f\d]{4}$'}
"ip-address": { ]
"type": "string", },
"oneOf": [ "interface-address": {
{"pattern": r'^(\d+\.){3}\d+$'}, "type": "string",
{"pattern": r'^([a-f\d]{4}:){7}[a-f\d]{4}$'} "oneOf": [
] {"pattern": r'^(\d+\.){3}\d+/\d+$'},
}, {"pattern": r'^[a-f\d:]+/\d+$'}
"interface-address": { ]
"type": "string", },
"oneOf": [ "vpn-rr-peer": {
{"pattern": r'^(\d+\.){3}\d+/\d+$'}, "type": "object",
{"pattern": r'^[a-f\d:]+/\d+$'} "properties": {
] "name": {"$ref": "#/definitions/ip-address"},
}, "description": {"type": "string"},
"vpn-rr-peer": { "peer-as": {"type": "integer"},
"type": "object", "router": {"type": "string"}
"properties": {
"name": {"$ref": "#/definitions/ip-address"},
"description": {"type": "string"},
"peer-as": {"type": "integer"},
"router": {"type": "string"}
},
"required": ["name", "description"],
"additionalProperties": False
},
"ix-public-peer": {
"type": "object",
"properties": {
"name": {"$ref": "#/definitions/ip-address"},
"description": {"type": "string"},
"router": {"type": "string"},
"as": {
"type": "object",
"properties": {
"local": {"type": "integer"},
"peer": {"type": "integer"},
},
"required": ["local", "peer"],
"additionalProperties": False
}
},
"required": ["name", "description", "as"],
"additionalProperties": False
},
"ix-public-peer-list": {
"type": "array",
"items": {"$ref": "#/definitions/ip-address"}
}, },
"ix-public-peer-info": { "required": ["name", "description"],
"type": "object", "additionalProperties": False
"properties": { },
"peer": {"$ref": "#/definitions/ix-public-peer"}, "ix-public-peer": {
"group": {"$ref": "#/definitions/ix-public-peer-list"}, "type": "object",
"router": {"$ref": "#/definitions/ix-public-peer-list"} "properties": {
}, "name": {"$ref": "#/definitions/ip-address"},
"required": ["peer", "group", "router"], "description": {"type": "string"},
"additionalProperties": False "router": {"type": "string"},
"as": {
"type": "object",
"properties": {
"local": {"type": "integer"},
"peer": {"type": "integer"},
},
"required": ["local", "peer"],
"additionalProperties": False
}
}, },
"interface-info": { "required": ["name", "description", "as"],
"type": "object", "additionalProperties": False
"properties": { },
"name": {"$ref": "#/definitions/ip-address"}, "ix-public-peer-list": {
"interface address": { "type": "array",
"$ref": "#/definitions/interface-address"}, "items": {"$ref": "#/definitions/ip-address"}
"interface name": {"type": "string"}, },
"router": {"type": "string"} "ix-public-peer-info": {
}, "type": "object",
"required": [ "properties": {
"name", "interface address", "interface name", "router"], "peer": {"$ref": "#/definitions/ix-public-peer"},
"additionalProperties": False "group": {"$ref": "#/definitions/ix-public-peer-list"},
"router": {"$ref": "#/definitions/ix-public-peer-list"}
}, },
"service-info": { "required": ["peer", "group", "router"],
"type": "object" "additionalProperties": False
},
"interface-info": {
"type": "object",
"properties": {
"name": {"$ref": "#/definitions/ip-address"},
"interface address": {
"$ref": "#/definitions/interface-address"},
"interface name": {"type": "string"},
"router": {"type": "string"}
}, },
"interface-lookup-info": { "required": [
"type": "object", "name", "interface address", "interface name", "router"],
"properties": { "additionalProperties": False
"interface": {"$ref": "#/definitions/interface-info"}, },
"services": { "service-info": {
"type": "array", "type": "object"
"items": {"$ref": "#/definitions/service-info"} },
} "interface-lookup-info": {
"type": "object",
"properties": {
"interface": {"$ref": "#/definitions/interface-info"},
"services": {
"type": "array",
"items": {"$ref": "#/definitions/service-info"}
} }
} }
}
}
response_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"definitions": {
**response_schema_definitions, **LOCATIONS_DEFINITIONS
}, },
"type": "object", "type": "object",
...@@ -304,10 +313,7 @@ def test_peer_info( ...@@ -304,10 +313,7 @@ def test_peer_info(
"type": "array", "type": "array",
"items": {"$ref": "#/definitions/interface-lookup-info"} "items": {"$ref": "#/definitions/interface-lookup-info"}
}, },
"locations": { "locations": {"$ref": "#/definitions/locations-list"}
"type": "array",
"items": {"$ref": "#/definitions/location"}
}
}, },
"additionalProperties": False "additionalProperties": False
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment