projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow extra domain input for token authentication
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
56a2018
..
e40d0ec
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-265,9
+265,12
@@
ns_instantiate = {
"nsdId": id_schema,
"vimAccountId": id_schema,
"wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
"nsdId": id_schema,
"vimAccountId": id_schema,
"wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
+ "placement-engine": string_schema,
+ "placement-constraints": object_schema,
"additionalParamsForNs": object_schema,
"additionalParamsForVnf": additional_params_for_vnf,
"ssh_keys": {"type": "array", "items": {"type": "string"}},
"additionalParamsForNs": object_schema,
"additionalParamsForVnf": additional_params_for_vnf,
"ssh_keys": {"type": "array", "items": {"type": "string"}},
+ "timeout_ns_deploy": integer1_schema,
"nsr_id": id_schema,
"vduImage": name_schema,
"vnf": {
"nsr_id": id_schema,
"vduImage": name_schema,
"vnf": {
@@
-434,7
+437,7
@@
vim_account_new_schema = {
"additionalProperties": False
}
"additionalProperties": False
}
-wim_type = shortname_schema # {"enum": ["
tapi
", "onos", "odl", "dynpac", "fake"]}
+wim_type = shortname_schema # {"enum": ["
ietfl2vpn
", "onos", "odl", "dynpac", "fake"]}
wim_account_edit_schema = {
"title": "wim_account edit input schema",
wim_account_edit_schema = {
"title": "wim_account edit input schema",
@@
-480,21
+483,24
@@
wim_account_new_schema = {
sdn_properties = {
"name": name_schema,
sdn_properties = {
"name": name_schema,
+ "type": {"type": "string"},
+ "url": {"type": "string"},
+ "user": shortname_schema,
+ "password": passwd_schema,
+ "config": {"type": "object"},
"description": description_schema,
"description": description_schema,
+ # The folowing are deprecated. Maintanied for backward compatibility
"dpid": dpid_Schema,
"ip": ip_schema,
"port": port_schema,
"dpid": dpid_Schema,
"ip": ip_schema,
"port": port_schema,
- "type": {"type": "string", "enum": ["opendaylight", "floodlight", "onos"]},
"version": {"type": "string", "minLength": 1, "maxLength": 12},
"version": {"type": "string", "minLength": 1, "maxLength": 12},
- "user": shortname_schema,
- "password": passwd_schema
}
sdn_new_schema = {
"title": "sdn controller information schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": sdn_properties,
}
sdn_new_schema = {
"title": "sdn controller information schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": sdn_properties,
- "required": ["name",
"port", 'ip', 'dpid',
'type'],
+ "required": ["name", 'type'],
"additionalProperties": False
}
sdn_edit_schema = {
"additionalProperties": False
}
sdn_edit_schema = {
@@
-546,7
+552,7
@@
k8scluster_nets_schema = {
"title": "k8scluster nets input schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"title": "k8scluster nets input schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
- "patternProperties": {".": {"oneOf": [
description
_schema, null_schema]}},
+ "patternProperties": {".": {"oneOf": [
name
_schema, null_schema]}},
"minProperties": 1,
"additionalProperties": False
}
"minProperties": 1,
"additionalProperties": False
}
@@
-587,7
+593,7
@@
k8scluster_edit_schema = {
}
# K8s Repos
}
# K8s Repos
-k8srepo_types = {"enum": ["
chart", "
bundle"]}
+k8srepo_types = {"enum": ["
helm-chart", "juju-
bundle"]}
k8srepo_properties = {
"name": name_schema,
"description": description_schema,
k8srepo_properties = {
"name": name_schema,
"description": description_schema,
@@
-713,6
+719,7
@@
user_new_schema = {
"type": "object",
"properties": {
"username": shortname_schema,
"type": "object",
"properties": {
"username": shortname_schema,
+ "user_domain_name": shortname_schema,
"password": passwd_schema,
"projects": nameshort_list_schema,
"project_role_mappings": project_role_mappings,
"password": passwd_schema,
"projects": nameshort_list_schema,
"project_role_mappings": project_role_mappings,
@@
-751,6
+758,7
@@
project_new_schema = {
"properties": {
"name": shortname_schema,
"admin": bool_schema,
"properties": {
"name": shortname_schema,
"admin": bool_schema,
+ "project_domain_name": shortname_schema,
"quotas": {
"type": "object",
"properties": {topic: integer0_schema for topic in topics_with_quota},
"quotas": {
"type": "object",
"properties": {topic: integer0_schema for topic in topics_with_quota},
@@
-867,6
+875,7
@@
nsi_instantiate = {
"nsiDescription": {"oneOf": [description_schema, null_schema]},
"nstId": string_schema,
"vimAccountId": id_schema,
"nsiDescription": {"oneOf": [description_schema, null_schema]},
"nstId": string_schema,
"vimAccountId": id_schema,
+ "timeout_nsi_deploy": integer1_schema,
"ssh_keys": {"type": "string"},
"nsi_id": id_schema,
"additionalParamsForNsi": object_schema,
"ssh_keys": {"type": "string"},
"nsi_id": id_schema,
"additionalParamsForNsi": object_schema,