Skip to content

Commit 9285574

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 2ebc682 commit 9285574

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
@@ -7324,6 +7324,10 @@ dnl Solicit another "destination unreachable" response.
73247324
dnl To verify that after flushing, the same openflow rules are matched.
73257325
NS_CHECK_EXEC([at_ns0], [bash -c "echo a | nc $NC_EOF_OPT -u 10.1.1.2 10000"])
73267326

7327+
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
7328+
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>)
7329+
])
7330+
73277331
AT_CHECK([ovs-appctl revalidator/purge], [0])
73287332
AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_bytes | sort | grep -v drop], [0], [dnl
73297333
n_packets=1, priority=10,arp actions=NORMAL
@@ -7340,10 +7344,6 @@ AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_byt
73407344
OFPST_FLOW reply (OF1.5):
73417345
])
73427346

7343-
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
7344-
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>)
7345-
])
7346-
73477347
AT_CHECK([tcpdump -n -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog])
73487348

73497349
OVS_TRAFFIC_VSWITCHD_STOP

0 commit comments

Comments
 (0)