Skip to content

Commit 37f0b27

Browse files
simonartxavieralmusil
authored andcommitted
tests: Fix flaky "interconnection".
When comparing flows before and after recompute, flows corresponding tp datapath which became local temporarily should be ignored. Instead of listing all ts and ports in this case, configure the system so that such datapath and ports are not temporarily local. Signed-off-by: Xavier Simonart <xsimonar@redhat.com> Acked-by: Mark Michelson <mmichels@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com> (cherry picked from commit 1a62814)
1 parent 51dab69 commit 37f0b27

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tests/ovn-ic.at

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,12 +1555,12 @@ for az in `seq 1 $n_az`; do
15551555
check ovn-nbctl lsp-set-type lsp-ls$az-$i-lr$az-$i router
15561556
check ovn-nbctl lsp-set-options lsp-ls$az-$i-lr$az-$i router-port=lrp-lr$az-$i-ls$az-$i
15571557

1558-
check ovn-nbctl lrp-add lr$az-$i lrp-lr$az-$i-ts$i $lrp_ts_mac $lrp_ts_ip/24
1559-
check ovn-nbctl lsp-add ts$i lsp-ts$i-lr$az-$i
1560-
check ovn-nbctl lsp-set-addresses lsp-ts$i-lr$az-$i router
1561-
check ovn-nbctl lsp-set-type lsp-ts$i-lr$az-$i router
1562-
check ovn-nbctl lsp-set-options lsp-ts$i-lr$az-$i router-port=lrp-lr$az-$i-ts$i
1563-
check ovn-nbctl lrp-set-gateway-chassis lrp-lr$az-$i-ts$i gw$az
1558+
check ovn-nbctl -- lrp-add lr$az-$i lrp-lr$az-$i-ts$i $lrp_ts_mac $lrp_ts_ip/24 \
1559+
-- lsp-add ts$i lsp-ts$i-lr$az-$i \
1560+
-- lsp-set-addresses lsp-ts$i-lr$az-$i router \
1561+
-- lsp-set-type lsp-ts$i-lr$az-$i router \
1562+
-- lsp-set-options lsp-ts$i-lr$az-$i router-port=lrp-lr$az-$i-ts$i \
1563+
-- lrp-set-gateway-chassis lrp-lr$az-$i-ts$i gw$az
15641564
done
15651565
check ovn-nbctl --wait=hv sync
15661566
ovn-sbctl list Port_Binding > az$az.ports

0 commit comments

Comments
 (0)