diff mbox series

[ovs-dev,5/6] tests: Fix flaky ACL Sampling system tests.

Message ID 20240830074109.1798553-6-xsimonar@redhat.com
State Accepted
Headers show
Series Fix unit, system and ovn-ic tests. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Xavier Simonart Aug. 30, 2024, 7:41 a.m. UTC
Waiting for "ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids'" does
not guarantee that sampling related flows are installed in OVS.

Fixes: d15b12da6fe6 ("northd: Add ACL Sampling.")
Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/system-ovn.at | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 463081721..475a036d4 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -13165,6 +13165,7 @@  ovs-vsctl --id=@br get Bridge br-int \
     -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \
     -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix
 
+ovn-nbctl --wait=hv sync
 dnl And wait for it to be up and running.
 OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids'])
 
@@ -13333,6 +13334,7 @@  ovs-vsctl --id=@br get Bridge br-int \
     -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \
     -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix
 
+ovn-nbctl --wait=hv sync
 dnl And wait for it to be up and running.
 OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids'])
 
@@ -13462,6 +13464,7 @@  ovs-vsctl --id=@br get Bridge br-int \
     -- --id=@ipfix create IPFIX targets=\"127.0.0.1:4242\" template_interval=1 \
     -- --id=@cs create Flow_Sample_Collector_Set id=100 bridge=@br ipfix=@ipfix
 
+ovn-nbctl --wait=hv sync
 dnl And wait for it to be up and running.
 OVS_WAIT_UNTIL([ovs-ofctl dump-ipfix-flow br-int | grep -q '1 ids'])