Blob Blame History Raw
From 091f1b5a31e4cef212d2c7f92b6371a0c97d1cf6 Mon Sep 17 00:00:00 2001
From: Numan Siddique <numans@ovn.org>
Date: Tue, 8 Mar 2022 13:18:00 -0500
Subject: [PATCH 2/2] branch-21.12: Fix the compilation error.

While backporting the commit [1], missed out checking in the code
to add the options column in NB ACL table.  This is required because
the commit [2] added the 'options' column in NB ACL table and that
commit is not present in branch-21.12.

[1] - 77f7512157("northd: Support the option to apply from-lport ACLs after load balancer.")
[2] - b988d5fa62("northd: Add feature to log reply and related ACL traffic.")

Signed-off-by: Numan Siddique <numans@ovn.org>
---
 ovn-nb.ovsschema | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema
index 55977339a6..9dd31197e2 100644
--- a/ovn-nb.ovsschema
+++ b/ovn-nb.ovsschema
@@ -1,7 +1,7 @@
 {
     "name": "OVN_Northbound",
-    "version": "5.34.1",
-    "cksum": "2177334725 30782",
+    "version": "5.35.1",
+    "cksum": "649108105 30999",
     "tables": {
         "NB_Global": {
             "columns": {
@@ -262,6 +262,11 @@
                 "label": {"type": {"key": {"type": "integer",
                                            "minInteger": 0,
                                            "maxInteger": 4294967295}}},
+                "options": {
+                     "type": {"key": "string",
+                              "value": "string",
+                              "min": 0,
+                              "max": "unlimited"}},
                 "external_ids": {
                     "type": {"key": "string", "value": "string",
                              "min": 0, "max": "unlimited"}}},
-- 
2.34.1