Fixes: e457633d3013 ("en-advertised-route-sync: Advertise routes for all NAT/LB
IPs owned by routers.")
Fixes: a999668e0f31 ("tests: Replace router and localnet port definitions with
the helper commands.")
Signed-off-by: Dumitru Ceara <[email protected]>
---
tests/multinode.at | 14 +++++++-------
tests/ovn-northd.at | 18 +++++++++---------
tests/ovn.at | 22 +++++++++++-----------
tests/system-ovn.at | 44 ++++++++++++++++++++++----------------------
4 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/tests/multinode.at b/tests/multinode.at
index 2ff624f281..83367e534e 100644
--- a/tests/multinode.at
+++ b/tests/multinode.at
@@ -3584,9 +3584,9 @@ check multinode_nbctl --wait=hv
\
-- lr-add lr \
-- lrp-add lr lr-ls 00:00:00:01:00:00 10.0.0.1/24 \
-- lrp-add lr lr-ls-int 00:00:00:02:00:00 20.0.0.1/24 \
- -- lsp-add-router-port ls ls-lr lr-ls \
+ -- lsp-add-router-port ls ls-lr lr-ls \
-- ls-add ls-int \
- -- lsp-add-router-port ls-int ls-int-lr lr-ls-int \
+ -- lsp-add-router-port ls-int ls-int-lr lr-ls-int \
-- lsp-add ls-int w-int1 \
-- lsp-set-addresses w-int1 "00:00:00:02:00:01 20.0.0.11" \
-- lsp-add ls-int w-int2 \
@@ -3742,11 +3742,11 @@ check multinode_nbctl
\
-- lrp-add lr lr-int2 00:00:00:00:01:02 30.0.2.1/24 \
-- lrp-set-options lr-int2 dynamic-routing-redistribute=connected \
-- ls-add ls \
- -- lsp-add-localnet-port ls ls-ln public \
- -- lsp-add-router-port ls ls-lr-gw1 lr-gw1 \
- -- lsp-add-router-port ls ls-lr-gw2 lr-gw2 \
+ -- lsp-add-localnet-port ls ls-ln public \
+ -- lsp-add-router-port ls ls-lr-gw1 lr-gw1 \
+ -- lsp-add-router-port ls ls-lr-gw2 lr-gw2 \
-- ls-add ls-int1 \
- -- lsp-add-router-port ls-int1 ls-int1-lr lr-int1 \
+ -- lsp-add-router-port ls-int1 ls-int1-lr lr-int1 \
-- ls-add ls-int2 \
-- lsp-add-router-port ls-int2 ls-int2-lr lr-int2
@@ -3925,7 +3925,7 @@ check multinode_nbctl lsp-add ls1 ls1p3
check multinode_nbctl lsp-set-addresses ls1p3 "00:00:00:01:03:02 192.168.1.3
2001::3"
check multinode_nbctl lrp-add lr1 lr1-pub 0a:0a:56:33:02:ff 172.18.86.254/24
6812:86::254/64
check multinode_nbctl ls-add pub \
- -- lsp-add-router-port pub pub-lr1 lr1-pub \
+ -- lsp-add-router-port pub pub-lr1 lr1-pub \
-- lsp-add-localnet-port pub pub-ln public
check multinode_nbctl lrp-set-gateway-chassis lr1-pub ovn-chassis-2
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index 477064241c..15bc82d58d 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -10736,10 +10736,10 @@ check ovn-nbctl
\
-- lrp-add r1 r1_s2 00:de:ad:fe:00:02 173.0.2.1/24 \
\
-- ls-add s1 \
- -- lsp-add-router-port s1 s1_r1 r1_s1 \
+ -- lsp-add-router-port s1 s1_r1 r1_s1 \
\
-- ls-add s2 \
- -- lsp-add-router-port s2 s2_r1 r1_s2 \
+ -- lsp-add-router-port s2 s2_r1 r1_s2 \
\
-- lsp-add s1 vm1 \
-- lsp-set-addresses vm1 "00:de:ad:01:00:01 173.0.1.2" \
@@ -15624,12 +15624,12 @@ check ovn-nbctl --wait=sb
\
-- lr-add internal-lr \
-- lrp-add internal-lr internal-lrp 00:00:00:00:00:01 1.1.1.1/24 \
-- ls-add internal-ls \
- -- lsp-add-router-port internal-ls internal-ls-lrp internal-lrp \
- -- lsp-add-router-port internal-ls internal-ls-lla-lrp lla-lrp \
+ -- lsp-add-router-port internal-ls internal-ls-lrp internal-lrp \
+ -- lsp-add-router-port internal-ls internal-ls-lla-lrp lla-lrp \
-- lsp-add internal-ls internal-ls-localnet \
-- lsp-set-type internal-ls-localnet localnet \
-- ls-add public-ls \
- -- lsp-add-router-port public-ls public-ls-lrp public-lrp \
+ -- lsp-add-router-port public-ls public-ls-lrp public-lrp \
-- lsp-add public-ls public-ls-localnet \
-- lsp-set-type public-ls-localnet localnet \
-- lr-add public-lr \
@@ -16748,14 +16748,14 @@ dnl lr-ext1 lr-ext2 lr-ext3 lr-ext4 lr-ext5 (with
NAT/LB configured)
check ovn-nbctl \
-- lr-add lr-int \
- -- set logical_router lr-int options:chassis=hv1 \
- -- lrp-add lr-int lrp-int 00:00:00:00:00:01 10.0.0.1/24 \
+ -- set logical_router lr-int options:chassis=hv1 \
+ -- lrp-add lr-int lrp-int 00:00:00:00:00:01 10.0.0.1/24 \
-- lr-nat-add lr-int dnat_and_snat 10.0.0.42 1.1.1.1 \
-- lb-add lb-int 30.0.0.1 1.1.1.1 \
-- lr-lb-add lr-int lb-int \
-- ls-add ls-int \
- -- lsp-add-router-port ls-int lsp-internal lrp-int \
- -- lsp-add-router-port ls-int lsp-bgp lrp-bgp-internal \
+ -- lsp-add-router-port ls-int lsp-internal lrp-int \
+ -- lsp-add-router-port ls-int lsp-bgp lrp-bgp-internal \
-- lr-add lr-bgp \
-- set logical_router lr-bgp options:chassis=hv1 \
-- lrp-add lr-bgp lrp-bgp-internal 00:00:00:00:00:02 10.0.0.2/24
diff --git a/tests/ovn.at b/tests/ovn.at
index 6aff32dc05..0a36713683 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -25042,7 +25042,7 @@ ovn_start
check ovn-nbctl \
-- ls-add sw1 \
- -- lsp-add-localnet-port sw1 sw1-ln phys-1 \
+ -- lsp-add-localnet-port sw1 sw1-ln phys-1 \
-- lsp-add sw1 sw1-p1 \
-- lsp-add sw1 sw1-p2 \
-- lsp-add sw1 sw1-p3 \
@@ -36134,10 +36134,10 @@ check ovn-nbctl
\
-- set logical_router lr options:mac_binding_age_threshold=3600 \
-- lrp-add lr lr-ls1 00:00:00:00:10:00 192.168.10.1/24 \
-- lrp-add lr lr-ls2 00:00:00:00:20:00 192.168.20.1/24 \
- -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
+ -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
-- lsp-add ls1 vif1 \
-- lsp-set-addresses vif1 "00:00:00:00:10:10 192.168.10.10" \
- -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
+ -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
-- lsp-add ls2 vif2 \
-- lsp-set-addresses vif2 "00:00:00:00:20:10 192.168.20.10"
@@ -36228,10 +36228,10 @@ check ovn-nbctl
\
-- set logical_router lr options:mac_binding_age_threshold=4 \
-- lrp-add lr lr-ls1 00:00:00:00:10:00 192.168.10.1/24 \
-- lrp-add lr lr-ls2 00:00:00:00:20:00 192.168.20.1/24 \
- -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
+ -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
-- lsp-add ls1 vif1 \
-- lsp-set-addresses vif1 "00:00:00:00:10:10 192.168.10.10" \
- -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
+ -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
-- lsp-add ls2 vif2 \
-- lsp-set-addresses vif2 "00:00:00:00:20:10 192.168.20.10"
@@ -36302,7 +36302,7 @@ check ovn-nbctl
\
-- lr-add lr \
-- set logical_router lr options:mac_binding_age_threshold=4 \
-- lrp-add lr lr-ls1 00:00:00:00:10:00 192.168.10.1/24 \
- -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
+ -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
-- lsp-add ls1 vif1 \
-- lsp-set-addresses vif1 "00:00:00:00:10:10 192.168.10.10"
@@ -36397,10 +36397,10 @@ check ovn-nbctl
\
-- set logical_router lr options:mac_binding_age_threshold=$aging_th \
-- lrp-add lr lr-ls1 00:00:00:00:10:00 192.168.10.1/24 fd11::1/64 \
-- lrp-add lr lr-ls2 00:00:00:00:20:00 192.168.20.1/24 fd12::1/64 \
- -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
+ -- lsp-add-router-port ls1 ls1-lr lr-ls1 \
-- lsp-add ls1 vif1 \
-- lsp-set-addresses vif1 "unknown" \
- -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
+ -- lsp-add-router-port ls2 ls2-lr lr-ls2 \
-- lsp-add ls2 vif2 \
-- lsp-set-addresses vif2 "unknown"
@@ -36545,12 +36545,12 @@ check ovn-nbctl
\
-- set logical_router gw options:dynamic_neigh_routers=true \
-- lrp-add gw gw-public 00:00:00:00:10:00 192.168.10.1/24 fd11::1/64 \
-- lrp-add gw gw-join 00:00:00:00:20:00 192.168.20.1/24 fd12::1/64 \
- -- lsp-add-router-port public public-gw gw-public \
+ -- lsp-add-router-port public public-gw gw-public \
-- lsp-add public public \
-- lsp-set-addresses public "unknown" \
- -- lsp-add-router-port join join-gw gw-join \
+ -- lsp-add-router-port join join-gw gw-join \
-- lrp-add lr lr-join 00:00:00:00:30:00 192.168.20.2/24 fd12::2/64 \
- -- lsp-add-router-port join join-lr lr-join \
+ -- lsp-add-router-port join join-lr lr-join \
-- lr-route-add lr 0.0.0.0/0 192.168.20.1 \
-- lr-route-add lr ::/0 fd12::1
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 78d12cbdc4..652f21c0a2 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -6007,7 +6007,7 @@ check ovn-nbctl
\
-- lr-add rtr \
-- lrp-add rtr rtr-ls 00:00:00:00:01:00 42.42.42.1/24 \
-- ls-add ls \
- -- lsp-add-router-port ls ls-rtr rtr-ls \
+ -- lsp-add-router-port ls ls-rtr rtr-ls \
-- lsp-add ls vm1 -- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-add ls vm2 -- lsp-set-addresses vm2 00:00:00:00:00:02 \
-- lb-add lb-test 66.66.66.66:666 42.42.42.2:4242 tcp \
@@ -6114,7 +6114,7 @@ check ovn-nbctl
\
-- lr-add rtr \
-- lrp-add rtr rtr-ls 00:00:00:00:01:00 4242::1/64 \
-- ls-add ls \
- -- lsp-add-router-port ls ls-rtr rtr-ls \
+ -- lsp-add-router-port ls ls-rtr rtr-ls \
-- lsp-add ls vm1 -- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-add ls vm2 -- lsp-set-addresses vm2 00:00:00:00:00:02 \
-- lb-add lb-test [[6666::1]]:666 [[4242::2]]:4242 tcp \
@@ -9513,11 +9513,11 @@ check ovn-nbctl
\
-- lrp-add rtr rtr-ls1 00:00:00:00:01:00 42.42.42.1/24 \
-- lrp-add rtr rtr-ls2 00:00:00:00:02:00 43.43.43.1/24 \
-- ls-add ls1 \
- -- lsp-add-router-port ls1 ls1-rtr rtr-ls1 \
+ -- lsp-add-router-port ls1 ls1-rtr rtr-ls1 \
-- lsp-add ls1 vm1 -- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-add ls1 vm2 -- lsp-set-addresses vm2 00:00:00:00:00:02 \
-- ls-add ls2 \
- -- lsp-add-router-port ls2 ls2-rtr rtr-ls2 \
+ -- lsp-add-router-port ls2 ls2-rtr rtr-ls2 \
-- lsp-add ls2 vm3 -- lsp-set-addresses vm3 00:00:00:00:00:03
# Add a TCP template LB that eventually expands to:
@@ -9658,11 +9658,11 @@ check ovn-nbctl
\
-- lrp-add rtr rtr-ls1 00:00:00:00:01:00 4242::1/64 \
-- lrp-add rtr rtr-ls2 00:00:00:00:02:00 4343::1/64 \
-- ls-add ls1 \
- -- lsp-add-router-port ls1 ls1-rtr rtr-ls1 \
+ -- lsp-add-router-port ls1 ls1-rtr rtr-ls1 \
-- lsp-add ls1 vm1 -- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-add ls1 vm2 -- lsp-set-addresses vm2 00:00:00:00:00:02 \
-- ls-add ls2 \
- -- lsp-add-router-port ls2 ls2-rtr rtr-ls2 \
+ -- lsp-add-router-port ls2 ls2-rtr rtr-ls2 \
-- lsp-add ls2 vm3 -- lsp-set-addresses vm3 00:00:00:00:00:03
# Add a template LB that eventually expands to:
@@ -13166,7 +13166,7 @@ check ovn-nbctl
\
-- lr-add rtr \
-- lrp-add rtr rtr-ls 00:00:00:00:01:00 42.42.42.1/24 \
-- ls-add ls \
- -- lsp-add-router-port ls ls-rtr rtr-ls \
+ -- lsp-add-router-port ls ls-rtr rtr-ls \
-- lsp-add ls vm1 -- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-add ls vm2 -- lsp-set-addresses vm2 00:00:00:00:00:02 \
-- lb-add lb1 43.43.43.43:1000 42.42.42.3:1000 udp \
@@ -13757,7 +13757,7 @@ check ovn-nbctl \
-- lsp-add ls2 vm2 \
-- lsp-set-addresses vm1 00:00:00:00:00:01 \
-- lsp-set-addresses vm2 00:00:00:00:00:02 \
- -- lsp-add-router-port ls1 ls1-lr lrp1 \
+ -- lsp-add-router-port ls1 ls1-lr lrp1 \
-- lsp-add-router-port ls2 ls2-lr lrp2
check ovn-nbctl --wait=hv sync
@@ -16530,10 +16530,10 @@ check ovn-nbctl \
-- lrp-add R1 r1-join 00:00:00:00:ff:02 \
-- lrp-set-options r1-join dynamic-routing-redistribute=lb \
-- ls-add ls-join \
- -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
-- lr-add R2 \
-- lrp-add R2 r2-join 00:00:00:00:fe:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
-- lrp-set-gateway-chassis r2-join hv1
# Create a load balancer and associate to R2.
@@ -16690,10 +16690,10 @@ check ovn-nbctl \
-- lrp-add R1 r1-join 00:00:00:00:ff:02 \
-- lrp-set-options r1-join dynamic-routing-redistribute=lb \
-- ls-add ls-join \
- -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
-- lr-add R2 \
-- lrp-add R2 r2-join 00:00:00:00:fe:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
-- lrp-set-gateway-chassis r2-join hv1
# Create a load balancer and associate to R2.
@@ -16849,10 +16849,10 @@ check ovn-nbctl
\
-- lrp-add R1 r1-join 00:00:00:00:ff:02 \
-- lrp-set-options r1-join dynamic-routing-redistribute=nat \
-- ls-add ls-join \
- -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
-- lr-add R2 \
-- lrp-add R2 r2-join 00:00:00:00:fe:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
-- ha-chassis-group-add g1 \
-- ha-chassis-group-add-chassis g1 hv1 10
@@ -16933,9 +16933,9 @@ blackhole 172.16.1.11 proto ovn metric 1000])
check ovn-nbctl \
-- lrp-add R2 r2-guest 00:00:00:00:fd:02 192.168.2.1/24 \
-- lrp-add R2 r2-join-dgw2 00:00:00:00:fd:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2-dgw2 r2-join-dgw2 \
+ -- lsp-add-router-port ls-join lsp-join-to-r2-dgw2 r2-join-dgw2 \
-- ls-add ls-guest \
- -- lsp-add-router-port ls-guest lsp-guest-to-r2 r2-guest \
+ -- lsp-add-router-port ls-guest lsp-guest-to-r2 r2-guest \
-- lsp-add ls-guest guest1 \
-- lsp-set-addresses guest1 '00:00:00:00:fc:03 192.168.2.10'
@@ -17082,7 +17082,7 @@ check ovn-nbctl
\
-- lsp-add-router-port ls-join lsp-join-to-r1 r1-join \
-- lr-add R2 \
-- lrp-add R2 r2-join 00:00:00:00:fe:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
+ -- lsp-add-router-port ls-join lsp-join-to-r2 r2-join \
-- ha-chassis-group-add g1 \
-- ha-chassis-group-add-chassis g1 hv1 10
@@ -17163,9 +17163,9 @@ blackhole 2001:db8:1004::153 dev lo proto ovn metric
1000 pref medium])
check ovn-nbctl \
-- lrp-add R2 r2-guest 00:00:00:00:fd:02 2001:db9:2000::1/64 \
-- lrp-add R2 r2-join-dgw2 00:00:00:00:fd:02 \
- -- lsp-add-router-port ls-join lsp-join-to-r2-dgw2 r2-join-dgw2 \
+ -- lsp-add-router-port ls-join lsp-join-to-r2-dgw2 r2-join-dgw2 \
-- ls-add ls-guest \
- -- lsp-add-router-port ls-guest lsp-guest-to-r2 r2-guest \
+ -- lsp-add-router-port ls-guest lsp-guest-to-r2 r2-guest \
-- lsp-add ls-guest guest1 \
-- lsp-set-addresses guest1 '00:00:00:00:fc:03 2001:db9:2000::10'
@@ -18625,11 +18625,11 @@ check ovn-nbctl
\
-- lrp-add lr3 lr3-ls3 00:00:00:00:00:13 30.0.0.1/24 \
-- lr-route-add lr3 10.0.0.0/24 fe80::200:ff:fe00:3 lr3-lr1 \
-- ls-add ls1 \
- -- lsp-add-router-port ls1 ls1-lr1 lr1-ls1 \
+ -- lsp-add-router-port ls1 ls1-lr1 lr1-ls1 \
-- ls-add ls2 \
- -- lsp-add-router-port ls2 ls2-lr2 lr2-ls2 \
+ -- lsp-add-router-port ls2 ls2-lr2 lr2-ls2 \
-- ls-add ls3 \
- -- lsp-add-router-port ls3 ls3-lr3 lr3-ls3 \
+ -- lsp-add-router-port ls3 ls3-lr3 lr3-ls3 \
-- lsp-add ls1 vm1 \
-- lsp-set-addresses vm1 "00:00:00:00:01:00 10.0.0.2" \
-- lsp-add ls2 vm2 \
--
2.51.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
