projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow logging at file. Check member-vnf-index at ns action
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
5a2fbdc
..
70003a9
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-55,61
+55,67
@@
ns_action = { # TODO for the moment it is only contemplated the vnfd primitive
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
- "vnf_member_index": name_schema,
+ "member_vnf_index": name_schema,
+ "vnf_member_index": name_schema, # TODO for backward compatibility. To remove in future
"primitive": name_schema,
"primitive_params": {"type": "object"},
},
"primitive": name_schema,
"primitive_params": {"type": "object"},
},
- "required": ["
vnf_member_index", "primitive", "primitive_params"],
+ "required": ["
primitive", "primitive_params"], # TODO add member_vnf_index
"additionalProperties": False
}
schema_version = {"type": "string", "enum": ["1.0"]}
"additionalProperties": False
}
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
}
sdn_properties = {
"name": name_schema,
"additionalProperties": False
}
sdn_properties = {
"name": name_schema,
+ "description": description_schema,
"dpid": {"type": "string", "pattern": "^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){7}$"},
"ip": ip_schema,
"port": port_schema,
"dpid": {"type": "string", "pattern": "^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){7}$"},
"ip": ip_schema,
"port": port_schema,
@@
-131,7
+137,7
@@
sdn_edit_schema = {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": sdn_properties,
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": sdn_properties,
- "required": ["name", "port", 'ip', 'dpid', 'type'],
+
#
"required": ["name", "port", 'ip', 'dpid', 'type'],
"additionalProperties": False
}
sdn_port_mapping_schema = {
"additionalProperties": False
}
sdn_port_mapping_schema = {
@@
-172,14
+178,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
}