projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some aync return responses. Change vims to vim_accounts
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
5a2fbdc
..
c1141f1
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-65,45
+65,49
@@
ns_action = { # TODO for the moment it is only contemplated the vnfd primitive
schema_version = {"type": "string", "enum": ["1.0"]}
schema_version = {"type": "string", "enum": ["1.0"]}
-schema_type = {"type": "string"}
-
-vim_new_schema = {
- "title": "vims new user input schema",
+vim_account_edit_schema = {
+ "title": "vim_account edit input schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
- "schema_version": schema_version,
- "schema_type": schema_type,
"name": name_schema,
"description": description_schema,
"name": name_schema,
"description": description_schema,
- "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
+ "type": nameshort_schema, # currently "openvim" or "openstack", can be enlarged with plugins
+ "vim": name_schema,
+ "datacenter": name_schema,
"vim_url": description_schema,
"vim_url": description_schema,
-
#
"vim_url_admin": description_schema,
-
#
"vim_tenant": name_schema,
+ "vim_url_admin": description_schema,
+ "vim_tenant": name_schema,
"vim_tenant_name": name_schema,
"vim_tenant_name": name_schema,
- "vim_user": nameshort_schema,
+ "vim_user
name
": nameshort_schema,
"vim_password": nameshort_schema,
"config": {"type": "object"}
},
"vim_password": nameshort_schema,
"config": {"type": "object"}
},
- "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"],
"additionalProperties": False
}
"additionalProperties": False
}
-vim_edit_schema = {
- "title": "datacenter edit nformation schema",
+schema_type = {"type": "string"}
+
+vim_account_new_schema = {
+ "title": "vim_account creation input schema",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
+ "schema_version": schema_version,
+ "schema_type": schema_type,
"name": name_schema,
"description": description_schema,
"name": name_schema,
"description": description_schema,
- "type": nameshort_schema, # currently "openvim" or "openstack", can be enlarged with plugins
+ "vim": name_schema,
+ "datacenter": name_schema,
+ "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
"vim_url": description_schema,
"vim_url": description_schema,
- "vim_url_admin": description_schema,
- "vim_tenant": name_schema,
+
#
"vim_url_admin": description_schema,
+
#
"vim_tenant": name_schema,
"vim_tenant_name": name_schema,
"vim_tenant_name": name_schema,
- "vim_user
name
": nameshort_schema,
+ "vim_user": nameshort_schema,
"vim_password": nameshort_schema,
"config": {"type": "object"}
},
"vim_password": nameshort_schema,
"config": {"type": "object"}
},
+ "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"],
"additionalProperties": False
}
"additionalProperties": False
}
@@
-172,14
+176,14
@@
sdn_external_port_schema = {
nbi_new_input_schemas = {
nbi_new_input_schemas = {
- "vim
s": vim
_new_schema,
+ "vim
_accounts": vim_account
_new_schema,
"sdns": sdn_new_schema,
"ns_instantiate": ns_instantiate,
"ns_action": ns_action,
}
nbi_edit_input_schemas = {
"sdns": sdn_new_schema,
"ns_instantiate": ns_instantiate,
"ns_action": ns_action,
}
nbi_edit_input_schemas = {
- "vim
s": vim
_edit_schema,
+ "vim
_accounts": vim_account
_edit_schema,
"sdns": sdn_edit_schema
}
"sdns": sdn_edit_schema
}