Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn-controller-vtep.at | 18 +-
tests/ovn-ic.at | 154 +++++------
tests/ovn-ipsec.at | 14 +-
tests/ovn-macros.at | 4 +-
tests/ovn-northd.at | 45 ++--
tests/ovn-performance.at | 16 +-
tests/ovn.at | 464 +++++++++++++++++-----------------
tests/system-common-macros.at | 48 ++--
tests/system-ovn.at | 28 +-
9 files changed, 395 insertions(+), 396 deletions(-)
diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at
index ea67c2a5c..77077c7d8 100644
--- a/tests/ovn-controller-vtep.at
+++ b/tests/ovn-controller-vtep.at
@@ -169,7 +169,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - binding 1])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
AS_BOX([add logical switch 'lswitch0' and vlan_bindings])
AT_CHECK([vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0 --
bind-ls br-vtep p1 300 lswitch0])
@@ -245,7 +245,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - binding 2])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
# adds logical switch 'lswitch0' and vlan_bindings.
AT_CHECK([vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0])
@@ -286,7 +286,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - vtep-lswitch])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
# creates the logical switch in vtep and adds the corresponding logical
# port to 'br-test'.
@@ -340,7 +340,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - vtep-macs 1])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
# creates a simple logical network with the vtep device and a fake hv chassis
# 'ch0'.
@@ -444,7 +444,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - vtep-macs 2])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
# creates a simple logical network with the vtep device and a fake hv chassis
# 'ch0'.
@@ -513,7 +513,7 @@ AT_CLEANUP
AT_SETUP([ovn-controller-vtep - vtep-Mcast_Macs_Remote])
ovn_start
OVN_CONTROLLER_VTEP_START
-ovn-nbctl ls-add br-test
+check ovn-nbctl ls-add br-test
# creates a simple logical network with the vtep device and a fake hv chassis
# 'ch0'.
@@ -580,9 +580,9 @@ sim_add hv1
as hv1
ovs-vsctl -- add-br br-phys
ovn_attach n1 br-phys 192.168.0.1
-ovn-nbctl ls-add lsw0
-ovn-nbctl lsp-add lsw0 lsp0
-ovn-nbctl lsp-set-addresses lsp0 f0:00:00:00:00:01
+check ovn-nbctl ls-add lsw0
+check ovn-nbctl lsp-add lsw0 lsp0
+check ovn-nbctl lsp-set-addresses lsp0 f0:00:00:00:00:01
ovs-vsctl add-port br-int vif0 -- set Interface vif0 external-ids:iface-id=lsp0
diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at
index 24eb96bed..eb3ef6cc5 100644
--- a/tests/ovn-ic.at
+++ b/tests/ovn-ic.at
@@ -419,23 +419,23 @@ for i in 1 2; do
ovn_as az$i
check ovn-ic-nbctl --wait=sb sync
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
# Create LRP and connect to TS
- ovn-nbctl lr-add lr$i
- ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
- ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
+ check ovn-nbctl lr-add lr$i
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i
169.254.100.$i/24
+ check ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
-- lsp-set-addresses lsp-ts1-lr$i router \
-- lsp-set-type lsp-ts1-lr$i router \
-- lsp-set-options lsp-ts1-lr$i router-port=lrp-lr$i-ts1
# Create static routes
- ovn-nbctl lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
+ check ovn-nbctl lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
# Create a src-ip route, which shouldn't be synced
- ovn-nbctl --policy=src-ip lr-route-add lr$i 10.22.$i.0/24 169.254.0.2
+ check ovn-nbctl --policy=src-ip lr-route-add lr$i 10.22.$i.0/24 169.254.0.2
done
for i in 1 2; do
@@ -555,11 +555,11 @@ for i in 1 2; do
ovn_as az$i
# Ensure route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Ensure route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
# Drop denylist
- ovn-nbctl remove nb_global . options ic-route-denylist
+ check ovn-nbctl remove nb_global . options ic-route-denylist
for j in 1 2; do
ts=ts$j$j
@@ -568,9 +568,9 @@ for i in 1 2; do
# Create LRP and connect to TS
lr=lr$j$i
echo lr: $lr, ts: $ts
- ovn-nbctl lr-add $lr
- ovn-nbctl lrp-add $lr lrp-$lr-$ts aa:aa:aa:aa:aa:0$j 169.254.100.$i/24
- ovn-nbctl lsp-add $ts lsp-$ts-$lr \
+ check ovn-nbctl lr-add $lr
+ check ovn-nbctl lrp-add $lr lrp-$lr-$ts aa:aa:aa:aa:aa:0$j
169.254.100.$i/24
+ check ovn-nbctl lsp-add $ts lsp-$ts-$lr \
-- lsp-set-addresses lsp-$ts-$lr router \
-- lsp-set-type lsp-$ts-$lr router \
-- lsp-set-options lsp-$ts-$lr router-port=lrp-$lr-$ts
@@ -614,25 +614,25 @@ for i in 1 2; do
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
# Create LRP and connect to TS
- ovn-nbctl lr-add lr$i
- ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
- ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
+ check ovn-nbctl lr-add lr$i
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i
169.254.100.$i/24
+ check ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
-- lsp-set-addresses lsp-ts1-lr$i router \
-- lsp-set-type lsp-ts1-lr$i router \
-- lsp-set-options lsp-ts1-lr$i router-port=lrp-lr$i-ts1
- ovn-nbctl lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i 192.168.$i.1/24
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i
192.168.$i.1/24
# Create static routes
- ovn-nbctl --wait=sb lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
+ check ovn-nbctl --wait=sb lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
# Create a src-ip route, which shouldn't be synced
- ovn-nbctl --policy=src-ip lr-route-add lr$i 10.22.$i.0/24 169.254.0.2
+ check ovn-nbctl --policy=src-ip lr-route-add lr$i 10.22.$i.0/24 169.254.0.2
done
check ovn-ic-nbctl --wait=sb sync
@@ -669,20 +669,20 @@ for i in 1 2; do
ovn_start az$i
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
check ovn-ic-nbctl --wait=sb sync
# Create LRP and connect to TS
- ovn-nbctl lr-add lr$i
- ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 2001:db8:1::$i/64
- ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
+ check ovn-nbctl lr-add lr$i
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i
2001:db8:1::$i/64
+ check ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
-- lsp-set-addresses lsp-ts1-lr$i router \
-- lsp-set-type lsp-ts1-lr$i router \
-- lsp-set-options lsp-ts1-lr$i router-port=lrp-lr$i-ts1
- ovn-nbctl --wait=sb lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i
2002:db8:1::$i/64
+ check ovn-nbctl --wait=sb lrp-add lr$i lrp-lr$i-p$i 00:00:00:00:00:0$i
2002:db8:1::$i/64
done
check ovn-ic-nbctl --wait=sb sync
@@ -694,8 +694,8 @@ AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1 | awk
'/learned/{print $1, $2}'
# Do not learn routes from link-local nexthops
for i in 1 2; do
ovn_as az$i
- ovn-nbctl lrp-del lrp-lr$i-ts1
- ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
+ check ovn-nbctl lrp-del lrp-lr$i-ts1
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i
169.254.100.$i/24
done
OVS_WAIT_WHILE([ovn_as az1 ovn-nbctl lr-route-list lr1 | grep learned])
@@ -717,23 +717,23 @@ for i in 1 2; do
ovn_as az$i
check ovn-ic-nbctl --wait=sb sync
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
# Create LRP and connect to TS
- ovn-nbctl lr-add lr$i
- ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
- ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
+ check ovn-nbctl lr-add lr$i
+ check ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i
169.254.100.$i/24
+ check ovn-nbctl lsp-add ts1 lsp-ts1-lr$i \
-- lsp-set-addresses lsp-ts1-lr$i router \
-- lsp-set-type lsp-ts1-lr$i router \
-- lsp-set-options lsp-ts1-lr$i router-port=lrp-lr$i-ts1
# Create static routes
- ovn-nbctl lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
+ check ovn-nbctl lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
# Create a src-ip route, which shouldn't be synced
- ovn-nbctl --policy=src-ip --route-table=rtb1 lr-route-add lr$i
10.22.$i.0/24 169.254.0.2
+ check ovn-nbctl --policy=src-ip --route-table=rtb1 lr-route-add lr$i
10.22.$i.0/24 169.254.0.2
done
check ovn-ic-nbctl --wait=sb sync
@@ -902,9 +902,9 @@ for i in 1 2; do
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
done
# Create new transit switches and LRs. Test topology is next:
@@ -928,7 +928,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr1$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2 3; do
ts=ts1$j
@@ -937,9 +937,9 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
- ovn-nbctl lrp-set-options $lrp route_table=rtb$j
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
+ check ovn-nbctl lrp-set-options $lrp route_table=rtb$j
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -953,7 +953,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr2$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2; do
ts=ts2$j
@@ -962,9 +962,9 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
- ovn-nbctl lrp-set-options $lrp route_table=rtb$j
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
+ check ovn-nbctl lrp-set-options $lrp route_table=rtb$j
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -1029,9 +1029,9 @@ for i in 1 2; do
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
done
# Create new transit switches and LRs. Test topology is next:
@@ -1055,7 +1055,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr1$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2 3; do
ts=ts1$j
@@ -1064,9 +1064,9 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 2001:db8:$j::$i/64
- ovn-nbctl lrp-set-options $lrp route_table=rtb$j
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 2001:db8:$j::$i/64
+ check ovn-nbctl lrp-set-options $lrp route_table=rtb$j
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -1080,7 +1080,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr2$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2; do
ts=ts2$j
@@ -1089,9 +1089,9 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 2001:db8:$j::$i/64
- ovn-nbctl lrp-set-options $lrp route_table=rtb$j
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 2001:db8:$j::$i/64
+ check ovn-nbctl lrp-set-options $lrp route_table=rtb$j
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -1164,24 +1164,24 @@ for i in 1 2; do
check ovn-ic-nbctl --wait=sb sync
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
- ovn-nbctl set nb_global . options:ic-route-learn-default=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn-default=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
- ovn-nbctl set nb_global . options:ic-route-adv-default=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv-default=true
lr=lr1$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
lrp=lrp-$lr-ts1
lsp=lsp-ts1-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
- ovn-nbctl lsp-add ts1 $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:aa:0$i 169.254.100.$i/24
+ check ovn-nbctl lsp-add ts1 $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
- ovn-nbctl lrp-add $lr lrp-local-subnet 00:00:00:00:00:0$i 192.168.$i.1/24
+ check ovn-nbctl lrp-add $lr lrp-local-subnet 00:00:00:00:00:0$i
192.168.$i.1/24
ovn-nbctl list logical-router-static-route
check ovn-nbctl lr-route-add $lr 10.0.0.0/24 192.168.$i.10
check ovn-nbctl --wait=sb lr-route-add $lr 0.0.0.0/0 192.168.$i.11
@@ -1215,9 +1215,9 @@ for i in 1 2; do
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
done
# Create new transit switches and LRs. Test topology is next:
@@ -1248,13 +1248,13 @@ check ovn-nbctl lsp-add ts1 $lsp \
ovn_as az2
for i in 1 2; do
lr=lr2$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
lrp=lrp-$lr-ts1
lsp=lsp-ts1-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a2:0$i 169.254.10.2$i/24
- ovn-nbctl lsp-add ts1 $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a2:0$i 169.254.10.2$i/24
+ check ovn-nbctl lsp-add ts1 $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -2369,9 +2369,9 @@ for i in 1 2; do
ovn_as az$i
# Enable route learning at AZ level
- ovn-nbctl set nb_global . options:ic-route-learn=true
+ check ovn-nbctl set nb_global . options:ic-route-learn=true
# Enable route advertising at AZ level
- ovn-nbctl set nb_global . options:ic-route-adv=true
+ check ovn-nbctl set nb_global . options:ic-route-adv=true
done
# Create new transit switches and LRs. Test topology is next:
@@ -2391,7 +2391,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr1$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2; do
ts=ts1$j
@@ -2400,8 +2400,8 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
@@ -2414,7 +2414,7 @@ for i in 1 2; do
ovn_as az$i
lr=lr2$i
- ovn-nbctl lr-add $lr
+ check ovn-nbctl lr-add $lr
for j in 1 2; do
ts=ts2$j
@@ -2423,8 +2423,8 @@ for i in 1 2; do
lrp=lrp-$lr-$ts
lsp=lsp-$ts-$lr
# Create LRP and connect to TS
- ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
- ovn-nbctl lsp-add $ts $lsp \
+ check ovn-nbctl lrp-add $lr $lrp aa:aa:aa:aa:a$j:0$i 169.254.10$j.$i/24
+ check ovn-nbctl lsp-add $ts $lsp \
-- lsp-set-addresses $lsp router \
-- lsp-set-type $lsp router \
-- lsp-set-options $lsp router-port=$lrp
diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at
index 7579124db..961fc643f 100644
--- a/tests/ovn-ipsec.at
+++ b/tests/ovn-ipsec.at
@@ -4,13 +4,13 @@ AT_SETUP([ipsec -- basic configuration])
ovn_start
# Configure the Northbound database
-ovn-nbctl ls-add lsw0
+check ovn-nbctl ls-add lsw0
-ovn-nbctl lsp-add lsw0 lp1
-ovn-nbctl lsp-set-addresses lp1 "f0:00:00:00:00:01 10.1.1.1"
+check ovn-nbctl lsp-add lsw0 lp1
+check ovn-nbctl lsp-set-addresses lp1 "f0:00:00:00:00:01 10.1.1.1"
-ovn-nbctl lsp-add lsw0 lp2
-ovn-nbctl lsp-set-addresses lp2 "f0:00:00:00:00:02 10.1.1.2"
+check ovn-nbctl lsp-add lsw0 lp2
+check ovn-nbctl lsp-set-addresses lp2 "f0:00:00:00:00:02 10.1.1.2"
net_add n1 # Network to connect hv1 and hv2
@@ -43,8 +43,8 @@ ovs-vsctl \
-- set Open_vSwitch . other_config:ca_cert=dummy-cacert.pem
# Enable IPsec
-ovn-nbctl set nb_global . ipsec=true
-ovn-nbctl set nb_global . options:ipsec_encapsulation=true
+check ovn-nbctl set nb_global . ipsec=true
+check ovn-nbctl set nb_global . options:ipsec_encapsulation=true
check ovn-nbctl --wait=hv sync
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index dc305362c..8a2a47558 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -544,7 +544,7 @@ ovn_start () {
ovn_init_db ovn-sb $1; ovn-sbctl init
ovn_init_db ovn-nb $1; ovn-nbctl init
if test -n "$1"; then
- ovn-nbctl set NB_Global . name=$1
+ check ovn-nbctl set NB_Global . name=$1
fi
ovn_start_northd primary $AZ
@@ -574,7 +574,7 @@ ovn_start () {
fi
if test -n "$AZ"; then
- ovn-nbctl --wait=sb sync || exit $?
+ check ovn-nbctl --wait=sb sync || exit $?
echo "${msg_prefix}starting ovn-ic"
mkdir "$ovs_base"/$d_prefix/ic
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index c9bbc82a3..9e4225566 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -592,9 +592,9 @@ ch2_ch_uuid=$comp1_ch_uuid
# Check ref_chassis.
echo "comp1_ch_uuid = $comp1_ch_uuid"
wait_column "$comp1_ch_uuid" HA_Chassis_Group ref_chassis
-ovn-sbctl set Port_Binding sw0-p1 additional_chassis=$cadd1_ch_uuid
+check ovn-sbctl set Port_Binding sw0-p1 additional_chassis=$cadd1_ch_uuid
wait_column "$cadd1_ch_uuid $comp1_ch_uuid" HA_Chassis_Group ref_chassis
-ovn-sbctl clear Port_Binding sw0-p1 additional_chassis
+check ovn-sbctl clear Port_Binding sw0-p1 additional_chassis
wait_column "$comp1_ch_uuid" HA_Chassis_Group ref_chassis
# unbind sw0-p1
@@ -2772,10 +2772,9 @@ get_tunnel_keys() {
echo
echo "__file__:__line__: Add three logical switches, check tunnel ids"
-AT_CHECK(
- [ovn-nbctl --wait=sb ls-add ls0
- ovn-nbctl --wait=sb ls-add ls1
- ovn-nbctl --wait=sb ls-add ls2])
+check ovn-nbctl --wait=sb ls-add ls0
+check ovn-nbctl --wait=sb ls-add ls1
+check ovn-nbctl --wait=sb ls-add ls2
get_tunnel_keys
AT_CHECK([test $ls0 = 1 && test $ls1 = 2 && test $ls2 = 3])
@@ -2849,9 +2848,9 @@ echo
echo "__file__:__line__: Add two logical switches with three ports each, check
tunnel ids"
AT_CHECK(
[for i in 0 1; do
- ovn-nbctl --wait=sb ls-add ls$i || exit $?
+ check ovn-nbctl --wait=sb ls-add ls$i || exit $?
for j in 0 1 2; do
- ovn-nbctl --wait=sb lsp-add ls$i lsp$i$j || exit $?
+ check ovn-nbctl --wait=sb lsp-add ls$i lsp$i$j || exit $?
done
done])
get_tunnel_keys
@@ -3541,9 +3540,9 @@ check ovn-nbctl lsp-add ls lsp2
check ovn-nbctl lsp-set-addresses lsp2 00:00:00:00:00:02
for direction in from to; do
- ovn-nbctl acl-add ls ${direction}-lport 3 "tcp" allow-related
- ovn-nbctl acl-add ls ${direction}-lport 2 "udp" allow-related
- ovn-nbctl acl-add ls ${direction}-lport 1 "ip" drop
+ check ovn-nbctl acl-add ls ${direction}-lport 3 "tcp" allow-related
+ check ovn-nbctl acl-add ls ${direction}-lport 2 "udp" allow-related
+ check ovn-nbctl acl-add ls ${direction}-lport 1 "ip" drop
done
check ovn-nbctl --wait=sb sync
@@ -3576,7 +3575,7 @@ ct_next(ct_state=new|trk) {
# Allow stateless for TCP.
for direction in from to; do
- ovn-nbctl acl-add ls ${direction}-lport 4 tcp allow-stateless
+ check ovn-nbctl acl-add ls ${direction}-lport 4 tcp allow-stateless
done
check ovn-nbctl --wait=sb sync
@@ -3636,7 +3635,7 @@ ct_lb_mark {
# Allow stateless for TCP.
for direction in from to; do
- ovn-nbctl acl-add ls ${direction}-lport 4 tcp allow-stateless
+ check ovn-nbctl acl-add ls ${direction}-lport 4 tcp allow-stateless
done
check ovn-nbctl --wait=sb sync
@@ -3676,9 +3675,9 @@ check ovn-nbctl lsp-set-addresses lsp2 00:00:00:00:00:02
check ovn-nbctl pg-add pg lsp1 lsp2
for direction in from to; do
- ovn-nbctl acl-add pg ${direction}-lport 3 "tcp" allow-related
- ovn-nbctl acl-add pg ${direction}-lport 2 "udp" allow-related
- ovn-nbctl acl-add pg ${direction}-lport 1 "ip" drop
+ check ovn-nbctl acl-add pg ${direction}-lport 3 "tcp" allow-related
+ check ovn-nbctl acl-add pg ${direction}-lport 2 "udp" allow-related
+ check ovn-nbctl acl-add pg ${direction}-lport 1 "ip" drop
done
check ovn-nbctl --wait=sb sync
@@ -3712,7 +3711,7 @@ ct_next(ct_state=new|trk) {
# Allow stateless for TCP.
for direction in from to; do
- ovn-nbctl acl-add pg ${direction}-lport 4 tcp allow-stateless
+ check ovn-nbctl acl-add pg ${direction}-lport 4 tcp allow-stateless
done
check ovn-nbctl --wait=sb sync
@@ -3772,7 +3771,7 @@ ct_lb_mark {
# Allow stateless for TCP.
for direction in from to; do
- ovn-nbctl acl-add pg ${direction}-lport 4 tcp allow-stateless
+ check ovn-nbctl acl-add pg ${direction}-lport 4 tcp allow-stateless
done
check ovn-nbctl --wait=sb sync
@@ -3810,8 +3809,8 @@ check ovn-nbctl lsp-add ls lsp2
check ovn-nbctl lsp-set-addresses lsp2 00:00:00:00:00:02
for direction in from to; do
- ovn-nbctl acl-add ls ${direction}-lport 3 "tcp" allow-related
- ovn-nbctl acl-add ls ${direction}-lport 3 "udp" allow
+ check ovn-nbctl acl-add ls ${direction}-lport 3 "tcp" allow-related
+ check ovn-nbctl acl-add ls ${direction}-lport 3 "udp" allow
done
check ovn-nbctl --wait=sb sync
@@ -3834,8 +3833,8 @@ ct_next(ct_state=new|trk) {
# Allow stateless with *lower* priority. It always beats stateful rules.
for direction in from to; do
- ovn-nbctl acl-add ls ${direction}-lport 1 tcp allow-stateless
- ovn-nbctl acl-add ls ${direction}-lport 1 udp allow-stateless
+ check ovn-nbctl acl-add ls ${direction}-lport 1 tcp allow-stateless
+ check ovn-nbctl acl-add ls ${direction}-lport 1 udp allow-stateless
done
check ovn-nbctl --wait=sb sync
@@ -11957,7 +11956,7 @@ CHECK_NO_CHANGE_AFTER_RECOMPUTE
# should resync the logical flows.
for l in $(ovn-sbctl --bare --columns _uuid list logical_flow)
do
- ovn-sbctl clear logical_flow $l logical_dp_group
+ check ovn-sbctl clear logical_flow $l logical_dp_group
done
check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at
index 249302a10..3862f7e43 100644
--- a/tests/ovn-performance.at
+++ b/tests/ovn-performance.at
@@ -332,12 +332,12 @@ for i in 1 2; do
OVN_CONTROLLER_EXPECT_NO_HIT(
[hv1 hv2], [lflow_run],
[ovn-nbctl wait-until Logical_Switch_Port $lp dynamic_addresses!=[[]]
&&
- ovn-nbctl --wait=hv sync]
+ check ovn-nbctl --wait=hv sync]
)
OVN_CONTROLLER_EXPECT_NO_HIT(
[hv1 hv2], [lflow_run],
[ovn-nbctl get Logical_Switch_Port $lp dynamic_addresses &&
- ovn-nbctl --wait=hv sync]
+ check ovn-nbctl --wait=hv sync]
)
# Add address set $as
@@ -364,8 +364,8 @@ for i in 1 2; do
OVN_CONTROLLER_EXPECT_NO_HIT(
[hv$i hv$j], [lflow_run],
[as hv$i ovs-vsctl add-port br-int $vif -- set Interface $vif
external-ids:iface-id=$lp &&
- ovn-nbctl wait-until Logical_Switch_Port $lp 'up=true' &&
- ovn-nbctl --wait=hv sync]
+ check ovn-nbctl wait-until Logical_Switch_Port $lp 'up=true' &&
+ check ovn-nbctl --wait=hv sync]
)
# Delete and recreate $lp to make it unbind and rebind multiple times, and
@@ -374,14 +374,14 @@ for i in 1 2; do
OVN_CONTROLLER_EXPECT_NO_HIT(
[hv$i hv$j], [lflow_run],
[as hv$i ovs-vsctl set Interface $vif external-ids:iface-id=xxxx &&
- ovn-nbctl wait-until Logical_Switch_Port $lp 'up=false' &&
- ovn-nbctl --wait=hv sync]
+ check ovn-nbctl wait-until Logical_Switch_Port $lp 'up=false' &&
+ check ovn-nbctl --wait=hv sync]
)
OVN_CONTROLLER_EXPECT_NO_HIT(
[hv$i hv$j], [lflow_run],
[as hv$i ovs-vsctl set Interface $vif external-ids:iface-id=$lp &&
- ovn-nbctl wait-until Logical_Switch_Port $lp 'up=true' &&
- ovn-nbctl --wait=hv sync]
+ check ovn-nbctl wait-until Logical_Switch_Port $lp 'up=true' &&
+ check ovn-nbctl --wait=hv sync]
)
done
done
diff --git a/tests/ovn.at b/tests/ovn.at
index b207fc51e..802a24f88 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -2695,10 +2695,10 @@ for i in 1 2; do
for j in 1 2; do
ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j
external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap
options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j
- ovn-nbctl lsp-add lsw0 lp$i$j
+ check ovn-nbctl lsp-add lsw0 lp$i$j
ip_addrs="192.168.0.$i$j"
- ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j $ip_addrs"
- ovn-nbctl --wait=hv lsp-set-port-security lp$i$j f0:00:00:00:00:$i$j
+ check ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
$ip_addrs"
+ check ovn-nbctl --wait=hv lsp-set-port-security lp$i$j
f0:00:00:00:00:$i$j
done
done
@@ -2856,21 +2856,21 @@ ovn_start
check ovn-nbctl ls-add lsw0
check ovn-sbctl chassis-add hv0 geneve 127.0.0.1
for i in 1 2 3; do
- ovn-nbctl lsp-add lsw0 lp$i
+ check ovn-nbctl lsp-add lsw0 lp$i
done
check ovn-nbctl --wait=sb sync
for i in 1 2 3; do
- ovn-sbctl lsp-bind lp$i hv0
+ check ovn-sbctl lsp-bind lp$i hv0
if test $i = 1; then
- ovn-nbctl lsp-set-addresses lp$i "f0:00:00:00:00:0$i 192.168.0.$i"
unknown
+ check ovn-nbctl lsp-set-addresses lp$i "f0:00:00:00:00:0$i
192.168.0.$i" unknown
else
if test $i = 3; then
ip_addrs="192.168.0.$i fe80::ea2a:eaff:fe28:$i/64 192.169.0.$i"
else
ip_addrs="192.168.0.$i"
fi
- ovn-nbctl lsp-set-addresses lp$i "f0:00:00:00:00:0$i $ip_addrs"
- ovn-nbctl lsp-set-port-security lp$i f0:00:00:00:00:0$i
+ check ovn-nbctl lsp-set-addresses lp$i "f0:00:00:00:00:0$i $ip_addrs"
+ check ovn-nbctl lsp-set-port-security lp$i f0:00:00:00:00:0$i
fi
done
check ovn-nbctl acl-add lsw0 from-lport 1000 'eth.type == 0x1234' drop
@@ -3108,16 +3108,16 @@ ovn_start
for i in 1 2 3; do
ls_name=ls$i
- ovn-nbctl ls-add $ls_name
+ check ovn-nbctl ls-add $ls_name
ln_port_name=ln$i
if test $i -eq 2; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
else
- ovn-nbctl lsp-add $ls_name $ln_port_name
+ check ovn-nbctl lsp-add $ls_name $ln_port_name
fi
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys
done
# lsp_to_ls LSP
@@ -3150,9 +3150,9 @@ for i in 1 2; do
lsp_name=lp$i$j
ls_name=$(lsp_to_ls $lsp_name)
- ovn-nbctl lsp-add $ls_name $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:$i$j
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$j
+ check ovn-nbctl lsp-add $ls_name $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:$i$j
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$j
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
done
@@ -3298,13 +3298,13 @@ done
for i in 1 2; do
lsname=ls-${i}0
- ovn-nbctl ls-add $lsname
+ check ovn-nbctl ls-add $lsname
for tag in `seq ${i}1 ${i}9`; do
ln_port_name=ln-$tag
- ovn-nbctl lsp-add $lsname $ln_port_name "" $tag
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
+ check ovn-nbctl lsp-add $lsname $ln_port_name "" $tag
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
done
done
@@ -3318,9 +3318,9 @@ for hv in 1 2; do
options:rxq_pcap=hv-$hv/vif-$hv-$ls-rx.pcap \
ofport-request=$hv$ls
- ovn-nbctl lsp-add ls-${ls}0 $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:${hv}${ls}
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:${hv}${ls}
+ check ovn-nbctl lsp-add ls-${ls}0 $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:${hv}${ls}
+ check ovn-nbctl lsp-set-port-security $lsp_name
f0:00:00:00:00:${hv}${ls}
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
done
@@ -3441,13 +3441,13 @@ done
for i in 1 2; do
lsname=ls-${i}0
- ovn-nbctl ls-add $lsname
+ check ovn-nbctl ls-add $lsname
for tag in `seq ${i}1 ${i}9`; do
ln_port_name=ln-$tag
- ovn-nbctl lsp-add $lsname $ln_port_name "" $tag
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
+ check ovn-nbctl lsp-add $lsname $ln_port_name "" $tag
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
done
done
@@ -3462,9 +3462,9 @@ for hv in 1 2; do
options:rxq_pcap=hv-$hv/vif-$hv-$ls-$peer-rx.pcap \
ofport-request=$hv$ls$peer
- ovn-nbctl lsp-add ls-${ls}0 $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name
f0:00:00:00:0${peer}:${hv}${ls}
- ovn-nbctl lsp-set-port-security $lsp_name
f0:00:00:00:0${peer}:${hv}${ls}
+ check ovn-nbctl lsp-add ls-${ls}0 $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name
f0:00:00:00:0${peer}:${hv}${ls}
+ check ovn-nbctl lsp-set-port-security $lsp_name
f0:00:00:00:0${peer}:${hv}${ls}
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
@@ -3584,13 +3584,13 @@ ovn_start
# two switches, each connected to lots of networks
for i in 1 2; do
- ovn-nbctl ls-add ls-$i
+ check ovn-nbctl ls-add ls-$i
for tag in `seq 10 20`; do
ln_port_name=ln-$i-$tag
- ovn-nbctl lsp-add ls-$i $ln_port_name "" $tag
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
+ check ovn-nbctl lsp-add ls-$i $ln_port_name "" $tag
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
done
done
@@ -3618,9 +3618,9 @@ for i in 1 2; do
ofport-request=$i
lsp_name=lp-$i
- ovn-nbctl lsp-add ls-$i $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:0$i
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:0$i
+ check ovn-nbctl lsp-add ls-$i $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:0$i
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:0$i
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
OVN_WAIT_PATCH_PORT_FLOWS(["ln-$i-20"], ["hv-$i"])
@@ -4226,10 +4226,10 @@ ovn_start
check ovn-nbctl ls-add ls1
for tag in 10 20; do
ln_port_name=ln-$tag
- ovn-nbctl lsp-add ls1 $ln_port_name "" $tag
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
+ check ovn-nbctl lsp-add ls1 $ln_port_name "" $tag
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys-$tag
done
# create fabric networks
@@ -4253,9 +4253,9 @@ for tag in 10 20; do
ofport-request=$tag$i
lsp_name=lp-$tag-$i
- ovn-nbctl lsp-add ls1 $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:0$i:$tag
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:0$i:$tag
+ check ovn-nbctl lsp-add ls1 $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:0$i:$tag
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:0$i:$tag
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
OVN_WAIT_PATCH_PORT_FLOWS(["ln-$tag"], ["hv-$tag-$i"])
@@ -4846,14 +4846,14 @@ ovn_start
# 27 VIFs, 9 per LS, 3 per subnet: lp[123][123][123], where the first two
# digits are the subnet and the last digit distinguishes the VIF.
for i in 1 2 3; do
- ovn-nbctl ls-add ls$i
+ check ovn-nbctl ls-add ls$i
for j in 1 2 3; do
for k in 1 2 3; do
# Add "unknown" to MAC addresses for lp?11, so packets for
# MAC-IP bindings discovered via ARP later have somewhere to go.
if test $j$k = 11; then unknown=unknown; else unknown=; fi
- ovn-nbctl \
+ check ovn-nbctl \
-- lsp-add ls$i lp$i$j$k \
-- lsp-set-addresses lp$i$j$k \
"f0:00:00:00:0$i:$j$k 192.168.$i$j.$k" $unknown
@@ -4864,8 +4864,8 @@ done
check ovn-nbctl lr-add lr0
for i in 1 2 3; do
for j in 1 2 3; do
- ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j 192.168.$i$j.254/24
- ovn-nbctl \
+ check check ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j
192.168.$i$j.254/24
+ check check ovn-nbctl \
-- lsp-add ls$i lrp$i$j-attachment \
-- set Logical_Switch_Port lrp$i$j-attachment type=router \
options:router-port=lrp$i$j \
@@ -5284,15 +5284,15 @@ ovn_start
#
check ovn-nbctl lr-add lr0
for i in 1 2 ; do
- ovn-nbctl ls-add ls$i
- ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.1/24
- ovn-nbctl \
+ check ovn-nbctl ls-add ls$i
+ check ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.1/24
+ check ovn-nbctl \
-- lsp-add ls$i lrp$i-attachment \
-- set Logical_Switch_Port lrp$i-attachment type=router \
options:router-port=lrp$i \
addresses=router
for j in 1 2; do
- ovn-nbctl \
+ check ovn-nbctl \
-- lsp-add ls$i lp$i$j \
-- lsp-set-addresses lp$i$j \
"f0:00:00:00:00:$i$j 192.168.$i.1$j"
@@ -5544,16 +5544,16 @@ for i in 1 2 3; do
ovn_attach n1 br-phys 192.168.0.$i
for j in 1 2 3; do
ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j
external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap
options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j
- ovn-nbctl lsp-add lsw0 lp$i$j
+ check ovn-nbctl lsp-add lsw0 lp$i$j
if test $j = 1; then
- ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" unknown
+ check ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" unknown
elif test $j = 2; then
- ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j 4343::00$i$j"
- ovn-nbctl lsp-set-port-security lp$i$j f0:00:00:00:00:$i$j
+ check ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j 4343::00$i$j"
+ check ovn-nbctl lsp-set-port-security lp$i$j f0:00:00:00:00:$i$j
else
extra_addr="f0:00:00:00:0$i:$i$j fe80::ea2a:eaff:fe28:$i$j
4242::00$i$j"
- ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" "$extra_addr"
- ovn-nbctl lsp-set-port-security lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" "$extra_addr"
+ check ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" "$extra_addr"
+ check ovn-nbctl lsp-set-port-security lp$i$j "f0:00:00:00:00:$i$j
192.168.0.$i$j" "$extra_addr"
fi
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lp$i$j` = xup])
done
@@ -8590,12 +8590,12 @@ check ovn-nbctl --wait=sb sync
check ovn-nbctl --wait=hv set NB_Global .
options:mac_prefix="0a:00:00:00:00:00"
check ovn-nbctl ls-add sw0
check ovn-nbctl lsp-add sw0 p0 -- lsp-set-addresses p0 dynamic
-ovn-nbctl --wait=sb add Logical-Switch sw0 other_config subnet=192.168.1.0/24
+check ovn-nbctl --wait=sb add Logical-Switch sw0 other_config
subnet=192.168.1.0/24
check_dynamic_addresses p0 "0a:00:00:a8:01:03 192.168.1.2"
# Add 9 more ports to sw0, addresses should all be unique.
for n in `seq 1 9`; do
- ovn-nbctl --wait=sb lsp-add sw0 "p$n" -- lsp-set-addresses "p$n" dynamic
+ check ovn-nbctl --wait=sb lsp-add sw0 "p$n" -- lsp-set-addresses "p$n"
dynamic
done
for i in `seq 1 9`; do
mac=0a:00:00:a8:01:$(printf "%02x" $(expr $i + 3))
@@ -8607,11 +8607,11 @@ done
# across both switches but IP's only need to be unique within the same switch.
check ovn-nbctl ls-add sw1
check ovn-nbctl lsp-add sw1 p10 -- lsp-set-addresses p10 dynamic
-ovn-nbctl --wait=sb add Logical-Switch sw1 other_config subnet=192.168.1.0/24
+check ovn-nbctl --wait=sb add Logical-Switch sw1 other_config
subnet=192.168.1.0/24
check_row_count nb:Logical_Switch_Port 1 name=p10
dynamic_addresses='"0a:00:00:a8:01:0d 192.168.1.2"'
for n in `seq 11 19`; do
- ovn-nbctl --wait=sb lsp-add sw1 "p$n" -- lsp-set-addresses "p$n" dynamic
+ check ovn-nbctl --wait=sb lsp-add sw1 "p$n" -- lsp-set-addresses "p$n"
dynamic
done
for i in `seq 11 19`; do
mac=0a:00:00:a8:01:$(printf "%02x" $(expr $i + 3))
@@ -8750,7 +8750,7 @@ check ovn-nbctl --wait=sb lsp-add sw5 p41 --
lsp-set-addresses p41 \
check_dynamic_addresses p41 ''
# Set a subnet. Now p41 should have an ipv4 address, too
-ovn-nbctl --wait=sb add Logical-Switch sw5 other_config subnet=192.168.1.0/24
+check ovn-nbctl --wait=sb add Logical-Switch sw5 other_config
subnet=192.168.1.0/24
check_dynamic_addresses p41 "0a:00:00:a8:01:22 192.168.1.2"
# Clear the other_config. The IPv4 address should be gone
@@ -8774,11 +8774,11 @@ check ovn-nbctl --wait=sb clear Logical-Switch sw5
other_config
check_dynamic_addresses p41 ''
# Set the subnet again. Now p41 should get the IPv4 address again.
-ovn-nbctl --wait=sb add Logical-Switch sw5 other_config subnet=192.168.1.0/24
+check ovn-nbctl --wait=sb add Logical-Switch sw5 other_config
subnet=192.168.1.0/24
check_dynamic_addresses p41 "f0:00:00:00:10:2b 192.168.1.2"
# Add an excluded IP address that conflicts with p41. p41 should update.
-ovn-nbctl --wait=sb add Logical-Switch sw5 other_config \
+check ovn-nbctl --wait=sb add Logical-Switch sw5 other_config \
exclude_ips="192.168.1.2"
check_dynamic_addresses p41 "f0:00:00:00:10:2b 192.168.1.3"
@@ -8795,7 +8795,7 @@ check ovn-nbctl ls-add sw6
check ovn-nbctl --wait=hv set NB_Global .
options:mac_prefix="00:11:22:33:44:55"
check ovn-nbctl --wait=sb set Logical-Switch sw6
other_config:subnet=192.168.100.0/24
for n in $(seq 1 3); do
- ovn-nbctl --wait=sb lsp-add sw6 "p5$n" -- lsp-set-addresses "p5$n" dynamic
+ check ovn-nbctl --wait=sb lsp-add sw6 "p5$n" -- lsp-set-addresses "p5$n"
dynamic
done
check_dynamic_addresses p51 "00:11:22:a8:64:03 192.168.100.2"
check_dynamic_addresses p52 "00:11:22:a8:64:04 192.168.100.3"
@@ -8804,7 +8804,7 @@ check_dynamic_addresses p53 "00:11:22:a8:64:05
192.168.100.4"
# verify configuration order does not break IPAM/MACAM
check ovn-nbctl ls-add sw7
for n in $(seq 1 3); do
- ovn-nbctl --wait=sb lsp-add sw7 "p7$n" -- lsp-set-addresses "p7$n" dynamic
+ check ovn-nbctl --wait=sb lsp-add sw7 "p7$n" -- lsp-set-addresses "p7$n"
dynamic
done
check ovn-nbctl --wait=sb set Logical-Switch sw7
other_config:ipv6_prefix="bef0::"
p71_addr=$(ovn-nbctl get Logical-Switch-Port p71 dynamic_addresses)
@@ -8819,7 +8819,7 @@ AT_CHECK([test "$p72_addr" != "$p73_addr"], [0], [])
check ovn-nbctl ls-add sw8
check ovn-nbctl --wait=sb set Logical-Switch sw8 other_config:mac_only=true
for n in $(seq 1 3); do
- ovn-nbctl --wait=sb lsp-add sw8 "p8$n" -- lsp-set-addresses "p8$n" dynamic
+ check ovn-nbctl --wait=sb lsp-add sw8 "p8$n" -- lsp-set-addresses "p8$n"
dynamic
done
check_dynamic_addresses p81 "00:11:22:00:00:06"
check_dynamic_addresses p82 "00:11:22:00:00:07"
@@ -8871,7 +8871,7 @@ check ovn-nbctl ls-add sw12
for i in $(seq 0 1); do
for j in $(seq 1 99); do
idx=$((i*100+j))
- ovn-nbctl lsp-add sw12 sw12-p${idx} -- \
+ check ovn-nbctl lsp-add sw12 sw12-p${idx} -- \
lsp-set-addresses sw12-p${idx} "00:00:00:00:$i:$j dynamic"
done
done
@@ -9626,7 +9626,7 @@ check ovn-nbctl lsp-add foo foo1 \
# Create logical port bar1, bar2 and bar3 in bar
for i in `seq 1 3`; do
ip=`expr $i + 1`
- ovn-nbctl lsp-add bar bar$i \
+ check ovn-nbctl lsp-add bar bar$i \
-- lsp-set-addresses bar$i "f0:00:0a:01:02:$i 172.16.1.$ip"
done
@@ -13183,9 +13183,9 @@ for i in 1 2; do
options:rxq_pcap=hv${i}/vif${i}1-rx.pcap \
ofport-request=${i}1
- ovn-nbctl lsp-add ls1 lp${i}1
- ovn-nbctl lsp-set-addresses lp${i}1 f0:00:00:00:00:${i}1
- ovn-nbctl lsp-set-port-security lp${i}1 f0:00:00:00:00:${i}1
+ check ovn-nbctl lsp-add ls1 lp${i}1
+ check ovn-nbctl lsp-set-addresses lp${i}1 f0:00:00:00:00:${i}1
+ check ovn-nbctl lsp-set-port-security lp${i}1 f0:00:00:00:00:${i}1
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lp${i}1` = xup])
done
@@ -13570,7 +13570,7 @@ for i in 1 2; do
options:rxq_pcap=hv$i/vif1-rx.pcap \
ofport-request=1
- ovn-nbctl lsp-add inside inside$i \
+ check ovn-nbctl lsp-add inside inside$i \
-- lsp-set-addresses inside$i "f0:00:00:01:22:$i 192.168.1.10$i"
done
@@ -15794,7 +15794,7 @@ m4_define([MULTICHASSIS_PATH_MTU_DISCOVERY_TEST],
reset_env
check_row_count fdb 0 mac="$external_mac"
- ovn-sbctl --all destroy fdb
+ check ovn-sbctl --all destroy fdb
check ovn-nbctl --wait=hv lsp-set-addresses multi1 "${multi1_mac}
${multi1_ip} ${multi1_ip6}"
@@ -17058,7 +17058,7 @@ for i in 1 2 3; do
ovn_attach n1 br-phys 192.168.0.$i
for j in 1 2 3; do
- ovn-nbctl lsp-add sw0 sw0-p$i$j -- \
+ check ovn-nbctl lsp-add sw0 sw0-p$i$j -- \
lsp-set-addresses sw0-p$i$j "00:00:00:00:00:$i$j
192.168.1.$i$j"
check ovs-vsctl -- add-port br-int vif$i$j -- \
@@ -17279,7 +17279,7 @@ ovs-vsctl set open .
external-ids:ovn-bridge-mappings=public:br-phys
# Allow some time for ovn-northd and ovn-controller to catch up.
wait_for_ports_up
check ovn-nbctl --wait=hv sync
-ovn-nbctl dump-flows > sbflows
+ovn-sbctl dump-flows > sbflows
AT_CAPTURE_FILE([sbflows])
for i in 1 2; do
@@ -17658,7 +17658,7 @@ ovs-vsctl set open .
external-ids:ovn-bridge-mappings=public:br-phys
# Allow some time for ovn-northd and ovn-controller to catch up.
wait_for_ports_up
check ovn-nbctl --wait=hv sync
-ovn-nbctl dump-flows > sbflows
+ovn-sbctl dump-flows > sbflows
AT_CAPTURE_FILE([sbflows])
check ovn-nbctl mirror-add mirror0 gre 0 to-lport 192.168.1.12
@@ -17903,10 +17903,10 @@ get_lsp_uuid () {
pg1_ports=
pg2_ports=
for i in 1 2 3; do
- ovn-nbctl ls-add ls$i
+ check ovn-nbctl ls-add ls$i
for j in 1 2 3; do
for k in 1 2 3; do
- ovn-nbctl \
+ check ovn-nbctl \
-- lsp-add ls$i lp$i$j$k \
-- lsp-set-addresses lp$i$j$k \
"f0:00:00:00:0$i:$j$k 192.168.$i$j.$k"
@@ -17925,8 +17925,8 @@ done
check ovn-nbctl lr-add lr0
for i in 1 2 3; do
for j in 1 2 3; do
- ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j 192.168.$i$j.254/24
- ovn-nbctl \
+ check ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j
192.168.$i$j.254/24
+ check ovn-nbctl \
-- lsp-add ls$i lrp$i$j-attachment \
-- set Logical_Switch_Port lrp$i$j-attachment type=router \
options:router-port=lrp$i$j \
@@ -18123,10 +18123,10 @@ get_lsp_uuid () {
pg1_ports=
pg2_ports=
for i in 1 2 3; do
- ovn-nbctl ls-add ls$i
+ check ovn-nbctl ls-add ls$i
for j in 1 2 3; do
for k in 1 2 3; do
- ovn-nbctl \
+ check ovn-nbctl \
-- lsp-add ls$i lp$i$j$k \
-- lsp-set-addresses lp$i$j$k \
"f0:00:00:00:0$i:$j$k 192.168.$i$j.$k"
@@ -18145,8 +18145,8 @@ done
check ovn-nbctl lr-add lr0
for i in 1 2 3; do
for j in 1 2 3; do
- ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j 192.168.$i$j.254/24
- ovn-nbctl \
+ check ovn-nbctl lrp-add lr0 lrp$i$j 00:00:00:00:ff:$i$j
192.168.$i$j.254/24
+ check ovn-nbctl \
-- lsp-add ls$i lrp$i$j-attachment \
-- set Logical_Switch_Port lrp$i$j-attachment type=router \
options:router-port=lrp$i$j \
@@ -19143,8 +19143,8 @@ for i in 1 2 3; do
ovn_attach n1 br-phys 192.168.0.$i
ovs-vsctl add-port br-int vif${i}1 -- set Interface vif${i}1
external-ids:iface-id=lp${i}1 options:tx_pcap=hv$i/vif${i}1-tx.pcap
options:rxq_pcap=hv$i/vif${i}1-rx.pcap ofport-request=${i}1
- ovn-nbctl lsp-add lsw0 lp${i}1
- ovn-nbctl lsp-set-addresses lp${i}1 "f0:00:00:00:00:${i}1 192.168.0.${i}1"
unknown
+ check ovn-nbctl lsp-add lsw0 lp${i}1
+ check ovn-nbctl lsp-set-addresses lp${i}1 "f0:00:00:00:00:${i}1
192.168.0.${i}1" unknown
done
#
@@ -19204,7 +19204,7 @@ for sf in 0 1; do
if test ${sf} = 1; then
# Add a stateful rule and re-run the check to make sure the
# drop rule is still effective..
- ovn-nbctl --wait=hv acl-add lsw0 from-lport 2000 'inport == "lp31" &&
ip' allow-related
+ check ovn-nbctl --wait=hv acl-add lsw0 from-lport 2000 'inport ==
"lp31" && ip' allow-related
fi
for is in 1 2 3; do
s=${is}1
@@ -19388,14 +19388,14 @@ test_ip6_packet() {
for i in 1 2; do
net_add n$i
- ovn-nbctl ls-add sw$i
+ check ovn-nbctl ls-add sw$i
sim_add hv$i
as hv$i
ovs-vsctl add-br br-phys
ovn_attach n$i br-phys 192.168.$i.1
- ovn-nbctl lsp-add sw$i sw$i-p${i}0 -- \
+ check ovn-nbctl lsp-add sw$i sw$i-p${i}0 -- \
lsp-set-addresses sw$i-p${i}0 "00:00:00:00:00:0$i 192.168.$i.1
2001:db8:$i::11"
ovs-vsctl -- add-port br-int vif$i -- \
@@ -19410,8 +19410,8 @@ done
check ovn-nbctl lr-add lr0
for i in 1 2; do
- ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.254/24
2001:db8:$i::1/64
- ovn-nbctl -- lsp-add sw$i lrp$i-attachment \
+ check ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.254/24
2001:db8:$i::1/64
+ check ovn-nbctl -- lsp-add sw$i lrp$i-attachment \
-- set Logical_Switch_Port lrp$i-attachment type=router \
options:router-port=lrp$i addresses='"00:00:00:00:ff:0'$i'
192.168.'$i'.254 2001:db8:'$i'::1"'
done
@@ -19615,14 +19615,14 @@ test_ip6_packet() {
for i in 1 2; do
net_add n$i
- ovn-nbctl ls-add sw$i
+ check ovn-nbctl ls-add sw$i
sim_add hv$i
as hv$i
ovs-vsctl add-br br-phys
ovn_attach n$i br-phys 192.168.$i.1
- ovn-nbctl lsp-add sw$i sw$i-p${i}0 -- \
+ check ovn-nbctl lsp-add sw$i sw$i-p${i}0 -- \
lsp-set-addresses sw$i-p${i}0 "00:00:00:00:00:0$i 192.168.$i.1
2001:db8:$i::11"
ovs-vsctl -- add-port br-int vif$i -- \
@@ -19635,8 +19635,8 @@ done
check ovn-nbctl lr-add lr0
for i in 1 2; do
- ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.254/24
2001:db8:$i::1/64
- ovn-nbctl -- lsp-add sw$i lrp$i-attachment \
+ check ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.254/24
2001:db8:$i::1/64
+ check ovn-nbctl -- lsp-add sw$i lrp$i-attachment \
-- set Logical_Switch_Port lrp$i-attachment type=router \
options:router-port=lrp$i addresses='"00:00:00:00:ff:0'$i'
192.168.'$i'.254 2001:db8:'$i'::1"'
done
@@ -20460,7 +20460,7 @@ ovn_attach n1 br-phys 192.168.0.10
check ovn-nbctl ls-add ls1
for i in 1 2; do
- ovn-nbctl lsp-add ls1 lp$i \
+ check ovn-nbctl lsp-add ls1 lp$i \
-- lsp-set-addresses lp$i "f0:00:00:00:00:0$i 192.168.1.$i"
as hv1 ovs-vsctl \
-- add-port br-int vif$i \
@@ -20471,32 +20471,32 @@ done
for i in 1 2 3; do
as1_uuid=`ovn-nbctl --wait=hv create addr name=as1`
as2_uuid=`ovn-nbctl --wait=hv create addr name=as2`
- ovn-nbctl --wait=hv acl-add ls1 to-lport 200 \
+ check ovn-nbctl --wait=hv acl-add ls1 to-lport 200 \
'outport=="lp1" && ip4 && ip4.src == {$as1, $as2}' allow-related
- ovn-nbctl --wait=hv set addr as1 addresses="10.1.2.10"
+ check ovn-nbctl --wait=hv set addr as1 addresses="10.1.2.10"
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.10"], [0],
[ignore])
# Update address set as1
- ovn-nbctl --wait=hv set addr as1 addresses="10.1.2.10 10.1.2.11"
+ check ovn-nbctl --wait=hv set addr as1 addresses="10.1.2.10 10.1.2.11"
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.11"], [0],
[ignore])
# Update address set as2
- ovn-nbctl --wait=hv set addr as2 addresses="10.1.2.12 10.1.2.13"
+ check ovn-nbctl --wait=hv set addr as2 addresses="10.1.2.12 10.1.2.13"
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.12"], [0],
[ignore])
# Add another ACL referencing as1
n_flows_before=`ovs-ofctl dump-flows br-int | grep -F "10.1.2.10" | wc -l`
- ovn-nbctl --wait=hv acl-add ls1 to-lport 200 \
+ check ovn-nbctl --wait=hv acl-add ls1 to-lport 200 \
'outport=="lp2" && ip4 && ip4.src == $as1' allow-related
n_flows_after=`ovs-ofctl dump-flows br-int | grep -F "10.1.2.10" | wc -l`
AT_CHECK([test $(expr $n_flows_before \* 2) = $n_flows_after], [0],
[ignore])
# Trigger full recompute. Creating a chassis would trigger full recompute.
- ovn-sbctl chassis-add tst geneve 127.0.0.4
- ovn-sbctl chassis-del tst
+ check ovn-sbctl chassis-add tst geneve 127.0.0.4
+ check ovn-sbctl chassis-del tst
# Remove an ACL
- ovn-nbctl --wait=hv acl-del ls1 to-lport 200 \
+ check ovn-nbctl --wait=hv acl-del ls1 to-lport 200 \
'outport=="lp2" && ip4 && ip4.src == $as1'
n_flows_after=`ovs-ofctl dump-flows br-int | grep -F "10.1.2.10" | wc -l`
AT_CHECK([test $n_flows_before = $n_flows_after], [0], [ignore])
@@ -20505,7 +20505,7 @@ for i in 1 2 3; do
# parsing should fail.
echo "before del as1"
ovn-nbctl list addr | grep as1
- ovn-nbctl --wait=hv destroy addr $as1_uuid
+ check ovn-nbctl --wait=hv destroy addr $as1_uuid
echo "after del as1"
ovn-nbctl list addr | grep as1
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.10"], [1],
[ignore])
@@ -20516,10 +20516,10 @@ for i in 1 2 3; do
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.12"], [0],
[ignore])
# Remove ACLs and address sets
- ovn-nbctl --wait=hv destroy addr $as1_uuid -- destroy addr $as2_uuid
+ check ovn-nbctl --wait=hv destroy addr $as1_uuid -- destroy addr $as2_uuid
AT_CHECK([ovs-ofctl dump-flows br-int | grep -F "10.1.2.12"], [1],
[ignore])
- ovn-nbctl --wait=hv acl-del ls1
+ check ovn-nbctl --wait=hv acl-del ls1
done
# Gracefully terminate daemons
@@ -21448,7 +21448,7 @@ check ovn-nbctl --wait=sb sync
check ovn-nbctl --wait=hv set NB_Global .
options:mac_prefix="0a:00:00:00:00:00"
check ovn-nbctl ls-add sw0
check ovn-nbctl lsp-add sw0 p0 -- lsp-set-addresses p0 dynamic
-ovn-nbctl --wait=sb add Logical-Switch sw0 other_config subnet=192.168.1.0/24
+check ovn-nbctl --wait=sb add Logical-Switch sw0 other_config
subnet=192.168.1.0/24
AT_CHECK([ovn-nbctl get Logical-Switch-Port p0 dynamic_addresses], [0],
["0a:00:00:a8:01:03 192.168.1.2"
@@ -21471,11 +21471,11 @@ check ovn-nbctl ls-add sw
check ovn-nbctl set logical_switch sw other-config:subnet=192.168.1.0/24
for i in 2 3 4; do
- ovn-nbctl lr-add ro$i
- ovn-nbctl lsp-add sw swp$i
- ovn-nbctl --wait=sb lsp-set-addresses swp$i "02:00:00:00:00:0$i dynamic"
+ check ovn-nbctl lr-add ro$i
+ check ovn-nbctl lsp-add sw swp$i
+ check ovn-nbctl --wait=sb lsp-set-addresses swp$i "02:00:00:00:00:0$i
dynamic"
cidr=$(ovn-nbctl get logical_switch_port swp$i dynamic_addresses |cut -f2
-d' '|cut -f1 -d\")
- ovn-nbctl lrp-add ro$i rop$i 02:00:00:00:00:0$i $cidr/24 -- set
logical_switch_port swp$i type=router options:router-port=rop$i
addresses=router;
+ check ovn-nbctl lrp-add ro$i rop$i 02:00:00:00:00:0$i $cidr/24 -- set
logical_switch_port swp$i type=router options:router-port=rop$i
addresses=router;
AT_CHECK_UNQUOTED([ovn-nbctl get logical_router_port rop$i networks], [0],
[[["192.168.1.$i/24"]]
])
done
@@ -21673,16 +21673,16 @@ ovn_start
for i in 1 2; do
ls_name=ls$i
- ovn-nbctl ls-add $ls_name
+ check ovn-nbctl ls-add $ls_name
ln_port_name=ln$i
if test $i -eq 1; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
elif test $i -eq 2; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
fi
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys
done
# lsp_to_ls LSP
@@ -21766,9 +21766,9 @@ for i in 1 2; do
lsp_name=lp$i$i
ls_name=$(lsp_to_ls $lsp_name)
- ovn-nbctl lsp-add $ls_name $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i 192.168.$i.$i"
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
+ check ovn-nbctl lsp-add $ls_name $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
@@ -22463,9 +22463,9 @@ net_add n1
check_uuid ovn-nbctl create Logical_Router name=lr0 options:chassis=hv1
for i in 0 1; do
idx=$((i+1))
- ovn-nbctl ls-add sw$i
- ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$idx 192.168.$idx.254/24
200$idx::a/64
- ovn-nbctl \
+ check ovn-nbctl ls-add sw$i
+ check ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$idx 192.168.$idx.254/24
200$idx::a/64
+ check ovn-nbctl \
-- lsp-add sw$i lrp$i-attachment \
-- set Logical_Switch_Port lrp$i-attachment type=router \
options:router-port=lrp$i \
@@ -22479,7 +22479,7 @@ for i in 1 2; do
ovn_attach n1 br-phys 192.168.0.$i
for j in 1 2; do
- ovn-nbctl lsp-add sw0 sw0-p$i$j -- \
+ check ovn-nbctl lsp-add sw0 sw0-p$i$j -- \
lsp-set-addresses sw0-p$i$j "00:00:00:00:00:$i$j
192.168.1.$i$j 2001::$i$j"
ovs-vsctl -- add-port br-int vif$i$j -- \
@@ -24135,16 +24135,16 @@ m4_define([DVR_N_S_ARP_HANDLING],
for i in 1 2; do
ls_name=ls$i
- ovn-nbctl ls-add $ls_name
+ check ovn-nbctl ls-add $ls_name
ln_port_name=ln$i
if test $i -eq 1; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
elif test $i -eq 2; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
fi
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys
done
# lsp_to_ls LSP
@@ -24185,30 +24185,30 @@ m4_define([DVR_N_S_ARP_HANDLING],
lsp_name=lp$i$i
ls_name=$(lsp_to_ls $lsp_name)
- ovn-nbctl lsp-add $ls_name $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
+ check ovn-nbctl lsp-add $ls_name $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
done
- ovn-nbctl ls-add ls-underlay
- ovn-nbctl lsp-add ls-underlay ln3 "" 1000
- ovn-nbctl lsp-set-addresses ln3 unknown
- ovn-nbctl lsp-set-type ln3 localnet
- ovn-nbctl lsp-set-options ln3 network_name=phys
+ check ovn-nbctl ls-add ls-underlay
+ check ovn-nbctl lsp-add ls-underlay ln3 "" 1000
+ check ovn-nbctl lsp-set-addresses ln3 unknown
+ check ovn-nbctl lsp-set-type ln3 localnet
+ check ovn-nbctl lsp-set-options ln3 network_name=phys
- ovn-nbctl ls-add ls-north
- ovn-nbctl lsp-add ls-north ln4 "" 1000
- ovn-nbctl lsp-set-addresses ln4 unknown
- ovn-nbctl lsp-set-type ln4 localnet
- ovn-nbctl lsp-set-options ln4 network_name=phys
+ check ovn-nbctl ls-add ls-north
+ check ovn-nbctl lsp-add ls-north ln4 "" 1000
+ check ovn-nbctl lsp-set-addresses ln4 unknown
+ check ovn-nbctl lsp-set-type ln4 localnet
+ check ovn-nbctl lsp-set-options ln4 network_name=phys
# Add a VM on ls-north
- ovn-nbctl lsp-add ls-north lp-north
- ovn-nbctl lsp-set-addresses lp-north "f0:f0:00:00:00:11 172.31.0.10"
- ovn-nbctl lsp-set-port-security lp-north f0:f0:00:00:00:11
+ check ovn-nbctl lsp-add ls-north lp-north
+ check ovn-nbctl lsp-set-addresses lp-north "f0:f0:00:00:00:11 172.31.0.10"
+ check ovn-nbctl lsp-set-port-security lp-north f0:f0:00:00:00:11
# Add 3rd hypervisor
sim_add hv3
@@ -24230,16 +24230,16 @@ m4_define([DVR_N_S_ARP_HANDLING],
options:rxq_pcap=hv4/vif-north-rx.pcap \
ofport-request=44
- ovn-nbctl lr-add router
- ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03 192.168.1.3/24
- ovn-nbctl lrp-add router router-to-ls2 00:00:01:01:02:05 192.168.2.3/24
- ovn-nbctl lrp-add router router-to-underlay 00:00:01:01:02:07 172.31.0.1/24
+ check ovn-nbctl lr-add router
+ check ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03
192.168.1.3/24
+ check ovn-nbctl lrp-add router router-to-ls2 00:00:01:01:02:05
192.168.2.3/24
+ check ovn-nbctl lrp-add router router-to-underlay 00:00:01:01:02:07
172.31.0.1/24
- ovn-nbctl lsp-add ls1 ls1-to-router -- set Logical_Switch_Port
ls1-to-router type=router \
+ check ovn-nbctl lsp-add ls1 ls1-to-router -- set Logical_Switch_Port
ls1-to-router type=router \
options:router-port=router-to-ls1 -- lsp-set-addresses
ls1-to-router router
- ovn-nbctl lsp-add ls2 ls2-to-router -- set Logical_Switch_Port
ls2-to-router type=router \
+ check ovn-nbctl lsp-add ls2 ls2-to-router -- set Logical_Switch_Port
ls2-to-router type=router \
options:router-port=router-to-ls2 -- lsp-set-addresses
ls2-to-router router
- ovn-nbctl lsp-add ls-underlay underlay-to-router -- set Logical_Switch_Port
\
+ check ovn-nbctl lsp-add ls-underlay underlay-to-router -- set
Logical_Switch_Port \
underlay-to-router type=router \
options:router-port=router-to-underlay \
-- lsp-set-addresses underlay-to-router router
@@ -24296,7 +24296,7 @@ m4_define([DVR_N_S_ARP_HANDLING],
tip=`printf "%02x%02x%02x%02x" 172 31 0 1`
# Set a hypervisor as gateway chassis, for router port 172.31.0.1
- ovn-nbctl lrp-set-gateway-chassis router-to-underlay hv3
+ check ovn-nbctl lrp-set-gateway-chassis router-to-underlay hv3
wait_for_ports_up
check ovn-nbctl --wait=sb sync
OVN_WAIT_PATCH_PORT_FLOWS(["ln1"] ["ln2"], ["hv1"] ["hv2"] ["hv3"])
@@ -24415,16 +24415,16 @@ m4_define([DVR_N_S_PING],
for i in 1 2; do
ls_name=ls$i
- ovn-nbctl ls-add $ls_name
+ check ovn-nbctl ls-add $ls_name
ln_port_name=ln$i
if test $i -eq 1; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
elif test $i -eq 2; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
fi
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys
done
# lsp_to_ls LSP
@@ -24465,30 +24465,30 @@ m4_define([DVR_N_S_PING],
lsp_name=lp$i$i
ls_name=$(lsp_to_ls $lsp_name)
- ovn-nbctl lsp-add $ls_name $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
+ check ovn-nbctl lsp-add $ls_name $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
done
- ovn-nbctl ls-add ls-underlay
- ovn-nbctl lsp-add ls-underlay ln3 "" 1000
- ovn-nbctl lsp-set-addresses ln3 unknown
- ovn-nbctl lsp-set-type ln3 localnet
- ovn-nbctl lsp-set-options ln3 network_name=phys
+ check ovn-nbctl ls-add ls-underlay
+ check ovn-nbctl lsp-add ls-underlay ln3 "" 1000
+ check ovn-nbctl lsp-set-addresses ln3 unknown
+ check ovn-nbctl lsp-set-type ln3 localnet
+ check ovn-nbctl lsp-set-options ln3 network_name=phys
- ovn-nbctl ls-add ls-north
- ovn-nbctl lsp-add ls-north ln4 "" 1000
- ovn-nbctl lsp-set-addresses ln4 unknown
- ovn-nbctl lsp-set-type ln4 localnet
- ovn-nbctl lsp-set-options ln4 network_name=phys
+ check ovn-nbctl ls-add ls-north
+ check ovn-nbctl lsp-add ls-north ln4 "" 1000
+ check ovn-nbctl lsp-set-addresses ln4 unknown
+ check ovn-nbctl lsp-set-type ln4 localnet
+ check ovn-nbctl lsp-set-options ln4 network_name=phys
# Add a VM on ls-north
- ovn-nbctl lsp-add ls-north lp-north
- ovn-nbctl lsp-set-addresses lp-north "f0:f0:00:00:00:11 172.31.0.10"
- ovn-nbctl lsp-set-port-security lp-north f0:f0:00:00:00:11
+ check ovn-nbctl lsp-add ls-north lp-north
+ check ovn-nbctl lsp-set-addresses lp-north "f0:f0:00:00:00:11 172.31.0.10"
+ check ovn-nbctl lsp-set-port-security lp-north f0:f0:00:00:00:11
# Add 3rd hypervisor
sim_add hv3
@@ -24510,22 +24510,22 @@ m4_define([DVR_N_S_PING],
options:rxq_pcap=hv4/vif-north-rx.pcap \
ofport-request=44
- ovn-nbctl lr-add router
- ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03 192.168.1.3/24
- ovn-nbctl lrp-add router router-to-ls2 00:00:01:01:02:05 192.168.2.3/24
- ovn-nbctl lrp-add router router-to-underlay 00:00:01:01:02:07 172.31.0.1/24
+ check ovn-nbctl lr-add router
+ check ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03
192.168.1.3/24
+ check ovn-nbctl lrp-add router router-to-ls2 00:00:01:01:02:05
192.168.2.3/24
+ check ovn-nbctl lrp-add router router-to-underlay 00:00:01:01:02:07
172.31.0.1/24
- ovn-nbctl lsp-add ls1 ls1-to-router -- set Logical_Switch_Port
ls1-to-router type=router \
+ check ovn-nbctl lsp-add ls1 ls1-to-router -- set Logical_Switch_Port
ls1-to-router type=router \
options:router-port=router-to-ls1 -- lsp-set-addresses
ls1-to-router router
- ovn-nbctl lsp-add ls2 ls2-to-router -- set Logical_Switch_Port
ls2-to-router type=router \
+ check ovn-nbctl lsp-add ls2 ls2-to-router -- set Logical_Switch_Port
ls2-to-router type=router \
options:router-port=router-to-ls2 -- lsp-set-addresses
ls2-to-router router
- ovn-nbctl lsp-add ls-underlay underlay-to-router -- set Logical_Switch_Port
\
+ check ovn-nbctl lsp-add ls-underlay underlay-to-router -- set
Logical_Switch_Port \
underlay-to-router type=router \
options:router-port=router-to-underlay \
-- lsp-set-addresses underlay-to-router router
- ovn-nbctl lrp-set-gateway-chassis router-to-underlay hv3
- ovn-nbctl lrp-set-redirect-type router-to-underlay bridged
+ check ovn-nbctl lrp-set-gateway-chassis router-to-underlay hv3
+ check ovn-nbctl lrp-set-redirect-type router-to-underlay bridged
wait_for_ports_up
check ovn-nbctl --wait=sb sync
@@ -25091,16 +25091,16 @@ ovn_start
for i in 1 2; do
ls_name=ls$i
- ovn-nbctl ls-add $ls_name
+ check ovn-nbctl ls-add $ls_name
ln_port_name=ln$i
if test $i -eq 1; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 101
elif test $i -eq 2; then
- ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
+ check ovn-nbctl lsp-add $ls_name $ln_port_name "" 201
fi
- ovn-nbctl lsp-set-addresses $ln_port_name unknown
- ovn-nbctl lsp-set-type $ln_port_name localnet
- ovn-nbctl lsp-set-options $ln_port_name network_name=phys
+ check ovn-nbctl lsp-set-addresses $ln_port_name unknown
+ check ovn-nbctl lsp-set-type $ln_port_name localnet
+ check ovn-nbctl lsp-set-options $ln_port_name network_name=phys
done
# lsp_to_ls LSP
@@ -25141,9 +25141,9 @@ for i in 1 2; do
lsp_name=lp$i$i
ls_name=$(lsp_to_ls $lsp_name)
- ovn-nbctl lsp-add $ls_name $lsp_name
- ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i 192.168.$i.$i"
- ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
+ check ovn-nbctl lsp-add $ls_name $lsp_name
+ check ovn-nbctl lsp-set-addresses $lsp_name "f0:00:00:00:00:$i$i
192.168.$i.$i"
+ check ovn-nbctl lsp-set-port-security $lsp_name f0:00:00:00:00:$i$i
OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up $lsp_name` = xup])
@@ -26432,8 +26432,8 @@ check ovn-nbctl ls-add ls1
check ovn-nbctl ls-add ls2
for i in 1 2; do
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01 192.168.${i}.1/24
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
192.168.${i}.1/24
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
done
@@ -26543,8 +26543,8 @@ check ovn-nbctl ls-add ls1
check ovn-nbctl ls-add ls2
for i in 1 2; do
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01 192.168.${i}.1/24
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
192.168.${i}.1/24
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
done
@@ -26779,9 +26779,9 @@ ovn_start
check ovn-nbctl lr-add lr1
for i in 1 2; do
- ovn-nbctl ls-add ls${i}
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01 192.168.${i}.1/24
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl ls-add ls${i}
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
192.168.${i}.1/24
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
done
@@ -26945,9 +26945,9 @@ ovn_start
check ovn-nbctl lr-add lr1
for i in 1 2; do
- ovn-nbctl ls-add ls${i}
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01 192.168.${i}.1/24
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl ls-add ls${i}
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
192.168.${i}.1/24
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
done
@@ -27085,12 +27085,12 @@ check ovn-nbctl lr-add lr1
# Create logical topology
for i in $(seq 1 4); do
- ovn-nbctl ls-add ls${i}
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01 192.168.${i}.1/24
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl ls-add ls${i}
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
192.168.${i}.1/24
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
- ovn-nbctl lsp-add ls$i lsp${i}1 -- \
+ check ovn-nbctl lsp-add ls$i lsp${i}1 -- \
lsp-set-addresses lsp${i}1 "f0:00:00:00:0${i}:1${i} 192.168.${i}.${i}1"
done
@@ -27198,12 +27198,12 @@ check ovn-nbctl lr-add lr1
# Create logical topology
for i in $(seq 1 4); do
- ovn-nbctl ls-add ls${i}
- ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
2001:db8:${i}::1/64
- ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type lsp-ls${i}-lr1
router \
+ check ovn-nbctl ls-add ls${i}
+ check ovn-nbctl lrp-add lr1 lrp-lr1-ls${i} 00:00:00:01:0${i}:01
2001:db8:${i}::1/64
+ check ovn-nbctl lsp-add ls${i} lsp-ls${i}-lr1 -- lsp-set-type
lsp-ls${i}-lr1 router \
-- lsp-set-options lsp-ls${i}-lr1 router-port=lrp-lr1-ls${i} \
-- lsp-set-addresses lsp-ls${i}-lr1 router
- ovn-nbctl lsp-add ls$i lsp${i}1 -- \
+ check ovn-nbctl lsp-add ls$i lsp${i}1 -- \
lsp-set-addresses lsp${i}1 "f0:00:00:00:0${i}:1${i}
2001:db8:${i}::${i}1"
done
@@ -29395,9 +29395,9 @@ check ovn-nbctl ls-add s2 # simulate internal LS
# Connnect r1 to ext.
check ovn-nbctl lrp-add r1 lrp-r1-ext 00:00:00:00:01:01 10.0.1.1/24
if test X"$1" = X"DGP"; then
- ovn-nbctl lrp-set-gateway-chassis lrp-r1-ext hv1 1
+ check ovn-nbctl lrp-set-gateway-chassis lrp-r1-ext hv1 1
else
- ovn-nbctl set logical_router r1 options:chassis=hv1
+ check ovn-nbctl set logical_router r1 options:chassis=hv1
fi
check ovn-nbctl lsp-add ext lsp-ext-r1 -- set Logical_Switch_Port lsp-ext-r1
type=router \
options:router-port=lrp-r1-ext addresses=router
@@ -30275,7 +30275,7 @@ for i in 1 2; do
external_ids:iface-id=lsp$i$j \
external_ids:encap-ip=192.168.0.$i$j \
options:tx_pcap=hv$i/vif$i$j-tx.pcap
options:rxq_pcap=hv$i/vif$i$j-rx.pcap
- ovn-nbctl lsp-add ls1 lsp$i$j -- lsp-set-addresses lsp$i$j
"f0:00:00:00:00:$i$j 10.0.0.$i$j"
+ check ovn-nbctl lsp-add ls1 lsp$i$j -- lsp-set-addresses lsp$i$j
"f0:00:00:00:00:$i$j 10.0.0.$i$j"
done
done
@@ -30377,7 +30377,7 @@ for i in 1 2; do
external_ids:iface-id=lsp$i$j \
external_ids:encap-ip=192.168.0.$i$j \
options:tx_pcap=hv$i/vif$i$j-tx.pcap
options:rxq_pcap=hv$i/vif$i$j-rx.pcap
- ovn-nbctl lsp-add ls$i lsp$i$j -- lsp-set-addresses lsp$i$j
"f0:00:00:00:00:$i$j 10.0.$i.$j"
+ check ovn-nbctl lsp-add ls$i lsp$i$j -- lsp-set-addresses lsp$i$j
"f0:00:00:00:00:$i$j 10.0.$i.$j"
done
done
@@ -32618,16 +32618,16 @@ ovn_attach n1 br-phys 192.168.0.1
check ovn-nbctl lr-add lr0
for i in $(seq 0 9); do
- ovn-nbctl ls-add ls$i
- ovn-nbctl lrp-add lr0 lrp_lr0_ls$i aa:bb:bb:00:00:0$i 192.168.${i}.1/24
+ check ovn-nbctl ls-add ls$i
+ check ovn-nbctl lrp-add lr0 lrp_lr0_ls$i aa:bb:bb:00:00:0$i
192.168.${i}.1/24
- ovn-nbctl lsp-add ls$i lsp_ls${i}_lr0 -- \
+ check ovn-nbctl lsp-add ls$i lsp_ls${i}_lr0 -- \
lsp-set-addresses lsp_ls${i}_lr0 router -- \
lsp-set-type lsp_ls${i}_lr0 router -- \
lsp-set-options lsp_ls${i}_lr0 router-port=lrp_lr0_ls${i}
for j in 0 1; do
- ovn-nbctl lsp-add ls$i lsp${i}-${j} -- \
+ check ovn-nbctl lsp-add ls$i lsp${i}-${j} -- \
lsp-set-addresses lsp${i}-${j} "aa:aa:aa:00:0$i:0$j 192.168.$i.1$j"
done
done
@@ -32949,9 +32949,9 @@ arp_proxy_ls2=(00:00:00:02:02:f1 \
fd7b:6b4d:7b25:d22c::1)
arp_proxy_ls2_option="\"${arp_proxy_ls2[[*]]}\""
-ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \
+check ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \
options arp_proxy="$arp_proxy_ls1_option"
-ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \
+check ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \
options arp_proxy="$arp_proxy_ls2_option"
ovn-sbctl dump-flows > sbflows
AT_CAPTURE_FILE([sbflows])
@@ -33044,10 +33044,10 @@ AT_CHECK([ovn-sbctl dump-flows |
])
# Add the flows back send arp request and check we see an ARP response
-ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \
+check ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls1 \
options arp_proxy="$arp_proxy_ls1_option"
-ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \
+check ovn-nbctl --wait=hv add Logical_Switch_Port rp-ls2 \
options arp_proxy="$arp_proxy_ls2_option"
bcast_mac=ff:ff:ff:ff:ff:ff
@@ -39266,7 +39266,7 @@ ovn_start
net_add n1
for i in 1 2; do
check ovn-nbctl ls-add ls${i}
- ovn-nbctl lsp-add ls${i} lsp${i}
+ check ovn-nbctl lsp-add ls${i} lsp${i}
sim_add hv$i
as hv$i
ovs-vsctl add-br br-phys
diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index c4ce2f9e4..c82f1f294 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -400,51 +400,51 @@ ADD_VETH(s1, server, br-ext, "2001:1db8:3333::2/64",
"f0:00:00:01:02:05", \
if test X"$1" = X"GR"; then
check_uuid ovn-nbctl create Logical_Router name=R1 options:chassis=hv1
else
- ovn-nbctl lr-add R1
+ check ovn-nbctl lr-add R1
fi
-ovn-nbctl ls-add sw0
-ovn-nbctl ls-add sw1
-ovn-nbctl ls-add public
+check ovn-nbctl ls-add sw0
+check ovn-nbctl ls-add sw1
+check ovn-nbctl ls-add public
-ovn-nbctl lrp-add R1 rp-sw0 00:00:01:01:02:03 192.168.1.1/24
-ovn-nbctl lrp-add R1 rp-sw1 00:00:03:01:02:03 192.168.2.1/24
-ovn-nbctl lrp-add R1 rp-public 00:00:02:01:02:03 172.16.1.1/24
+check ovn-nbctl lrp-add R1 rp-sw0 00:00:01:01:02:03 192.168.1.1/24
+check ovn-nbctl lrp-add R1 rp-sw1 00:00:03:01:02:03 192.168.2.1/24
+check ovn-nbctl lrp-add R1 rp-public 00:00:02:01:02:03 172.16.1.1/24
if test X"$1" != X"GR"; then
- ovn-nbctl lrp-set-gateway-chassis rp-public hv1
+ check ovn-nbctl lrp-set-gateway-chassis rp-public hv1
fi
-ovn-nbctl lsp-add sw0 sw0-rp -- set Logical_Switch_Port sw0-rp \
+check ovn-nbctl lsp-add sw0 sw0-rp -- set Logical_Switch_Port sw0-rp \
type=router options:router-port=rp-sw0 \
-- lsp-set-addresses sw0-rp router
-ovn-nbctl lsp-add sw1 sw1-rp -- set Logical_Switch_Port sw1-rp \
+check ovn-nbctl lsp-add sw1 sw1-rp -- set Logical_Switch_Port sw1-rp \
type=router options:router-port=rp-sw1 \
-- lsp-set-addresses sw1-rp router
-ovn-nbctl lsp-add public public-rp -- set Logical_Switch_Port public-rp \
+check ovn-nbctl lsp-add public public-rp -- set Logical_Switch_Port public-rp \
type=router options:router-port=rp-public \
-- lsp-set-addresses public-rp router
-ovn-nbctl lsp-add sw0 sw01 \
+check ovn-nbctl lsp-add sw0 sw01 \
-- lsp-set-addresses sw01 "f0:00:00:01:02:03 192.168.1.2"
-ovn-nbctl lsp-add sw1 sw11 \
+check ovn-nbctl lsp-add sw1 sw11 \
-- lsp-set-addresses sw11 "f0:00:00:02:02:03 192.168.2.2"
AT_CHECK([ovs-vsctl set Open_vSwitch .
external-ids:ovn-bridge-mappings=phynet:br-ext])
-ovn-nbctl lsp-add public public1 \
+check ovn-nbctl lsp-add public public1 \
-- lsp-set-addresses public1 unknown \
-- lsp-set-type public1 localnet \
-- lsp-set-options public1 network_name=phynet
-ovn-nbctl set logical_router_port rp-public options:prefix_delegation=true
-ovn-nbctl set logical_router_port rp-public options:prefix=true
-ovn-nbctl set logical_router_port rp-sw0 options:prefix=true
+check ovn-nbctl set logical_router_port rp-public
options:prefix_delegation=true
+check ovn-nbctl set logical_router_port rp-public options:prefix=true
+check ovn-nbctl set logical_router_port rp-sw0 options:prefix=true
OVN_POPULATE_ARP
-ovn-nbctl --wait=hv sync
+check ovn-nbctl --wait=hv sync
cat > /etc/dhcp/dhcpd.conf <<EOF
option dhcp-rebinding-time 10;
@@ -461,7 +461,7 @@ chmod 664 /var/lib/dhcp/dhcpd6.leases
NETNS_START_TCPDUMP([server], [-nni s1], [server])
NETNS_DAEMONIZE([server], [dhcpd -6 -f s1 > dhcpd.log 2>&1], [dhcpd.pid])
-ovn-nbctl --wait=hv sync
+check ovn-nbctl --wait=hv sync
OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-public
ipv6_prefix | cut -c4-15)" = ""])
OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix |
cut -c4-15)" = ""])
@@ -491,9 +491,9 @@ OVS_WAIT_UNTIL([
test "${total_pkts}" = "4"
])
-ovn-nbctl set logical_router_port rp-public options:prefix=false
-ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
-ovn-nbctl --wait=hv set logical_router_port rp-sw1 options:prefix=true
+check ovn-nbctl set logical_router_port rp-public options:prefix=false
+check ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
+check ovn-nbctl --wait=hv set logical_router_port rp-sw1 options:prefix=true
sleep_sb
NETNS_START_TCPDUMP([server], [-c 2 -nni s1 ip6[[48:1]]=0x05 and
ip6[[113:4]]=0x${prefix}], [renew2])
@@ -507,8 +507,8 @@ OVS_WAIT_UNTIL([
test "${total_pkts}" = "2"
])
-ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
-ovn-nbctl clear logical_router_port rp-sw0 ipv6_prefix
+check ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
+check ovn-nbctl clear logical_router_port rp-sw0 ipv6_prefix
OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix |
cut -c3-16)" = "[2001:1db8:3333]"])
AT_CHECK([ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-16],
[0], [dnl
[]
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 4031663b9..1741b5f48 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -1890,7 +1890,7 @@ for i in `seq 1 4`; do
j=`expr $i + 1`
ADD_VETH(foo$i, foo$i, br-int, "192.168.1.$j/24", "f0:00:00:01:02:0$j", \
"192.168.1.1")
- ovn-nbctl lsp-add foo foo$i \
+ check ovn-nbctl lsp-add foo foo$i \
-- lsp-set-addresses foo$i "f0:00:00:01:02:0$j 192.168.1.$j"
done
@@ -1998,7 +1998,7 @@ for i in `seq 1 4`; do
j=`expr $i + 1`
ADD_VETH(foo$i, foo$i, br-int, "fd01::$j/64", "f0:00:00:01:02:0$j", \
"fd01::1")
- ovn-nbctl lsp-add foo foo$i \
+ check ovn-nbctl lsp-add foo foo$i \
-- lsp-set-addresses foo$i "f0:00:00:01:02:0$j fd01::$j"
done
@@ -4302,7 +4302,7 @@ net.ipv4.igmp_qrv = 1
])
ADD_VETH(sw1-p$i, sw1-p$i, br-int, "10.0.0.$i/24", "00:00:00:00:01:0$i", \
"10.0.0.254")
- ovn-nbctl lsp-add sw1 sw1-p$i \
+ check ovn-nbctl lsp-add sw1 sw1-p$i \
-- lsp-set-addresses sw1-p$i "00:00:00:00:01:0$i 10.0.0.$i"
done
@@ -4311,7 +4311,7 @@ do
ADD_NAMESPACES(sw2-p$i)
ADD_VETH(sw2-p$i, sw2-p$i, br-int, "20.0.0.$i/24", "00:00:00:00:02:0$i", \
"20.0.0.254")
- ovn-nbctl lsp-add sw2 sw2-p$i \
+ check ovn-nbctl lsp-add sw2 sw2-p$i \
-- lsp-set-addresses sw2-p$i "00:00:00:00:02:0$i 20.0.0.$i"
done
@@ -13152,40 +13152,40 @@ check_row_count nb:Sampling_App 2
dnl Create ACLs that match the 3 types of traffic in all 3 possible stages:
dnl from-lport, from-lport-after-lb, to-lport.
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_in_1c_new create Sample collector="$collector1"
metadata=1001 \
-- --id=@sample_in_1c_est create Sample collector="$collector1"
metadata=1002 \
-- --sample-new=@sample_in_1c_new --sample-est=@sample_in_1c_est
\
acl-add ls from-lport 1 "inport == \"vm1\" && udp.dst == 1000"
\
allow-related
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_in_2c_new create Sample collector="$collector1
$collector2" metadata=1011 \
-- --id=@sample_in_2c_est create Sample collector="$collector1
$collector2" metadata=1012 \
-- --sample-new=@sample_in_2c_new --sample-est=@sample_in_2c_est
\
acl-add ls from-lport 1 "inport == \"vm1\" && udp.dst == 1010"
\
allow-related
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_in_lb_1c_new create Sample collector="$collector1"
metadata=2001 \
-- --id=@sample_in_lb_1c_est create Sample collector="$collector1"
metadata=2002 \
-- --apply-after-lb --sample-new=@sample_in_lb_1c_new
\
--sample-est=@sample_in_lb_1c_est
\
acl-add ls from-lport 1 "inport == \"vm1\" && udp.dst == 2000"
\
allow-related
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_in_lb_2c_new create Sample collector="$collector1
$collector2" metadata=2011 \
-- --id=@sample_in_lb_2c_est create Sample collector="$collector1
$collector2" metadata=2012 \
-- --apply-after-lb --sample-new=@sample_in_lb_2c_new
--sample-est=@sample_in_lb_2c_est \
acl-add ls from-lport 1 "inport == \"vm1\" && udp.dst == 2010"
\
allow-related
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_out_1c_new create Sample collector="$collector1"
metadata=3001 \
-- --id=@sample_out_1c_est create Sample collector="$collector1"
metadata=3002 \
-- --sample-new=@sample_out_1c_new --sample-est=@sample_out_1c_est
\
acl-add ls to-lport 1 "outport == \"vm2\" && udp.dst == 3000"
\
allow-related
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample_out_2c_new create Sample collector="$collector1
$collector2" metadata=3011 \
-- --id=@sample_out_2c_est create Sample collector="$collector1
$collector2" metadata=3012 \
-- --sample-new=@sample_out_2c_new --sample-est=@sample_out_2c_est
\
@@ -13347,14 +13347,14 @@ check_uuid ovn-nbctl create Sampling_App
type="acl-est" id="43"
check_row_count nb:Sampling_App 2
dnl Create two tiers of ACLs.
-check_uuid ovn-nbctl \
+ovn-nbctl \
-- --id=@sample_1_new create Sample collector="$collector1" metadata=1001 \
-- --id=@sample_1_est create Sample collector="$collector1" metadata=1002 \
-- --tier=0 --sample-new=@sample_1_new --sample-est=@sample_1_est \
acl-add ls from-lport 1 "inport == \"vm1\" && udp.dst == 1000" \
pass
-check_uuid ovn-nbctl \
+ovn-nbctl \
-- --id=@sample_2_new create Sample collector="$collector1" metadata=2001 \
-- --id=@sample_2_est create Sample collector="$collector1" metadata=2002 \
-- --tier=1 --sample-new=@sample_2_new --sample-est=@sample_2_est \
@@ -13483,7 +13483,7 @@ dnl Create three ACLs:
dnl - one from-lport, stateful, allowing all traffic
dnl - one to-lport, dropping all traffic to 1.1.1.1 (single collector)
dnl - one to-lport, dropping all traffic to 1.1.1.2 (two collectors)
-check_uuid ovn-nbctl
\
+ovn-nbctl
\
-- --id=@sample1 create Sample collector="$collector1" metadata=1001
\
-- --id=@sample2 create Sample collector="$collector1" metadata=1002
\
-- --id=@sample3 create Sample collector="$collector1 $collector2"
metadata=1003 \
@@ -14082,7 +14082,7 @@ chmod 664 /var/lib/dhcp/dhcpd6.leases
NETNS_START_TCPDUMP([server], [-nni s1], [server])
NETNS_DAEMONIZE([server], [dhcpd -6 -f s1 > dhcpd.log 2>&1], [dhcpd.pid])
-ovn-nbctl --wait=hv sync
+check ovn-nbctl --wait=hv sync
AT_CHECK([ovn-appctl debug/dump-peer-ports | sort], [0], [dnl
dp R1 : local = rp-public, remote = public-rp
--
2.47.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
