On Thu, Feb 27, 2025 at 12:30:10PM +0100, Dumitru Ceara wrote:
> On 2/27/25 11:29 AM, Felix Huettner via dev wrote:
> > The rt_proto 84 has been claimed upstream for OVN. This mapping is now
> > being added to iproute2 [1].
> > Once this is merged "ip route list" will show "proto ovn" instead of
> > "proto 84". Since this depends on the iproute2 version we handle both
> > cases in the tests.
> > 
> > [1]: 
> > https://patchwork.kernel.org/project/netdevbpf/patch/z77szialjemsn...@sit-sdelap4051.int.lidl.net/
> > 
> > Signed-off-by: Felix Huettner <felix.huettner@stackit.cloud>
> > ---
> 
> Hi Felix,
> 
> >  tests/system-ovn.at | 276 ++++++++++++++++++++++----------------------
> >  1 file changed, 140 insertions(+), 136 deletions(-)
> > 
> > diff --git a/tests/system-ovn.at b/tests/system-ovn.at
> > index 9982da7fe..4f2fcc05b 100644
> > --- a/tests/system-ovn.at
> > +++ b/tests/system-ovn.at
> > @@ -16082,9 +16082,11 @@ ovnvrf1337 1337
> >  
> >  # "ip route list" output has a trailing space on each line.
> >  # The awk magic removes all trailing spaces.
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.0/24 proto 84 metric 1000
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +# We need to convert "proto 84" to "proto ovn" as the output depend on the
> > +# iproute version.
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> 
> Maybe we should add a helper to hide this sed, see other examples like
> ovn_strip_lflows() or ovn_strip_collector_set() in ovn-macros.at.  Maybe
> we can also hide the "cryptic" "awk '{$1=$1};1'" while we're at it (with
> a comment of course :) ).

Hi Dumitru,

i'll do that in the next version.

Thanks a lot,
Felix

