diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 91d97d7..52717d8 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -6615,10 +6615,18 @@ index 93a13f32b1..05e82ea968 100644 AT_CHECK([ovs-vsctl set Flow_Table t0 prefixes=nw_dst,nw_dst], [1], [], [ovs-vsctl: nw_dst,nw_dst: set contains duplicate value diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at -index 790b5a43af..c16bdd0326 100644 +index 790b5a43af..ad97e8fe96 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at -@@ -807,6 +807,41 @@ AT_CHECK([ovs-appctl netdev-dummy/receive p1 ${bad_frame}]) +@@ -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)']) +@@ -807,6 +808,41 @@ AT_CHECK([ovs-appctl netdev-dummy/receive p1 ${bad_frame}]) AT_CHECK([ovs-pcap p2.pcap > p2.pcap.txt 2>&1]) AT_CHECK_UNQUOTED([tail -n 1 p2.pcap.txt], [0], [${good_expected} ]) @@ -6660,7 +6668,7 @@ index 790b5a43af..c16bdd0326 100644 OVS_VSWITCHD_STOP AT_CLEANUP -@@ -1091,3 +1126,66 @@ OVS_VSWITCHD_STOP(["dnl +@@ -1091,3 +1127,66 @@ OVS_VSWITCHD_STOP(["dnl /Error: unknown miniflow extract implementation superstudy./d /Error: invalid study_pkt_cnt value: -pmd./d"]) AT_CLEANUP @@ -6803,7 +6811,7 @@ index 55296e5593..0040a50b36 100644 AT_CHECK([ diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at -index e305e7b9cd..033f548084 100644 +index e305e7b9cd..b89fe9559a 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: @@ -7170,7 +7178,23 @@ index e305e7b9cd..033f548084 100644 ]) dnl add rule for int-br to force packet onto tunnel. There is no ifindex -@@ -12041,3 +12327,48 @@ AT_CHECK([test 1 = `ovs-ofctl parse-pcap p2-tx.pcap | wc -l`]) +@@ -8935,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]) +@@ -9650,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 +@@ -12041,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.3.spec b/SPECS/openvswitch3.3.spec index fe80f9f..d6ca687 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.4 -Release: 101%{?dist} +Release: 102%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -786,6 +786,12 @@ exit 0 %endif %changelog +* Tue Mar 18 2025 Open vSwitch CI - 3.3.0-102 +- Merging upstream branch-3.3 [RH git: 9506245686] + Commit list: + f31d704cf0 tests: Disable rate limiting for tests parsing flow dumps from logs. () + + * Thu Mar 13 2025 Open vSwitch CI - 3.3.0-101 - Merging upstream branch-3.3 [RH git: aa8daef7f2] Commit list: