From aff9c19d5fb9bb2cfba220d32ec68111d1adb1c5 Mon Sep 17 00:00:00 2001
From: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
Date: Wed, 11 Mar 2020 11:37:53 +0800
Subject: [PATCH] Add external_ids column for tables in nb schema

"Logical_Router_Policy"  and "Forwarding_Group" tables doesn't have
"external_ids" column. I think it is better to add it, so CMS could
fill it with useful information.

Author: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
Co-authored-by: Liu Chang <liuchang@cmss.chinamobile.com>
Co-authored-by: Rong Yin <rongyin@cmss.chinamobile.com>
Signed-off-by: Tao YunXiang <taoyunxiang@cmss.chinamobile.com>
Signed-off-by: Liu Chang <liuchang@cmss.chinamobile.com>
Signed-off-by: Rong Yin <rongyin@cmss.chinamobile.com>
Acked-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Numan Siddique <numans@ovn.org>
(cherry picked from upstream commit 45de84bff0224e61847ff52d480c6500153ce699)

Change-Id: I85671ce34238dd8989756b395d85785c25c8842c
---
 ovn-nb.ovsschema | 10 ++++++++--
 ovn-nb.xml       | 12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
index bbd6c25..843e979 100644
--- a/ovn-nb.ovsschema
+++ b/ovn-nb.ovsschema
@@ -1,7 +1,7 @@
 {
     "name": "OVN_Northbound",
     "version": "5.20.0",
-    "cksum": "987891875 24923",
+    "cksum": "2846067333 25243",
     "tables": {
         "NB_Global": {
             "columns": {
@@ -125,6 +125,9 @@
                 "vip": {"type": "string"},
                 "vmac": {"type": "string"},
                 "liveness": {"type": "boolean"},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}},
                 "child_port": {"type": {"key": "string",
                                         "min": 1, "max": "unlimited"}}},
             "isRoot": false},
@@ -366,7 +369,10 @@
                 "action": {"type": {
                     "key": {"type": "string",
                             "enum": ["set", ["allow", "drop", "reroute"]]}}},
-                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}}},
+                "nexthop": {"type": {"key": "string", "min": 0, "max": 1}},
+                "external_ids": {
+                    "type": {"key": "string", "value": "string",
+                             "min": 0, "max": "unlimited"}}},
             "isRoot": false},
         "NAT": {
             "columns": {
diff --git a/ovn-nb.xml b/ovn-nb.xml
index f30cc9e..4a422bb 100644
--- a/ovn-nb.xml
+++ b/ovn-nb.xml
@@ -1313,6 +1313,12 @@
     <column name="child_port">
       List of child ports in the forwarding group.
     </column>
+
+    <group title="Common Columns">
+      <column name="external_ids">
+        See <em>External IDs</em> at the beginning of this document.
+      </column>
+    </group>
   </table>
 
   <table name="Address_Set" title="Address Sets">
@@ -2498,6 +2504,12 @@
         address of a connected router port or the IP address of a logical port.
       </p>
     </column>
+
+    <group title="Common Columns">
+      <column name="external_ids">
+        See <em>External IDs</em> at the beginning of this document.
+      </column>
+    </group>
   </table>
 
   <table name="NAT" title="NAT rules">
-- 
1.8.3.1