From: Anton Ivanov <[email protected]>

Test 121 was configuring the interface with test traffic
before the LSP was configured. As a result, test traffic
could be processed before the LSP was set resulting in a
test failure

Signed-off-by: Anton Ivanov <[email protected]>
---
 tests/ovn.at | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 9a44f0a6f..cf6956cdd 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -9318,6 +9318,7 @@ OVN_CHECK_PACKETS([hv3/vif1-tx.pcap], [hv3-vif1.expected])
 
 # Now add bridge-mappings on hv2, which should make everything work
 as hv2 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
+sleep 1
 
 # Wait until the patch ports are created in hv2 to connect br-int to br-phys
 OVS_WAIT_UNTIL([test 1 = `as hv2 ovs-vsctl show | \
@@ -17356,11 +17357,6 @@ ovs-vsctl add-br br-phys
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 ovn_attach n1 br-phys 192.168.0.1
 
-ovs-vsctl add-port br-int vif11 -- \
-    set Interface vif11 external-ids:iface-id=lp11 \
-                          options:tx_pcap=hv1/vif11-tx.pcap \
-                          options:rxq_pcap=hv1/vif11-rx.pcap \
-                          ofport-request=11
 
 lsp_name=lp11
 
@@ -17368,6 +17364,12 @@ ovn-nbctl lsp-add ls1 lp11
 ovn-nbctl lsp-set-addresses lp11 "f0:00:00:00:00:11"
 ovn-nbctl lsp-set-port-security lp11 f0:00:00:00:00:11
 
+ovs-vsctl add-port br-int vif11 -- \
+    set Interface vif11 external-ids:iface-id=lp11 \
+                          options:tx_pcap=hv1/vif11-tx.pcap \
+                          options:rxq_pcap=hv1/vif11-rx.pcap \
+                          ofport-request=11
+
 OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lp11` = xup])
 
 ovn-nbctl --wait=sb sync
-- 
2.20.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to