[ovs-dev] [PATCH] ovn-northd: Always set nat_addresses and options in Port_Binding.

Ben Pfaff blp at ovn.org
Fri Nov 2 16:23:06 UTC 2018


In some cases the code didn't set these columns.

Found by inspection.

Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 ovn/northd/ovn-northd.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index e42ceea99264..665b0d820a05 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -2170,6 +2170,8 @@ ovn_port_update_sbrec(struct northd_context *ctx,
 
         struct smap ids = SMAP_INITIALIZER(&ids);
         sbrec_port_binding_set_external_ids(op->sb, &ids);
+
+        sbrec_port_binding_set_nat_addresses(op->sb, NULL, 0);
     } else {
         if (strcmp(op->nbsp->type, "router")) {
             uint32_t queue_id = smap_get_int(
@@ -2202,6 +2204,8 @@ ovn_port_update_sbrec(struct northd_context *ctx,
                     &rl, "Unknown port type '%s' set on logical switch '%s'.",
                     op->nbsp->type, op->nbsp->name);
             }
+
+            sbrec_port_binding_set_nat_addresses(op->sb, NULL, 0);
         } else {
             const char *chassis = NULL;
             if (op->peer && op->peer->od && op->peer->od->nbr) {
@@ -2229,6 +2233,8 @@ ovn_port_update_sbrec(struct northd_context *ctx,
                 }
                 sbrec_port_binding_set_options(op->sb, &new);
                 smap_destroy(&new);
+            } else {
+                sbrec_port_binding_set_options(op->sb, NULL);
             }
 
             const char *nat_addresses = smap_get(&op->nbsp->options,
-- 
2.16.1



More information about the dev mailing list