Skip to content

Commit 59a155c

Browse files
chaudronapconole
authored andcommitted
tests: Fix 'ICMP related with SNAT' test case in offload scenario.
This commit fixes the 'ICMP related with SNAT' test case when running 'make check-offloads'. The test case was flushing the datapath rules and then checking the conntrack entries. In the TC offload case, this was clearing the conntrack entries. This fix moves the conntrack entry test before flushing the datapath rules. Fixes: 7b74454 ("system-tests: Test openflow matching for ct related packets with SNAT.") Signed-off-by: Eelco Chaudron <echaudro@redhat.com> Signed-off-by: Aaron Conole <aconole@redhat.com>
1 parent d753610 commit 59a155c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/system-traffic.at

+4-4
Original file line numberDiff line numberDiff line change
@@ -7590,6 +7590,10 @@ dnl Solicit another "destination unreachable" response.
75907590
dnl To verify that after flushing, the same openflow rules are matched.
75917591
NS_CHECK_EXEC([at_ns0], [bash -c "echo a | nc $NC_EOF_OPT -u 10.1.1.2 10000"])
75927592

7593+
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl
7594+
udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>)
7595+
])
7596+
75937597
AT_CHECK([ovs-appctl revalidator/purge], [0])
75947598
AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_bytes | sort | grep -v drop], [0], [dnl
75957599
n_packets=1, priority=10,arp actions=NORMAL
@@ -7606,10 +7610,6 @@ AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_byt
76067610
OFPST_FLOW reply (OF1.5):
76077611
])
76087612

7609-
AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl
7610-
udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>)
7611-
])
7612-
76137613
AT_CHECK([tcpdump -n -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog])
76147614

76157615
OVS_TRAFFIC_VSWITCHD_STOP

0 commit comments

Comments
 (0)