projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: monitor-external-ids should run with --monitor
[openvswitch]
/
vswitchd
/
vswitch.ovsschema
diff --git
a/vswitchd/vswitch.ovsschema
b/vswitchd/vswitch.ovsschema
index b38463b0f11d22ee06656339b920581223465aaa..d872fdc516ac0d2c0a20971a4e2dea9ba7ec0c63 100644
(file)
--- a/
vswitchd/vswitch.ovsschema
+++ b/
vswitchd/vswitch.ovsschema
@@
-6,10
+6,6
@@
"type": {"key": {"type": "uuid",
"refTable": "Bridge"},
"min": 0, "max": "unlimited"}},
"type": {"key": {"type": "uuid",
"refTable": "Bridge"},
"min": 0, "max": "unlimited"}},
- "controller": {
- "type": {"key": {"type": "uuid",
- "refTable": "Controller"},
- "min": 0, "max": "unlimited"}},
"managers": {
"type": {"key": "string", "min": 0, "max": "unlimited"}},
"ssl": {
"managers": {
"type": {"key": "string", "min": 0, "max": "unlimited"}},
"ssl": {
@@
-29,7
+25,7
@@
"refTable": "Capability"},
"min": 0, "max": "unlimited"}},
"statistics": {
"refTable": "Capability"},
"min": 0, "max": "unlimited"}},
"statistics": {
- "type": {"key": "string", "value": "
integer
", "min": 0, "max": "unlimited"},
+ "type": {"key": "string", "value": "
string
", "min": 0, "max": "unlimited"},
"ephemeral": true}},
"maxRows": 1},
"Capability": {
"ephemeral": true}},
"maxRows": 1},
"Capability": {
@@
-66,6
+62,10
@@
"type": {"key": {"type": "uuid",
"refTable": "Controller"},
"min": 0, "max": "unlimited"}},
"type": {"key": {"type": "uuid",
"refTable": "Controller"},
"min": 0, "max": "unlimited"}},
+ "fail_mode": {
+ "type": {"key": {"type": "string",
+ "enum": ["set", ["standalone", "secure"]]},
+ "min": 0, "max": 1}},
"other_config": {
"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
"external_ids": {
"other_config": {
"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
"external_ids": {
@@
-134,8
+134,13
@@
"ofport": {
"type": {"key": "integer", "min": 0, "max": 1},
"ephemeral": true},
"ofport": {
"type": {"key": "integer", "min": 0, "max": 1},
"ephemeral": true},
+ "other_config": {
+ "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
"statistics": {
"type": {"key": "string", "value": "integer", "min": 0, "max": "unlimited"},
"statistics": {
"type": {"key": "string", "value": "integer", "min": 0, "max": "unlimited"},
+ "ephemeral": true},
+ "status": {
+ "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"},
"ephemeral": true}}},
"QoS": {
"columns": {
"ephemeral": true}}},
"QoS": {
"columns": {
@@
-150,11
+155,17
@@
"min": 0, "max": "unlimited"}},
"other_config": {
"type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}},
"other_config": {
"type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}}}},
"Queue": {
"columns": {
"other_config": {
"type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}}}},
"Queue": {
"columns": {
"other_config": {
"type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
"min": 0, "max": "unlimited"}}}},
"Mirror": {
"columns": {
"min": 0, "max": "unlimited"}}}},
"Mirror": {
"columns": {
@@
-187,7
+198,10
@@
"type": {"key": {"type": "integer",
"minInteger": 1,
"maxInteger": 4095},
"type": {"key": {"type": "integer",
"minInteger": 1,
"maxInteger": 4095},
- "min": 0, "max": 1}}}},
+ "min": 0, "max": 1}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}}}},
"NetFlow": {
"columns": {
"targets": {
"NetFlow": {
"columns": {
"targets": {
@@
-207,7
+221,10
@@
"type": "boolean"},
"active_timeout": {
"type": {"key": {"type": "integer",
"type": "boolean"},
"active_timeout": {
"type": {"key": {"type": "integer",
- "minInteger": -1}}}}},
+ "minInteger": -1}}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}}}},
"sFlow": {
"columns": {
"targets": {
"sFlow": {
"columns": {
"targets": {
@@
-219,7
+236,10
@@
"header": {
"type": {"key": "integer", "min": 0, "max": 1}},
"agent": {
"header": {
"type": {"key": "integer", "min": 0, "max": 1}},
"agent": {
- "type": {"key": "string", "min": 0, "max": 1}}}},
+ "type": {"key": "string", "min": 0, "max": 1}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}}}},
"Controller": {
"columns": {
"target": {
"Controller": {
"columns": {
"target": {
@@
-230,10
+250,6
@@
"min": 0, "max": 1}},
"inactivity_probe": {
"type": {"key": "integer", "min": 0, "max": 1}},
"min": 0, "max": 1}},
"inactivity_probe": {
"type": {"key": "integer", "min": 0, "max": 1}},
- "fail_mode": {
- "type": {"key": {"type": "string",
- "enum": ["set", ["standalone", "secure"]]},
- "min": 0, "max": 1}},
"discover_accept_regex": {
"type": {"key": "string", "min": 0, "max": 1}},
"discover_update_resolv_conf": {
"discover_accept_regex": {
"type": {"key": "string", "min": 0, "max": 1}},
"discover_update_resolv_conf": {
@@
-258,7
+274,10
@@
"controller_burst_limit": {
"type": {"key": {"type": "integer",
"minInteger": 25},
"controller_burst_limit": {
"type": {"key": {"type": "integer",
"minInteger": 25},
- "min": 0, "max": 1}}}},
+ "min": 0, "max": 1}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}}}},
"SSL": {
"columns": {
"private_key": {
"SSL": {
"columns": {
"private_key": {
@@
-268,5
+287,8
@@
"ca_cert": {
"type": "string"},
"bootstrap_ca_cert": {
"ca_cert": {
"type": "string"},
"bootstrap_ca_cert": {
- "type": "boolean"}},
+ "type": "boolean"},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited"}}},
"maxRows": 1}}}
"maxRows": 1}}}