diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 0617d56..8a51850 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -1370,9 +1370,18 @@ index 7215e36e2..cf2a3c2e3 100644 /failed to offload flow/d "]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index 808c492a2..418cd32fe 100644 +index 808c492a2..1df2a5419 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at +@@ -888,7 +888,7 @@ NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -w 2 fc00::100 | FORMAT_PING], [0] + ]) + + dnl Start tcpdump to capture the encapsulated packets. +-NETNS_DAEMONIZE([at_ns0], [tcpdump -U -i p0 -w p0.pcap], [tcpdump.pid]) ++NETNS_DAEMONIZE([at_ns0], [tcpdump -n -U -i p0 -w p0.pcap], [tcpdump.pid]) + sleep 1 + + dnl Generate a single packet trough the controler that needs an ARP modification @@ -2516,6 +2516,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct flush]) @@ -1420,6 +1429,76 @@ index 808c492a2..418cd32fe 100644 AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "10\.1\.1\.1"], [1]) ]) +@@ -3796,7 +3814,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp,actions=ovs-p0 + AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) + + rm p0.pcap +-NETNS_DAEMONIZE([at_ns0], [tcpdump -l -U -i p0 -w p0.pcap 2> tcpdump0_err], [tcpdump0.pid]) ++NETNS_DAEMONIZE([at_ns0], [tcpdump -n -l -U -i p0 -w p0.pcap 2> tcpdump0_err], [tcpdump0.pid]) + OVS_WAIT_UNTIL([grep "listening" tcpdump0_err]) + + dnl Send UDP packet from 10.1.1.1:1234 to 10.1.1.240:80 +@@ -6140,7 +6158,7 @@ table=10 priority=0 action=drop + AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) + + rm p0.pcap +-OVS_DAEMONIZE([tcpdump -U -i ovs-p0 -w p0.pcap], [tcpdump.pid]) ++OVS_DAEMONIZE([tcpdump -n -U -i ovs-p0 -w p0.pcap], [tcpdump.pid]) + sleep 1 + + dnl UDP packets from ns0->ns1 should solicit "destination unreachable" response. +@@ -6164,7 +6182,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst= + udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=),mark=1 + ]) + +-AT_CHECK([tcpdump -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) ++AT_CHECK([tcpdump -n -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) + + OVS_TRAFFIC_VSWITCHD_STOP + AT_CLEANUP +@@ -6909,13 +6927,13 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2]) + AT_CHECK([ovs-appctl dpctl/flush-conntrack]) + + rm p0.pcap +-OVS_DAEMONIZE([tcpdump -U -i ovs-p0 -w p0.pcap], [tcpdump.pid]) ++OVS_DAEMONIZE([tcpdump -n -U -i ovs-p0 -w p0.pcap], [tcpdump.pid]) + sleep 1 + + dnl UDP packets from ns0->ns1 should solicit "destination unreachable" response. + NS_CHECK_EXEC([at_ns0], [bash -c "echo a | nc -6 $NC_EOF_OPT -u fc00::2 1"]) + +-AT_CHECK([tcpdump -v "icmp6" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) ++AT_CHECK([tcpdump -n -v "icmp6" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) + + AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl + udp,orig=(src=fc00::1,dst=fc00::2,sport=,dport=),reply=(src=fc00::2,dst=fc00::240,sport=,dport=) +@@ -6944,7 +6962,7 @@ table=0,in_port=ovs-p1,ct_state=+trk+rel+rpl,icmp6,actions=ovs-p0 + AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) + + rm p0.pcap +-NETNS_DAEMONIZE([at_ns0], [tcpdump -l -U -i p0 -w p0.pcap 2> tcpdump0_err], [tcpdump0.pid]) ++NETNS_DAEMONIZE([at_ns0], [tcpdump -n -l -U -i p0 -w p0.pcap 2> tcpdump0_err], [tcpdump0.pid]) + OVS_WAIT_UNTIL([grep "listening" tcpdump0_err]) + + dnl Send UDP packet from [[fc00::1]]:1234 to [[fc00::240]]:80 +@@ -7635,7 +7653,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 +-NETNS_DAEMONIZE([server], [tcpdump -l -U -i server -w server.pcap 2>tcpdump0_err], [tcpdump0.pid]) ++NETNS_DAEMONIZE([server], [tcpdump -n -l -U -i server -w server.pcap 2>tcpdump0_err], [tcpdump0.pid]) + OVS_WAIT_UNTIL([grep "listening" tcpdump0_err]) + + dnl Send UDP client->server +@@ -7677,7 +7695,7 @@ dnl Check the ICMP error in reply direction + AT_CHECK([ovs-appctl dpctl/flush-conntrack zone=42]) + + rm client.pcap +-NETNS_DAEMONIZE([client], [tcpdump -l -U -i client -w client.pcap 2>tcpdump1_err], [tcpdump1.pid]) ++NETNS_DAEMONIZE([client], [tcpdump -n -l -U -i client -w client.pcap 2>tcpdump1_err], [tcpdump1.pid]) + OVS_WAIT_UNTIL([grep "listening" tcpdump1_err]) + + dnl Send UDP client->server diff --git a/tests/test-barrier.c b/tests/test-barrier.c index 3bc5291cc..fb0ab0e69 100644 --- a/tests/test-barrier.c diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 86f53b7..7b5007f 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 27%{?dist} +Release: 28%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,12 @@ exit 0 %endif %changelog +* Wed Oct 25 2023 Open vSwitch CI - 3.2.0-28 +- Merging upstream branch-3.2 [RH git: 88f58a44d2] + Commit list: + 19770fc307 tests/system-traffic: Ensure no name resolution for tcpdump. + + * Wed Oct 25 2023 Open vSwitch CI - 3.2.0-27 - Merging upstream branch-3.2 [RH git: cdbd4c8dfe] Commit list: