diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index aae6daf..6494c57 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -7948,9 +7948,18 @@ index d36da0580..1d02ce6c0 100644 +"]) +AT_CLEANUP diff --git a/tests/system-traffic.at b/tests/system-traffic.at -index 221d96aef..0f0970a31 100644 +index 221d96aef..9aadfe92c 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 @@ -2343,6 +2343,7 @@ AT_CLEANUP AT_SETUP([conntrack - ct flush]) @@ -8048,12 +8057,46 @@ index 221d96aef..0f0970a31 100644 OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP +@@ -5763,7 +5823,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. +@@ -5787,7 +5847,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 +@@ -6531,13 +6591,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=) @@ -7220,7 +7280,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 -OVS_DAEMONIZE([tcpdump -l -U -i ovs-server -w server.pcap 2>tcpdump0_err], [tcpdump0.pid]) -+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 @@ -8062,7 +8105,7 @@ index 221d96aef..0f0970a31 100644 rm client.pcap -OVS_DAEMONIZE([tcpdump -l -U -i ovs-client -w client.pcap 2>tcpdump1_err], [tcpdump1.pid]) -+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/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 2b9d45f..b2368f5 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 69%{?dist} +Release: 70%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Wed Oct 25 2023 Open vSwitch CI - 3.1.0-70 +- Merging upstream branch-3.1 [RH git: dbf0b94f33] + Commit list: + 9241e1e222 tests/system-traffic: Ensure no name resolution for tcpdump. + + * Fri Oct 20 2023 Open vSwitch CI - 3.1.0-69 - Merging upstream branch-3.1 [RH git: 274c70054f] Commit list: