When running tests against OVS master branch, the "Symmetric IPv6 ECMP
reply flows" test was failing because it wasn't taking into account the
possibility that null-SNAT might be supported by the userspace datapath
(which it is, since ba16a36f358a ("dpif-netdev: Add all-zero SNAT to the
advertised features of ct.")).

Fixes: 58683a4271e6 ("ovn-controller: Handle DNAT/no-NAT conntrack tuple 
collisions.")
Signed-off-by: Dumitru Ceara <[email protected]>
---
 tests/ovn.at | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 93e1a0267..fa86052bf 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -23447,7 +23447,7 @@ AT_CHECK([
     for hv in 1 2; do
         grep table=15 hv${hv}flows | \
         grep "priority=100" | \
-        grep -c 
"ct(commit,zone=NXM_NX_REG11\\[[0..15\\]],exec(move:NXM_OF_ETH_SRC\\[[\\]]->NXM_NX_CT_LABEL\\[[32..79\\]],load:0x[[0-9]]->NXM_NX_CT_LABEL\\[[80..95\\]]))"
+        grep -c 
"ct(commit,zone=NXM_NX_REG11\\[[0..15\\]],.*exec(move:NXM_OF_ETH_SRC\\[[\\]]->NXM_NX_CT_LABEL\\[[32..79\\]],load:0x[[0-9]]->NXM_NX_CT_LABEL\\[[80..95\\]]))"
 
         grep table=22 hv${hv}flows | \
         grep "priority=200" | \
-- 
2.27.0

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

Reply via email to