From e3fbd9df396185a4dd5d9479bf20b94c6379ae2d Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Mon, 31 Mar 2014 13:34:52 -0700
Subject: [PATCH] vswitchd: Add external_ids to Flow_Table table in database
 schema.

Every other table has an external_ids column, which can be useful to
controller writers for integration purposes, so add one to Flow_Table also.

Reported-by: Ariel Tubaltsev <atubaltsev@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
---
 AUTHORS                    | 1 +
 vswitchd/vswitch.ovsschema | 9 ++++++---
 vswitchd/vswitch.xml       | 7 +++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b18995787..89a9ad874 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -146,6 +146,7 @@ Andrei Andone           andrei.andone@softvision.ro
 Anshuman Manral         anshuman.manral@outlook.com
 Anton Matsiuk           anton.matsiuk@gmail.com
 Anuprem Chalvadi        achalvadi@vmware.com
+Ariel Tubaltsev         atubaltsev@vmware.com
 Atzm Watanabe           atzm@stratosphere.co.jp
 Bastian Blank           waldi@debian.org
 Ben Basler              bbasler@nicira.com
diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index efaa1dabc..3fb45d14a 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,6 +1,6 @@
 {"name": "Open_vSwitch",
- "version": "7.4.0",
- "cksum": "2387737815 20431",
+ "version": "7.5.0",
+ "cksum": "1448369194 20560",
  "tables": {
    "Open_vSwitch": {
      "columns": {
@@ -303,7 +303,10 @@
        "groups": {
 	 "type": {"key": "string", "min": 0, "max": "unlimited"}},
        "prefixes": {
-         "type": {"key": "string", "min": 0, "max": 3}}}},
+         "type": {"key": "string", "min": 0, "max": 3}},
+       "external_ids": {
+         "type": {"key": "string", "value": "string",
+                  "min": 0, "max": "unlimited"}}}},
    "QoS": {
      "columns": {
        "type": {
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index b0a857721..78594e75e 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -2628,6 +2628,13 @@
         one flow table.  Currently this limit is 3.
       </p>
     </column>
+
+    <group title="Common Columns">
+      The overall purpose of these columns is described under <code>Common
+      Columns</code> at the beginning of this document.
+
+      <column name="external_ids"/>
+    </group>
   </table>
 
   <table name="QoS" title="Quality of Service configuration">
-- 
2.20.1