diff mbox series

[ovs-dev,1/3] test: fix false positive in BFD system test

Message ID 4a65e6e4b7f13bf88e7280aac93b2f7048852e57.1705487435.git.lorenzo.bianconi@redhat.com
State Changes Requested
Headers show
Series Introduce BFD support for ECMP route policy | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Lorenzo Bianconi Jan. 17, 2024, 11:11 a.m. UTC
Fix regression introduce in BFD system tests

Fixes: 1655a6c146ca ("northd, utils: support for RouteTables in LRs")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 tests/system-ovn.at | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mark Michelson Feb. 1, 2024, 9:45 p.m. UTC | #1
Thanks Lorenzo!

Acked-by: Mark Michelson <mmichels@redhat.com>

On 1/17/24 06:11, Lorenzo Bianconi wrote:
> Fix regression introduce in BFD system tests
> 
> Fixes: 1655a6c146ca ("northd, utils: support for RouteTables in LRs")
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> ---
>   tests/system-ovn.at | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/system-ovn.at b/tests/system-ovn.at
> index 9dc1f9ad2..91fe7cac1 100644
> --- a/tests/system-ovn.at
> +++ b/tests/system-ovn.at
> @@ -6831,7 +6831,7 @@ route_uuid=$(fetch_column nb:logical_router_static_route _uuid ip_prefix="100.0.
>   check ovn-nbctl --wait=hv sync
>   
>   wait_column "up" nb:bfd status logical_port=rp-public
> -OVS_WAIT_UNTIL([ovn-sbctl dump-flows R1 | grep 'match=(ip4.dst == 100.0.0.0/8)' | grep -q 172.16.1.50])
> +OVS_WAIT_UNTIL([ovn-sbctl dump-flows R1 |grep lr_in_ip_routing |grep 'ip4.dst == 100.0.0.0/8' |grep -q 172.16.1.50])
>   
>   # un-associate the bfd connection and the static route
>   check ovn-nbctl clear logical_router_static_route $route_uuid bfd
> @@ -6861,7 +6861,7 @@ stopping
>   ])
>   
>   wait_column "down" nb:bfd status logical_port=rp-public
> -OVS_WAIT_UNTIL([test "$(ovn-sbctl dump-flows R1 | grep 'match=(ip4.dst == 100.0.0.0/8)' | grep 172.16.1.50)" = ""])
> +OVS_WAIT_UNTIL([test "$(ovn-sbctl dump-flows R1 |grep lr_in_ip_routing |grep 'ip4.dst == 100.0.0.0/8' |grep 172.16.1.50)" = ""])
>   
>   # remove bfd entry
>   ovn-nbctl destroy bfd $uuid
diff mbox series

Patch

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 9dc1f9ad2..91fe7cac1 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -6831,7 +6831,7 @@  route_uuid=$(fetch_column nb:logical_router_static_route _uuid ip_prefix="100.0.
 check ovn-nbctl --wait=hv sync
 
 wait_column "up" nb:bfd status logical_port=rp-public
-OVS_WAIT_UNTIL([ovn-sbctl dump-flows R1 | grep 'match=(ip4.dst == 100.0.0.0/8)' | grep -q 172.16.1.50])
+OVS_WAIT_UNTIL([ovn-sbctl dump-flows R1 |grep lr_in_ip_routing |grep 'ip4.dst == 100.0.0.0/8' |grep -q 172.16.1.50])
 
 # un-associate the bfd connection and the static route
 check ovn-nbctl clear logical_router_static_route $route_uuid bfd
@@ -6861,7 +6861,7 @@  stopping
 ])
 
 wait_column "down" nb:bfd status logical_port=rp-public
-OVS_WAIT_UNTIL([test "$(ovn-sbctl dump-flows R1 | grep 'match=(ip4.dst == 100.0.0.0/8)' | grep 172.16.1.50)" = ""])
+OVS_WAIT_UNTIL([test "$(ovn-sbctl dump-flows R1 |grep lr_in_ip_routing |grep 'ip4.dst == 100.0.0.0/8' |grep 172.16.1.50)" = ""])
 
 # remove bfd entry
 ovn-nbctl destroy bfd $uuid