[ovs-dev] [PATCH ovn] ovn.at: Fix flaky tests "VLAN transparency, passthru=true, multiple hosts"

Mark Gray mark.d.gray at redhat.com
Fri Oct 1 15:12:40 UTC 2021


On 01/10/2021 14:26, Xavier Simonart wrote:
> Tests were waiting for ports to be reported up before sending packets.
> However, waiting for both ports to be up is not enough to guarantee
> that all flows are installed for both ports.
> We now wait for last flows (implementing switching to localnet port)
> are installed.
> Following tests were are fixed:
> - VLAN transparency, passthru=true, multiple hosts
> - VLAN transparency, passthru=true, multiple hosts, custom ethtype
> - VLAN transparency, passthru=true, multiple hosts, flat/untagged
> 
> Signed-off-by: Xavier Simonart <xsimonar at redhat.com>
> ---
Looks good other than the comment I have in:
(ovn.at: Fix flaky test "controller I-P handling with monitoring disabled")

https://mail.openvswitch.org/pipermail/ovs-dev/2021-October/388223.html

>  tests/ovn.at | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/ovn.at b/tests/ovn.at
> index fc8f31d06..cc940701f 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -3413,6 +3413,14 @@ for i in 1 2; do
>                                    options:rxq_pcap=vif$i-rx.pcap \
>                                    ofport-request=$i
>      OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
> +    # Waiting for both ports to be up is not enough to guarantee that all flows are installed.
> +    # Wait for flows implementing switching to localnet port.
> +    OVS_WAIT_UNTIL([
> +        test $(as hv-$i ovs-ofctl dump-flows br-int | \
> +        grep "table=38" | \
> +        grep "resubmit(,38)" -c) -eq 1
> +    ])
> +
>  done
>  
>  test_packet() {
> @@ -3478,8 +3486,13 @@ for i in 1 2; do
>                                    options:rxq_pcap=vif$i-rx.pcap \
>                                    ofport-request=$i
>      wait_for_ports_up lsp$i
> -done
> +    OVS_WAIT_UNTIL([
> +        test $(ovs-ofctl dump-flows br-int | \
> +        grep "table=38" | \
> +        grep "resubmit(,38)" -c) -eq 1
> +    ])
>  
> +done
>  # create taps on fabric to check vlan encapsulation there
>  for i in 1 2; do
>      as hv-$i
> @@ -3561,6 +3574,12 @@ for i in 1 2; do
>                                    options:rxq_pcap=vif$i-rx.pcap \
>                                    ofport-request=$i
>      OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
> +    OVS_WAIT_UNTIL([
> +        test $(ovs-ofctl dump-flows br-int | \
> +        grep "table=38" | \
> +        grep "resubmit(,38)" -c) -eq 1
> +    ])
> +
>  done
>  
>  for i in 1 2; do
> 



More information about the dev mailing list