ovn: Add datapath column to the MAC_Binding table

This will allow ovn-controller to conditionally monitor MAC_Binding table
according to datapath column.

Signed-off-by: Liran Schour <lirans@il.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c
index 1370301..6342719 100644 (file)
--- a/ovn/controller/pinctrl.c
+++ b/ovn/controller/pinctrl.c
@@ -639,6 +639,7 @@ run_put_arp(struct controller_ctx *ctx, const struct lport_index *lports,
     sbrec_mac_binding_set_logical_port(b, pb->logical_port);
     sbrec_mac_binding_set_ip(b, ip_string);
     sbrec_mac_binding_set_mac(b, mac_string);
+    sbrec_mac_binding_set_datapath(b, pb->datapath);
 }
 
 static void

diff --git a/ovn/ovn-sb.ovsschema b/ovn/ovn-sb.ovsschema
index aab4ef5..605b605 100644 (file)
--- a/ovn/ovn-sb.ovsschema
+++ b/ovn/ovn-sb.ovsschema
@@ -1,7 +1,7 @@
 {
     "name": "OVN_Southbound",
-    "version": "1.5.0",
-    "cksum": "2807058982 6398",
+    "version": "1.6.0",
+    "cksum": "1715817174 6541",
     "tables": {
         "Chassis": {
             "columns": {
@@ -116,7 +116,9 @@
             "columns": {
                 "logical_port": {"type": "string"},
                 "ip": {"type": "string"},
-                "mac": {"type": "string"}},
+                "mac": {"type": "string"},
+                "datapath": {"type": {"key": {"type": "uuid",
+                                              "refTable": "Datapath_Binding"}}}},
             "indexes": [["logical_port", "ip"]],
             "isRoot": true},
         "DHCP_Options": {

diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index 1b5bf9e..3d26e65 100644 (file)
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -1822,6 +1822,9 @@ tcp.flags = RST;
     <column name="mac">
       The Ethernet address to which the IP is bound.
     </column>
+    <column name="datapath">
+      The logical datapath to which the logical port belongs.
+    </column>
   </table>
 
   <table name="DHCP_Options" title="DHCP Options supported by native OVN DHCP">