summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Chaudron <echaudro@redhat.com>2023-03-13 15:31:40 +0100
committerIlya Maximets <i.maximets@ovn.org>2023-03-13 23:05:37 +0100
commit691b9e5148a09a7626a2f899cd741e0d3c7bc16f (patch)
treedaa1cd0a8eb40cc20276e3b20e818f0018433ced
parent7aa314c9c249497603bd948da2dcdc86cf0aa001 (diff)
downloadopenvswitch-691b9e5148a09a7626a2f899cd741e0d3c7bc16f.tar.gz
system-traffic: Fix conntrack test cases which are failing with af_xdp.
The recently added test cases below are not passing on the af_xdp datapath due to tcpdump not working on the OVS ports with this datapath. conntrack - ICMP related NAT with single port conntrack - ICMPv6 related NAT with single port conntrack - ICMP from different source related with NAT The tests are changed to attach tcpdump on the associated veth port in the netns. Tests are now passing with all datapaths (afxdp, kernel, userspace, and offloads). Fixes: 8bd688063078 ("system-traffic.at: Add icmp error tests while dnatting address and port.") Fixes: 0a7587034dc9 ("conntrack: Properly unNAT inner header of related traffic.") Signed-off-by: Eelco Chaudron <echaudro@redhat.com> Acked-by: Ales Musil <amusil@redhat.com> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
-rw-r--r--tests/system-traffic.at6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index 4a37641b2..89b0d2624 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -7161,8 +7161,7 @@ table=2,in_port=ovs-server,ip,ct_state=+trk+rpl,actions=output:ovs-client
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
rm server.pcap
-tcpdump -l -U -i ovs-server -w server.pcap 2>tcpdump0_err &
-on_exit "kill $!"
+NETNS_DAEMONIZE([server], [tcpdump -l -U -i server -w server.pcap 2>tcpdump0_err], [tcpdump0.pid])
OVS_WAIT_UNTIL([grep "listening" tcpdump0_err])
dnl Send UDP client->server
@@ -7204,8 +7203,7 @@ dnl Check the ICMP error in reply direction
AT_CHECK([ovs-appctl dpctl/flush-conntrack zone=42])
rm client.pcap
-tcpdump -l -U -i ovs-client -w client.pcap 2>tcpdump1_err &
-on_exit "kill $!"
+NETNS_DAEMONIZE([client], [tcpdump -l -U -i client -w client.pcap 2>tcpdump1_err], [tcpdump1.pid])
OVS_WAIT_UNTIL([grep "listening" tcpdump1_err])
dnl Send UDP client->server