This reverts commit 01277be6c833ef1d1c3fb568c139d3f0ac2b363a. Commit [1] caused issues with handling ARP requests to vif ports inside switch that has connectivity to the external network through a localnet port, as well as many other problems, so it was suggested to revert the commit. This commit was part of a fixes for this broken commit.
[1] https://github.com/ovn-org/ovn/commit/1b4058b9162c27edc6bd42c3dedbef622e2fd0a7 Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2026-May/431983.html Signed-off-by: Alexandra Rukomoinikova <[email protected]> --- northd/northd.c | 3 ++- tests/ovn-northd.at | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/northd/northd.c b/northd/northd.c index 44f7db321..088033a43 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -10219,7 +10219,8 @@ build_lswitch_arp_chassis_resident(const struct ovn_datapath *od, op = node->data; ds_clear(&match); - ds_put_format(&match, "arp.op == 1 && inport == %s", + ds_put_format(&match, "(arp.op == 1 || arp.op == 2) " + "&& inport == %s", op->json_key); ovn_lflow_add(lflows, od, S_SWITCH_IN_CHECK_PORT_SEC, 75, ds_cstr(&match), REGBIT_EXT_ARP " = 1; next;", diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index a57c3bad8..642239a13 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -20259,14 +20259,6 @@ AT_CHECK([cat lr1_lflows_before | grep lr_in_dnat | grep priority=120 | ovn_stri table=??(lr_in_dnat ), priority=120 , match=(ct.new && !ct.rel && ip6 && ip6.dst == 2000::1 && reg1[[16..23]] == 6 && reg1[[0..15]] == 80 && is_chassis_resident("cr-lr1-up")), action=(ct_lb_mark(backends=[[2001:db8:abcd:1::2]]:10882);) ]) -AT_CHECK([cat outside_lflows_before | grep ls_in_check_port_sec | grep priority=75 | ovn_strip_lflows], [0], [dnl - table=??(ls_in_check_port_sec), priority=75 , match=(arp.op == 1 && inport == "outside"), action=(reg0[[22]] = 1; next;) -]) - -AT_CHECK([cat outside_lflows_before | grep ls_in_apply_port_sec | grep priority=75 | ovn_strip_lflows], [0], [dnl - table=??(ls_in_apply_port_sec), priority=75 , match=(reg0[[22]] == 1 && is_chassis_resident("cr-lr1-up")), action=(next;) -]) - check ovn-nbctl clear logical_router_port $lr1_up_uuid ha_chassis_group check ovn-nbctl ha-chassis-group-del gateway check ovn-nbctl ha-chassis-group-add gateway2 @@ -20318,14 +20310,6 @@ AT_CHECK([cat lr1_lflows_after | grep lr_in_dnat | grep priority=120 | ovn_strip table=??(lr_in_dnat ), priority=120 , match=(ct.new && !ct.rel && ip6 && ip6.dst == 2000::1 && reg1[[16..23]] == 6 && reg1[[0..15]] == 80 && is_chassis_resident("cr-lr1-up")), action=(ct_lb_mark(backends=[[2001:db8:abcd:1::2]]:10882);) ]) -AT_CHECK([cat outside_lflows_after | grep ls_in_check_port_sec | grep priority=75 | ovn_strip_lflows], [0], [dnl - table=??(ls_in_check_port_sec), priority=75 , match=(arp.op == 1 && inport == "outside"), action=(reg0[[22]] = 1; next;) -]) - -AT_CHECK([cat outside_lflows_after | grep ls_in_apply_port_sec | grep priority=75 | ovn_strip_lflows], [0], [dnl - table=??(ls_in_apply_port_sec), priority=75 , match=(reg0[[22]] == 1), action=(next;) -]) - check ovn-nbctl --wait=sb set load_balancer lb1_ipv6 options:distributed=true ovn-sbctl lflow-list outside > outside_lflows_after -- 2.48.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
