projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #677 osm nsi-op-list name' and 'osm nsi-op-show id' returns null
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
b20be4a
..
a244ac1
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-381,7
+381,7
@@
vim_account_new_schema = {
"description": description_schema,
"vim": name_schema,
"datacenter": name_schema,
"description": description_schema,
"vim": name_schema,
"datacenter": name_schema,
- "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
+ "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"
, "azure", "fos"
]},
"vim_url": description_schema,
# "vim_url_admin": description_schema,
# "vim_tenant": name_schema,
"vim_url": description_schema,
# "vim_url_admin": description_schema,
# "vim_tenant": name_schema,
@@
-421,7
+421,7
@@
wim_account_new_schema = {
"name": name_schema,
"description": description_schema,
"wim": name_schema,
"name": name_schema,
"description": description_schema,
"wim": name_schema,
- "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]},
+ "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"
, "fake"
]},
"wim_url": description_schema,
"user": shortname_schema,
"password": passwd_schema,
"wim_url": description_schema,
"user": shortname_schema,
"password": passwd_schema,
@@
-648,22
+648,20
@@
roles_new_schema = {
"type": "object",
"properties": {
"name": shortname_schema,
"type": "object",
"properties": {
"name": shortname_schema,
- "
definition": object
_schema,
+ "
root": bool
_schema,
},
},
- "required": ["name"],
- "additionalProperties":
Fals
e
+ "required": ["name"
, "root"
],
+ "additionalProperties":
Tru
e
}
roles_edit_schema = {
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Roles edit schema for administrators",
"type": "object",
"properties": {
}
roles_edit_schema = {
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Roles edit schema for administrators",
"type": "object",
"properties": {
- "_id": id_schema,
- "name": shortname_schema,
- "definition": object_schema,
+ "root": bool_schema,
},
},
- "required": ["
_id", "name", "definition
"],
- "additionalProperties":
Fals
e,
+ "required": ["
root
"],
+ "additionalProperties":
Tru
e,
"minProperties": 1
}
"minProperties": 1
}
@@
-714,7
+712,7
@@
nsi_instantiate = {
"type": "object",
"properties": {
"lcmOperationType": string_schema,
"type": "object",
"properties": {
"lcmOperationType": string_schema,
- "n
si
InstanceId": id_schema,
+ "n
etslice
InstanceId": id_schema,
"nsiName": name_schema,
"nsiDescription": {"oneOf": [description_schema, null_schema]},
"nstId": string_schema,
"nsiName": name_schema,
"nsiDescription": {"oneOf": [description_schema, null_schema]},
"nstId": string_schema,