diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch index 4d8e809..70c621d 100644 --- a/SOURCES/openvswitch-3.5.0.patch +++ b/SOURCES/openvswitch-3.5.0.patch @@ -113,6 +113,38 @@ index c8cc543465..384428c3fc 100644 op = {"table": row._table.name} if row._data is None: op["op"] = "insert" +diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at +index 60060ee2e0..920bbcac0b 100644 +--- a/tests/dpif-netdev.at ++++ b/tests/dpif-netdev.at +@@ -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)']) +diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at +index fa5f148b4c..7527104863 100644 +--- a/tests/ofproto-dpif.at ++++ b/tests/ofproto-dpif.at +@@ -9482,6 +9482,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]) +@@ -10197,6 +10198,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 diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at index f9f79f1941..bac6bf2764 100644 --- a/tests/ovsdb-idl.at diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec index 667ec8d..9238c08 100644 --- a/SPECS/openvswitch3.5.spec +++ b/SPECS/openvswitch3.5.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.5.0 -Release: 8%{?dist} +Release: 9%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -788,6 +788,12 @@ exit 0 %endif %changelog +* Tue Mar 18 2025 Open vSwitch CI - 3.5.0-9 +- Merging upstream branch-3.5 [RH git: bf3c9becaa] + Commit list: + 2d05966ba1 tests: Disable rate limiting for tests parsing flow dumps from logs. () + + * Thu Mar 13 2025 Open vSwitch CI - 3.5.0-8 - Merging upstream branch-3.5 [RH git: dca622cc8b] Commit list: