Skip to content

Commit

Permalink
controller: have I+P assigning ct_zones for l3gateway ports
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Dumitru Ceara <[email protected]>
(cherry picked from commit 971256e)
  • Loading branch information
simonartxavier authored and dceara committed Nov 17, 2023
1 parent 685a18a commit 2e6de1a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions controller/ovn-controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 2e6de1a

Please sign in to comment.