From 2e6de1aea9befe0ee5b959bae0e1dfbb4677f042 Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Mon, 30 Oct 2023 09:09:07 +0100 Subject: [PATCH] controller: have I+P assigning ct_zones for l3gateway ports When l3gateway ports get added, ct_zones were assigned during (ct_zones) recomputes, but not by I+P. Before this patch, test "Migration of CT zone from UUID to name" was randomly failing, as ct_zone was not assigned by I+P but a ct_zone recompute happened most of the time (and hence test succeeded). Test case has been adapted so that ct_zone recompute usually happens before adding the sw0-lr0 port. Signed-off-by: Xavier Simonart Signed-off-by: Dumitru Ceara (cherry picked from commit 971256e9ed19159b39552808ec037390bb14150b) --- controller/ovn-controller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 61c79ac432..234d45928e 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -2492,9 +2492,10 @@ ct_zones_runtime_data_handler(struct engine_node *node, void *data) struct tracked_lport *t_lport = shash_node->data; if (strcmp(t_lport->pb->type, "") && strcmp(t_lport->pb->type, "localport") + && strcmp(t_lport->pb->type, "l3gateway") && strcmp(t_lport->pb->type, "localnet")) { - /* We allocate zone-id's only to VIF, localport, and localnet - * lports. */ + /* We allocate zone-id's only to VIF, localport, l3gateway, + * and localnet lports. */ continue; }