From: "Mark D. Gray" <mark.d.g...@intel.com>
datapath_types and port_types columns will allow an
ovsdb client to determine the available datapath and port
types on this instance of ovs-vswitchd
Signed-off-by: Mark D. Gray <mark.d.g...@intel.com>
Signed-off-by: Billy O'Mahony <billy.o.mah...@intel.com>
---
vswitchd/automake.mk | 2 +-
vswitchd/vswitch.ovsschema | 10 ++++++++--
vswitchd/vswitch.xml | 18 ++++++++++++++++++
vtep/automake.mk | 2 +-
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 2f07c0f..decabfd 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -63,7 +63,7 @@ vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
touch $@; \
else \
ln=`sed -n '/"cksum":/=' $?`; \
- echo >&2 "$?:$$ln: checksum \"$$sum\" does not match (you should
probably update the version number and fix the checksum)"; \
+ echo >&2 "$?:$$ln: The checksum \"$$sum\" was calculated from the
schema file and does not match cksum field in the schema file (you should
probably update the version number and the checksum in the schema file)"; \
exit 1; \
fi
CLEANFILES += vswitchd/vswitch.ovsschema.stamp
diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index 4898b16..2723c51 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,6 +1,6 @@
{"name": "Open_vSwitch",
- "version": "7.11.2",
- "cksum": "320332148 22294",
+ "version": "7.12.1",
+ "cksum": "2253982003 22534",
"tables": {
"Open_vSwitch": {
"columns": {
@@ -31,6 +31,12 @@
"ovs_version": {
"type": {"key": {"type": "string"},
"min": 0, "max": 1}},
+ "datapath_types": {
+ "type": {"key": {"type": "string"},
+ "min": 0, "max": "unlimited"}},
+ "port_types": {
+ "type": {"key": {"type": "string"},
+ "min": 0, "max": "unlimited"}},
"db_version": {
"type": {"key": {"type": "string"},
"min": 0, "max": 1}},
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index dac3756..16b436e 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -423,6 +423,24 @@
</group>
+ <group title="Capabilities">
+ <p>
+ These columns report capabilities of the Open vSwitch instance. Any
+ value reported in these columns should be detected from probing Open
+ vSwitch.
+ </p>
+ <column name="datapath_types">
+ <p>
+ This column reports the different dpifs registered with the system.
+ </p>
+ </column>
+ <column name="port_types">
+ <p>
+ This column reports the different netdevs registered with the system.
+ </p>
+ </column>
+ </group>
+
<group title="Database Configuration">
<p>
These columns primarily configure the Open vSwitch database
diff --git a/vtep/automake.mk b/vtep/automake.mk
index 7892685..d19e4cf 100644
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -87,7 +87,7 @@ vtep/vtep.ovsschema.stamp: vtep/vtep.ovsschema
touch $@; \
else \
ln=`sed -n '/"cksum":/=' $?`; \
- echo >&2 "$?:$$ln: checksum \"$$sum\" does not match (you should
probably update the version number and fix the checksum)"; \
+ echo >&2 "$?:$$ln: The checksum \"$$sum\" was calculated from the
schema file and does not match cksum field in the schema file (you should
probably update the version number and the checksum in the schema file)"; \
exit 1; \
fi
CLEANFILES += vtep/vtep.ovsschema.stamp
--
1.9.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