> 
> Regards,
> Dumitru
> 
> > +blackhole 192.0.2.0/24 proto ovn metric 1000
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # We now switch to announcing host routes and expect 192.0.2.0/24 to be 
> > gone
> >  # and the following to be added:
> > @@ -16097,34 +16099,34 @@ blackhole 198.51.100.0/24 proto 84 metric 1000])
> >  check ovn-nbctl --wait=hv set Logical_Router_Port internet-public \
> >      options:dynamic-routing-redistribute="connected-as-host,static"
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # If the pr1-public lrp is now removed from this hypervisor the route 
> > metric
> >  # will go back to the default.
> >  # For this we just schedule it on a non existing chassis.
> >  check ovn-nbctl lrp-del-gateway-chassis pr1-public hv1
> >  check ovn-nbctl --wait=hv lrp-set-gateway-chassis pr1-public hv123
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 1000
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 1000
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 1000
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 1000
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # Moving pr1-public back will also change the route metrics again.
> >  check ovn-nbctl lrp-del-gateway-chassis pr1-public hv123
> >  check ovn-nbctl --wait=hv lrp-set-gateway-chassis pr1-public hv1
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # Disable maintaining the vrf as some tests below would cause the vrfs to 
> > be
> >  # removed.
> > @@ -16179,7 +16181,7 @@ check_row_count Learned_Route 1 
> > ip_prefix=233.253.0.0/24 nexthop=192.168.20.20
> >  check ovn-nbctl --wait=hv set Logical_Router_Port internet-phys \
> >                               options:dynamic-routing-maintain-vrf=false
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> > -AT_CHECK([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [0], [dnl
> > +AT_CHECK([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 's|proto 
> > 84|proto ovn|'], [0], [dnl
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink
> >  ])
> > @@ -16187,12 +16189,12 @@ AT_CHECK([ip route list vrf ovnvrf1337 | awk 
> > '{$1=$1};1'], [0], [dnl
> >  # Starting it again will add the routes again.
> >  start_daemon ovn-controller
> >  OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" == 
> > "running"])
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink])
> >  
> > @@ -16203,24 +16205,24 @@ check ovn-nbctl --wait=hv set Logical_Router_Port 
> > internet-phys \
> >  check ovn-nbctl --wait=hv set Logical_Router internet \
> >      options:dynamic-routing-vrf-name=ovnvrf1338
> >  AT_CHECK([ip vrf | grep -q ovnvrf1337], [1], [])
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1338 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1338 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink])
> >  
> >  # Stoping with --restart will not touch the routes.
> >  check ovn-appctl -t ovn-controller exit --restart
> >  OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != 
> > "running"])
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1338 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 1000
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1338 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 1000
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink])
> >  
> > @@ -16412,9 +16414,11 @@ ovnvrf1337 1337
> >  
> >  # "ip route list" output has a trailing space on each line.
> >  # The awk magic removes all trailing spaces.
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.0/24 proto 84 metric 1000
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +# We need to convert "proto 84" to "proto ovn" as the output depend on the
> > +# iproute version.
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.0/24 proto ovn metric 1000
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # We now switch to announcing host routes and expect 192.0.2.0/24 to be 
> > gone
> >  # and the following to be added:
> > @@ -16427,34 +16431,34 @@ blackhole 198.51.100.0/24 proto 84 metric 1000])
> >  check ovn-nbctl --wait=hv set Logical_Router_Port internet-public \
> >      options:dynamic-routing-redistribute="connected-as-host,static"
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 100
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 100
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # If the pr1-public lrp is now removed from this hypervisor the route 
> > metric
> >  # will go back to the default.
> >  # For this we just schedule it on a non existing chassis.
> >  check ovn-nbctl lrp-del-gateway-chassis pr1-public hv1
> >  check ovn-nbctl --wait=hv lrp-set-gateway-chassis pr1-public hv123
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 100
> > -blackhole 192.0.2.2 proto 84 metric 1000
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 1000
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 100
> > +blackhole 192.0.2.2 proto ovn metric 1000
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 1000
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # Moving pr1-public back will also change the route metrics again.
> >  check ovn-nbctl lrp-del-gateway-chassis pr1-public hv123
> >  check ovn-nbctl --wait=hv lrp-set-gateway-chassis pr1-public hv1
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 100
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 100
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000])
> >  
> >  # Disable maintaining the vrf as some tests below would cause the vrfs to 
> > be
> >  # removed.
> > @@ -16509,7 +16513,7 @@ check_row_count Learned_Route 1 
> > ip_prefix=233.253.0.0/24 nexthop=192.168.20.20
> >  check ovn-nbctl --wait=hv set Logical_Router_Port internet-phys \
> >                               options:dynamic-routing-maintain-vrf=false
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> > -AT_CHECK([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [0], [dnl
> > +AT_CHECK([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 's|proto 
> > 84|proto ovn|'], [0], [dnl
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink
> >  ])
> > @@ -16517,24 +16521,24 @@ AT_CHECK([ip route list vrf ovnvrf1337 | awk 
> > '{$1=$1};1'], [0], [dnl
> >  # Starting it again will add the routes again.
> >  start_daemon ovn-controller
> >  OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" == 
> > "running"])
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 100
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 100
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink])
> >  
> >  # Stoping with --restart will not touch the routes.
> >  check ovn-appctl -t ovn-controller exit --restart
> >  OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != 
> > "running"])
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1'], [dnl
> > -blackhole 192.0.2.1 proto 84 metric 100
> > -blackhole 192.0.2.2 proto 84 metric 100
> > -blackhole 192.0.2.3 proto 84 metric 100
> > -blackhole 192.0.2.10 proto 84 metric 100
> > -blackhole 198.51.100.0/24 proto 84 metric 1000
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf1337 | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 192.0.2.1 proto ovn metric 100
> > +blackhole 192.0.2.2 proto ovn metric 100
> > +blackhole 192.0.2.3 proto ovn metric 100
> > +blackhole 192.0.2.10 proto ovn metric 100
> > +blackhole 198.51.100.0/24 proto ovn metric 1000
> >  233.252.0.0/24 via 192.168.10.10 dev lo onlink
> >  233.253.0.0/24 via 192.168.20.20 dev hv1-mll onlink])
> >  
> > @@ -16631,8 +16635,8 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 172.16.1.150 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 172.16.1.150 proto ovn metric 1000])
> >  
> >  # Add distributed router connected through "join" LS and ensure
> >  # that its LB VIPs are redistributed by R1. LS join has no
> > @@ -16662,9 +16666,9 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 10.42.10.10 proto 84 metric 100
> > -blackhole 172.16.1.150 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 10.42.10.10 proto ovn metric 100
> > +blackhole 172.16.1.150 proto ovn metric 1000])
> >  
> >  # Move DGW of R2 to another chassis to verify that route priority 
> > decreases.
> >  check ovn-nbctl                              \
> > @@ -16672,9 +16676,9 @@ check ovn-nbctl                              \
> >      -- lrp-set-gateway-chassis r2-join hv123
> >  check ovn-nbctl --wait=hv sync
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 10.42.10.10 proto 84 metric 1000
> > -blackhole 172.16.1.150 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 10.42.10.10 proto ovn metric 1000
> > +blackhole 172.16.1.150 proto ovn metric 1000])
> >  
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> >  
> > @@ -16769,8 +16773,8 @@ check ovn-nbctl --wait=hv sync
> >  AT_CHECK([ip link | grep -q ovnvrf1001:.*UP])
> >  AT_CHECK([test `ip -6 route show table 1001 | wc -l` -eq 1])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1001::150 dev lo proto 84 metric 1000 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1001::150 dev lo proto ovn metric 1000 pref medium])
> >  
> >  # Add distributed router connected through "join" LS and ensure
> >  # that its LB VIPs are redistributed by R1. LS join has no
> > @@ -16800,9 +16804,9 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1001::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:3001::150 dev lo proto 84 metric 100 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1001::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:3001::150 dev lo proto ovn metric 100 pref medium])
> >  
> >  # Move DGW of R2 to another chassis to verify that route priority 
> > decreases.
> >  check ovn-nbctl                              \
> > @@ -16810,9 +16814,9 @@ check ovn-nbctl                              \
> >      -- lrp-set-gateway-chassis r2-join hv123
> >  check ovn-nbctl --wait=hv sync
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1001::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:3001::150 dev lo proto 84 metric 1000 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1001::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:3001::150 dev lo proto ovn metric 1000 pref medium])
> >  
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> >  
> > @@ -16905,9 +16909,9 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 172.16.1.10 proto 84 metric 1000
> > -blackhole 172.16.1.11 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 172.16.1.10 proto ovn metric 1000
> > +blackhole 172.16.1.11 proto ovn metric 1000])
> >  
> >  # Add distributed router connected through "join" LS and ensure
> >  # that its external NAT IPs are redistributed by R1. LS join has no
> > @@ -16950,13 +16954,13 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 10.42.10.10 proto 84 metric 100
> > -blackhole 10.42.10.11 proto 84 metric 100
> > -blackhole 10.42.10.12 proto 84 metric 100
> > -blackhole 10.42.10.13 proto 84 metric 100
> > -blackhole 172.16.1.10 proto 84 metric 1000
> > -blackhole 172.16.1.11 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 10.42.10.10 proto ovn metric 100
> > +blackhole 10.42.10.11 proto ovn metric 100
> > +blackhole 10.42.10.12 proto ovn metric 100
> > +blackhole 10.42.10.13 proto ovn metric 100
> > +blackhole 172.16.1.10 proto ovn metric 1000
> > +blackhole 172.16.1.11 proto ovn metric 1000])
> >  
> >  # Move DGW of R2 to another chassis to verify that route priority 
> > decreases.
> >  check ovn-nbctl                             \
> > @@ -16964,13 +16968,13 @@ check ovn-nbctl                             \
> >    -- ha-chassis-group-remove-chassis g1 hv1
> >  check ovn-nbctl --wait=hv sync
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 10.42.10.10 proto 84 metric 1000
> > -blackhole 10.42.10.11 proto 84 metric 1000
> > -blackhole 10.42.10.12 proto 84 metric 1000
> > -blackhole 10.42.10.13 proto 84 metric 1000
> > -blackhole 172.16.1.10 proto 84 metric 1000
> > -blackhole 172.16.1.11 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 10.42.10.10 proto ovn metric 1000
> > +blackhole 10.42.10.11 proto ovn metric 1000
> > +blackhole 10.42.10.12 proto ovn metric 1000
> > +blackhole 10.42.10.13 proto ovn metric 1000
> > +blackhole 172.16.1.10 proto ovn metric 1000
> > +blackhole 172.16.1.11 proto ovn metric 1000])
> >  
> >  # Add "guest" LS connected the distributed router R2 and one "VM" called
> >  # guest1.
> > @@ -17010,12 +17014,12 @@ check ovn-nbctl --wait=hv sync
> >  # 10.42.10.12 and 10.42.10.13 have become invalid so ovn shouldn't
> >  # advertise them anymore.
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1'], [dnl
> > -blackhole 10.42.10.10 proto 84 metric 1000
> > -blackhole 10.42.10.11 proto 84 metric 1000
> > -blackhole 10.42.20.11 proto 84 metric 100
> > -blackhole 172.16.1.10 proto 84 metric 1000
> > -blackhole 172.16.1.11 proto 84 metric 1000])
> > +OVS_WAIT_UNTIL_EQUAL([ip route list vrf ovnvrf$vrf | awk '{$1=$1};1' | sed 
> > 's|proto 84|proto ovn|'], [dnl
> > +blackhole 10.42.10.10 proto ovn metric 1000
> > +blackhole 10.42.10.11 proto ovn metric 1000
> > +blackhole 10.42.20.11 proto ovn metric 100
> > +blackhole 172.16.1.10 proto ovn metric 1000
> > +blackhole 172.16.1.11 proto ovn metric 1000])
> >  
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> >  
> > @@ -17108,9 +17112,9 @@ check ovn-nbctl                                     
> >                     \
> >  check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1003::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1003::151 dev lo proto 84 metric 1000 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium])
> >  
> >  # Add distributed router connected through "join" LS and ensure
> >  # that its external NAT IPs are redistributed by R1. LS join has no
> > @@ -17153,13 +17157,13 @@ check ovn-nbctl --wait=hv sync
> >  
> >  AT_CHECK([ip link | grep -q ovnvrf$vrf:.*UP])
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1003::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1003::151 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::150 dev lo proto 84 metric 100 pref medium
> > -blackhole 2001:db8:1004::151 dev lo proto 84 metric 100 pref medium
> > -blackhole 2001:db8:1004::152 dev lo proto 84 metric 100 pref medium
> > -blackhole 2001:db8:1004::153 dev lo proto 84 metric 100 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::150 dev lo proto ovn metric 100 pref medium
> > +blackhole 2001:db8:1004::151 dev lo proto ovn metric 100 pref medium
> > +blackhole 2001:db8:1004::152 dev lo proto ovn metric 100 pref medium
> > +blackhole 2001:db8:1004::153 dev lo proto ovn metric 100 pref medium])
> >  
> >  # Move DGW of R2 to another chassis to verify that route priority 
> > decreases.
> >  check ovn-nbctl                             \
> > @@ -17167,13 +17171,13 @@ check ovn-nbctl                             \
> >    -- ha-chassis-group-remove-chassis g1 hv1
> >  check ovn-nbctl --wait=hv sync
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1003::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1003::151 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::151 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::152 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::153 dev lo proto 84 metric 1000 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::151 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::152 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::153 dev lo proto ovn metric 1000 pref medium])
> >  
> >  # Add "guest" LS connected the distributed router R2 and one "VM" called
> >  # guest1.
> > @@ -17213,12 +17217,12 @@ check ovn-nbctl --wait=hv sync
> >  # 2001:db8:1004::152 and 2001:db8:1004::153 have become invalid so ovn
> >  # shouldn't advertise them anymore.
> >  
> > -OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1'], 
> > [dnl
> > -blackhole 2001:db8:1003::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1003::151 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::150 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1004::151 dev lo proto 84 metric 1000 pref medium
> > -blackhole 2001:db8:1005::150 dev lo proto 84 metric 100 pref medium])
> > +OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf ovnvrf$vrf | awk '{$1=$1};1' | 
> > sed 's|proto 84|proto ovn|'], [dnl
> > +blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::150 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1004::151 dev lo proto ovn metric 1000 pref medium
> > +blackhole 2001:db8:1005::150 dev lo proto ovn metric 100 pref medium])
> >  
> >  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> >  # Ensure system resources are cleaned up.
> 
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to