From 4e6c498068dc4fa9546d3661f78f0a42e99c74bb Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Mon, 19 Jul 2021 15:51:22 +0200 Subject: [PATCH] ovn.at: Fix "Symmetric IPv6 ECMP reply flows" test. 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 Acked-by: Mark D. Gray Signed-off-by: Numan Siddique --- tests/ovn.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovn.at b/tests/ovn.at index 32efc054fc..777409144f 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -23468,7 +23468,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" | \