On 6/29/26 2:40 PM, Xavier Simonart via dev wrote:
> The test was checking for datapath flows potentially before packets went
> through the whole pipeline (e.g. packets might be delayed in "main"
> switch).
> The patch waits for packets to be received at destination before checking
> datapaths.
>
> Fixes: a2db2b2f263a ("northd: Add support for spine-leaf logical switch
> topology.")
> Signed-off-by: Xavier Simonart <[email protected]>
> ---
> tests/ovn.at | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 2ec07b7ae..9cf51534f 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -8420,6 +8420,15 @@ check as hv1 ovs-appctl netdev-dummy/receive vif1
> $packet
> wait_row_count FDB 3
> check ovn-nbctl --wait=hv sync
>
> +# No modifications expected.
> +AT_CHECK([echo $packet > expected])
> +
> +AT_CHECK([touch empty])
nit: This should be done closer to the use.
> +
> +# Check that it is delivered where needed.
> +OVN_CHECK_PACKETS([hv2/vif3-tx.pcap], [expected])
> +OVN_CHECK_PACKETS([hv3/vif5-tx.pcap], [expected])
> +
> # It's a little problematic to trace the other side, but we can check
> datapath
> # actions. Note: 'actions:br-phys' is a stray tunnel packet destined for the
> # other node, but OVS from the 'main' namespace didn't learn addresses yet,
> @@ -8437,17 +8446,10 @@ actions:tnl_pop(genev_sys_6081)
> actions:vif5
> ])
>
> -# No modifications expected.
> -AT_CHECK([echo $packet > expected])
> -
> -AT_CHECK([touch empty])
> -
> -# Check that it is delivered where needed and not delivered where not.
> +# Check that it is not delivered where not.
nit: This sentence doesn't make much sense after the middle of it got removed.
It's a little too far from the previous one.
> OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [empty])
> OVN_CHECK_PACKETS([hv1/vif2-tx.pcap], [empty])
> -OVN_CHECK_PACKETS([hv2/vif3-tx.pcap], [expected])
> OVN_CHECK_PACKETS([hv2/vif4-tx.pcap], [empty])
> -OVN_CHECK_PACKETS([hv3/vif5-tx.pcap], [expected])
>
> # Trace a reply packet.
> reply=$(fmt_pkt "Ether(dst='${src_mac}', src='${dst_mac}')/ \
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
