diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 429d090..3c5ab30 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -8442,10 +8442,18 @@ index 1013098a18..b33d50673f 100644 + echo "$0: unexpected error probing Python unit test requirements" >&2 ;; esac diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at -index 67adf27fb1..5c49546064 100644 +index 67adf27fb1..56cfb29ce7 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at -@@ -746,19 +746,25 @@ OVS_VSWITCHD_START( +@@ -230,6 +230,7 @@ m4_define([DPIF_NETDEV_MISS_FLOW_DUMP], + AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using UFID disabled + ], []) + AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) ++ AT_CHECK([ovs-appctl vlog/disable-rate-limit dpif]) + + AT_CHECK([ovs-ofctl add-flow br0 action=normal]) + AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) +@@ -746,19 +747,25 @@ OVS_VSWITCHD_START( # Modify the ip_dst addr to force changing the IP csum. AT_CHECK([ovs-ofctl add-flow br1 in_port=p1,actions=mod_nw_dst:192.168.1.1,output:p2]) @@ -8476,7 +8484,7 @@ index 67adf27fb1..5c49546064 100644 ]) # Check if packets entering the datapath with csum offloading -@@ -766,12 +772,9 @@ AT_CHECK([tail -n 1 p2.pcap.txt], [0], [dnl +@@ -766,12 +773,9 @@ AT_CHECK([tail -n 1 p2.pcap.txt], [0], [dnl # in the datapath and not by the netdev. AT_CHECK([ovs-vsctl set Interface p1 options:ol_ip_csum=false]) AT_CHECK([ovs-vsctl set Interface p1 options:ol_ip_csum_set_good=true]) @@ -8491,7 +8499,7 @@ index 67adf27fb1..5c49546064 100644 ]) # Check if packets entering the datapath with csum offloading -@@ -779,36 +782,132 @@ AT_CHECK([tail -n 1 p2.pcap.txt], [0], [dnl +@@ -779,36 +783,132 @@ AT_CHECK([tail -n 1 p2.pcap.txt], [0], [dnl # by the datapath. AT_CHECK([ovs-vsctl set Interface p1 options:ol_ip_csum=true]) AT_CHECK([ovs-vsctl set Interface p1 options:ol_ip_csum_set_good=true]) @@ -9153,7 +9161,7 @@ index 14aa554169..6a07e23c64 100644 + AT_CLEANUP diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at -index f242f77f31..44626bc092 100644 +index f242f77f31..035a3ccd06 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -351,6 +351,49 @@ recirc_id(0),in_port(4),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:0b,dst=ff: @@ -9561,7 +9569,23 @@ index f242f77f31..44626bc092 100644 ]) dnl add rule for int-br to force packet onto tunnel. There is no ifindex -@@ -12007,3 +12327,48 @@ AT_CHECK([test 1 = `ovs-ofctl parse-pcap p2-tx.pcap | wc -l`]) +@@ -8901,6 +9221,7 @@ AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using + ], []) + AT_CHECK([ovs-appctl time/stop]) + AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) ++AT_CHECK([ovs-appctl vlog/disable-rate-limit dpif]) + + AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2]) + AT_CHECK([ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3]) +@@ -9616,6 +9937,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], + [AT_SETUP([ofproto-dpif megaflow - disabled$1]) + OVS_VSWITCHD_START([], [], [], [m4_if([$1], [], [], [--dummy-numa="0,0,0,0,1,1,1,1"])]) + AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) ++ AT_CHECK([ovs-appctl vlog/disable-rate-limit dpif]) + func=`printf '%s_' "$1" | cut -c 4-` + add_${func}of_ports br0 1 2 + AT_DATA([flows.txt], [dnl +@@ -12007,3 +12329,48 @@ AT_CHECK([test 1 = `ovs-ofctl parse-pcap p2-tx.pcap | wc -l`]) OVS_VSWITCHD_STOP AT_CLEANUP diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index c30310a..1d41646 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: 122%{?dist} +Release: 123%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -763,6 +763,12 @@ exit 0 %endif %changelog +* Tue Mar 18 2025 Open vSwitch CI - 3.2.0-123 +- Merging upstream branch-3.2 [RH git: cc5cc13012] + Commit list: + b53b7455d2 tests: Disable rate limiting for tests parsing flow dumps from logs. () + + * Fri Mar 07 2025 Open vSwitch CI - 3.2.0-122 - Merging upstream branch-3.2 [RH git: ea1b1f0586] Commit list: