projects
/
osm
/
openvim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get_of_rules corrected
[osm/openvim.git]
/
vim_schema.py
diff --git
a/vim_schema.py
b/vim_schema.py
index
0a5929d
..
6d508a6
100644
(file)
--- a/
vim_schema.py
+++ b/
vim_schema.py
@@
-117,12
+117,17
@@
config_schema = {
"log_level": log_level_schema,
"log_level_db": log_level_schema,
"log_level_of": log_level_schema,
"log_level": log_level_schema,
"log_level_db": log_level_schema,
"log_level_of": log_level_schema,
+ "network_type": {"type": "string", "enum": ["ovs", "bridge"]},
+ "ovs_controller_file_path": path_schema,
+ "ovs_controller_user": nameshort_schema,
+
+ "ovs_controller_ip": nameshort_schema
},
"patternProperties": {
"of_*" : {"type": ["string", "integer", "boolean"]}
},
"required": ['db_host', 'db_user', 'db_passwd', 'db_name',
},
"patternProperties": {
"of_*" : {"type": ["string", "integer", "boolean"]}
},
"required": ['db_host', 'db_user', 'db_passwd', 'db_name',
- 'of_controller_ip', 'of_controller_port', 'of_controller_dpid', '
bridge_ifaces', '
of_controller'],
+ 'of_controller_ip', 'of_controller_port', 'of_controller_dpid', 'of_controller'],
"additionalProperties": False
}
"additionalProperties": False
}
@@
-625,8
+630,8
@@
network_update_schema = {
"provider:physical":net_bind_schema,
"cidr":cidr_schema,
"enable_dhcp": {"type":"boolean"},
"provider:physical":net_bind_schema,
"cidr":cidr_schema,
"enable_dhcp": {"type":"boolean"},
- "dhcp_first_ip": ip_schema,
- "dhcp_last_ip": ip_schema,
+
#
"dhcp_first_ip": ip_schema,
+
#
"dhcp_last_ip": ip_schema,
"bind_net":name_schema, #can be name, or uuid
"bind_type":{"oneOf":[{"type":"null"},{"type":"string", "pattern":"^vlan:[0-9]{1,4}$"}]}
},
"bind_net":name_schema, #can be name, or uuid
"bind_type":{"oneOf":[{"type":"null"},{"type":"string", "pattern":"^vlan:[0-9]{1,4}$"}]}
},