vtep: Introduce other_config column in some vtep schema tables.

Having an other_config column is a simple way to pass more information than the
schema allows.

Signed-off-by: Saurabh Shrivastava <saurabh.shrivastava@nuagenetworks.net>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/AUTHORS b/AUTHORS
index bad9d7b..541c2f8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -185,6 +185,7 @@ Samuel Ghinet           sghinet@cloudbasesolutions.com
 Sanjay Sane             ssane@nicira.com
 Saurabh Mohan           saurabh@cplanenetworks.com
 Saurabh Shah            ssaurabh@nicira.com
+Saurabh Shrivastava     saurabh.shrivastava@nuagenetworks.net
 Scott Lowe              scott.lowe@scottlowe.org
 Scott Mann              sdmnix@gmail.com
 Selvamuthukumar         smkumar@merunetworks.com
@@ -391,7 +392,6 @@ Ronny L. Bull           bullrl@clarkson.edu
 Sandeep Kumar           sandeep.kumar16@tcs.com
 Sander Eikelenboom      linux@eikelenboom.it
 Saul St. John           sstjohn@cs.wisc.edu
-Saurabh Shrivastava (सौरभ श्रीवास्तव)    saurabh@gmail.com
 Scott Hendricks         shendricks@nicira.com
 Sean Brady              sbrady@gtfservices.com
 Sebastian Andrzej Siewior  sebastian@breakpoint.cc

diff --git a/vtep/vtep.ovsschema b/vtep/vtep.ovsschema
index cf3538f..533fd2e 100644 (file)
--- a/vtep/vtep.ovsschema
+++ b/vtep/vtep.ovsschema
@@ -1,6 +1,6 @@
 {
   "name": "hardware_vtep",
-  "cksum": "1621458335 10585",
+  "cksum": "770244945 11113",
   "tables": {
     "Global": {
       "columns": {
@@ -28,6 +28,9 @@
         "tunnels": {
           "type": {"key": {"type": "uuid", "refTable": "Tunnel"},
                    "min": 0, "max": "unlimited"}},
+        "other_config": {
+          "type": {"key": "string", "value": "string",
+                   "min": 0, "max": "unlimited"}},
         "switch_fault_status": {
           "type": {
             "key": "string", "min": 0, "max": "unlimited"},
@@ -54,6 +57,9 @@
                              "refTable": "Logical_Binding_Stats"},
                    "min": 0, "max": "unlimited"},
           "ephemeral": true},
+        "other_config": {
+          "type": {"key": "string", "value": "string",
+                   "min": 0, "max": "unlimited"}},
         "port_fault_status": {
           "type": {
             "key": "string", "min": 0, "max": "unlimited"},
@@ -89,7 +95,10 @@
       "columns": {
         "name": {"type": "string"},
         "description": {"type": "string"},
-        "tunnel_key": {"type": {"key": "integer", "min": 0, "max": 1}}},
+        "tunnel_key": {"type": {"key": "integer", "min": 0, "max": 1}},
+        "other_config": {
+          "type": {"key": "string", "value": "string",
+                   "min": 0, "max": "unlimited"}}},
       "isRoot": true,
       "indexes": [["name"]]},
     "Ucast_Macs_Local": {
@@ -154,6 +163,9 @@
                    "value": {"type": "uuid",
                              "refTable": "ACL"},
                    "min": 0, "max": "unlimited"}},
+        "other_config": {
+          "type": {"key": "string", "value": "string",
+                   "min": 0, "max": "unlimited"}},
         "LR_fault_status": {
           "type": {
             "key": "string", "min": 0, "max": "unlimited"},
@@ -284,4 +296,4 @@
           "ephemeral": true}},
       "indexes": [["target"]],
       "isRoot": false}},
-  "version": "1.5.0"}
+  "version": "1.5.1"}

diff --git a/vtep/vtep.xml b/vtep/vtep.xml
index b1befce..a3a6988 100644 (file)
--- a/vtep/vtep.xml
+++ b/vtep/vtep.xml
@@ -31,6 +31,27 @@
     </dd>
   </dl>
 
+  <h2>Common Column</h2>
+
+  <p>
+    Some tables contain a column, named <code>other_config</code>.
+    This column has the same form and purpose each place that it appears,
+    so we describe it here to save space later.
+  </p>
+
+  <dl>
+    <dt><code>other_config</code>: map of string-string pairs</dt>
+    <dd>
+      <p>
+        Key-value pairs for configuring rarely used or proprietary features.
+      </p>
+      <p>
+        Some tables do not have <code>other_config</code> column because no
+        key-value pairs have yet been defined for them.
+      </p>
+    </dd>
+  </dl>
+
   <table name="Global" title="Top-level configuration.">
     Top-level configuration for a hardware VTEP.  There must be
     exactly one record in the <ref table="Global"/> table.
@@ -336,8 +357,15 @@
         Indicates that an error has occurred in the switch but that no
         more specific information is available.
       </column>
+    </group>
+
+    <group title="Common Column">
+      The overall purpose of this column is described under <code>Common
+      Column</code> at the beginning of this document.
 
+      <column name="other_config"/>
     </group>
+
   </table>
 
   <table name="Tunnel" title="A tunnel created by a physical switch.">
@@ -625,6 +653,13 @@
       </column>
     </group>
 
+    <group title="Common Column">
+      The overall purpose of this column is described under <code>Common
+      Column</code> at the beginning of this document.
+
+      <column name="other_config"/>
+    </group>
+
   </table>
 
   <table name="Logical_Binding_Stats" title="Statistics for a VLAN on a physical port bound to a logical network.">
@@ -729,6 +764,14 @@
         login banner.
       </column>
     </group>
+
+    <group title="Common Column">
+      The overall purpose of this column is described under <code>Common
+      Column</code> at the beginning of this document.
+
+      <column name="other_config"/>
+    </group>
+
   </table>
 
   <table name="Ucast_Macs_Local" title="Unicast MACs (local)">
@@ -941,6 +984,13 @@
       </column>
     </group>
 
+    <group title="Common Column">
+      The overall purpose of this column is described under <code>Common
+      Column</code> at the beginning of this document.
+
+      <column name="other_config"/>
+    </group>
+
   </table>
 
   <table name="Arp_Sources_Local" title="ARP source addresses for logical routers">