projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merges branch sol006 into master, allowing NBI to use, parse and validate SOL006...
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
beea575
..
5b6cce1
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-286,7
+286,7
@@
ns_instantiate = {
"nsDescription": {"oneOf": [description_schema, null_schema]},
"nsdId": id_schema,
"vimAccountId": id_schema,
"nsDescription": {"oneOf": [description_schema, null_schema]},
"nsdId": id_schema,
"vimAccountId": id_schema,
- "wimAccountId": {"
O
neOf": [id_schema, bool_schema, null_schema]},
+ "wimAccountId": {"
o
neOf": [id_schema, bool_schema, null_schema]},
"placement-engine": string_schema,
"placement-constraints": object_schema,
"additionalParamsForNs": object_schema,
"placement-engine": string_schema,
"placement-constraints": object_schema,
"additionalParamsForNs": object_schema,
@@
-328,10
+328,10
@@
ns_instantiate = {
"type": "object",
"properties": {
"name": string_schema,
"type": "object",
"properties": {
"name": string_schema,
- "vim-network-name": {"
O
neOf": [string_schema, object_schema]},
- "vim-network-id": {"
O
neOf": [string_schema, object_schema]},
+ "vim-network-name": {"
o
neOf": [string_schema, object_schema]},
+ "vim-network-id": {"
o
neOf": [string_schema, object_schema]},
"ns-net": object_schema,
"ns-net": object_schema,
- "wimAccountId": {"
O
neOf": [id_schema, bool_schema, null_schema]},
+ "wimAccountId": {"
o
neOf": [id_schema, bool_schema, null_schema]},
"ip-profile": object_schema,
"provider-network": provider_network_schema,
"vnfd-connection-point-ref": {
"ip-profile": object_schema,
"provider-network": provider_network_schema,
"vnfd-connection-point-ref": {
@@
-938,8
+938,8
@@
nsi_vld_instantiate = {
"type": "object",
"properties": {
"name": string_schema,
"type": "object",
"properties": {
"name": string_schema,
- "vim-network-name": {"
O
neOf": [string_schema, object_schema]},
- "vim-network-id": {"
O
neOf": [string_schema, object_schema]},
+ "vim-network-name": {"
o
neOf": [string_schema, object_schema]},
+ "vim-network-id": {"
o
neOf": [string_schema, object_schema]},
"ip-profile": object_schema,
},
"required": ["name"],
"ip-profile": object_schema,
},
"required": ["name"],