From: Justin Pettit
Signed-off-by: Justin Pettit
Signed-off-by: Yi-Hung Wei
Co-authored-by: Yi-Hung Wei
---
vswitchd/vswitch.ovsschema | 51 -
vswitchd/vswitch.xml | 275 +
2 files changed, 277 insertions(+), 49 deletions(-)
diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index f7c6eb8983cd..c0a2242ad345 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,9 +1,14 @@
{"name": "Open_vSwitch",
- "version": "8.0.0",
- "cksum": "3962141869 23978",
+ "version": "8.1.0",
+ "cksum": "1635647160 26090",
"tables": {
"Open_vSwitch": {
"columns": {
+ "datapaths": {
+ "type": {"key": {"type": "string"},
+ "value": {"type": "uuid",
+"refTable": "Datapath"},
+ "min": 0, "max": "unlimited"}},
"bridges": {
"type": {"key": {"type": "uuid",
"refTable": "Bridge"},
@@ -629,6 +634,48 @@
"min": 0, "max": "unlimited"},
"ephemeral": true}},
"indexes": [["target"]]},
+ "Datapath": {
+ "columns": {
+ "datapath_version": {
+ "type": "string"},
+ "ct_zones": {
+ "type": {"key": {"type": "integer",
+ "minInteger": 0,
+ "maxInteger": 65535},
+ "value": {"type": "uuid",
+"refTable": "CT_Zone"},
+ "min": 0, "max": "unlimited"}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited",
+ "CT_Zone": {
+ "columns": {
+ "timeout_policy": {
+ "type": {"key": {"type": "uuid",
+ "refTable": "CT_Timeout_Policy"},
+ "min": 0, "max": 1}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited",
+ "CT_Timeout_Policy": {
+ "columns": {
+ "timeouts": {
+ "type": {"key": {"type" : "string",
+ "enum": ["set", ["tcp_syn_sent", "tcp_syn_recv",
+ "tcp_established", "tcp_fin_wait",
+ "tcp_close_wait", "tcp_last_ack",
+ "tcp_time_wait", "tcp_close",
+ "tcp_syn_sent2", "tcp_retransmit",
+ "tcp_unack", "udp_first",
+ "udp_single", "udp_multiple",
+ "icmp_first", "icmp_reply"]]},
+ "value": {"type" : "integer",
+"minInteger" : 0,
+"maxInteger" : 4294967295},
+ "min": 0, "max": "unlimited"}},
+ "external_ids": {
+ "type": {"key": "string", "value": "string",
+ "min": 0, "max": "unlimited",
"SSL": {
"columns": {
"private_key": {
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 9a743c05b4bf..08586110db51 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -52,6 +52,13 @@
one record in the table.
+
+Map of datapath types to datapaths. The
+ column of the
+table is used as a key for this map. The value points to a row in
+the table.
+
+
Set of bridges managed by the daemon.
@@ -1217,53 +1224,11 @@
-
- Reports the version number of the Open vSwitch datapath in use.
- This allows management software to detect and report discrepancies
- between Open vSwitch userspace and datapath versions. (The column in the reports the Open vSwitch userspace version.)
- The version reported depends on the datapath in use:
-
-
-
-
-When the kernel module included in the Open vSwitch source tree is
-used, this column reports the Open vSwitch version from which the
-module was taken.
-
-
-
-When the kernel module that is part of the upstream Linux kernel is
-used, this column reports unknown.
-
-
-
-When the datapath is built into the ovs-vswitchd
-binary, this column reports built-in. A
-built-in datapath is by definition the same version as the rest of
-the Open VSwitch userspace.
-
-
-
-Other datapaths (such as the Hyper-V kernel datapath) currently
-report unknown.
-
-
-
-
- A version discrepancy between ovs-vswitchd and the
- datapath in use is not normally cause for alarm. The Open vSwitch
- kernel datapaths for Linux and Hyper-V, in
