From 4096fce12c1ab84038efcbddbbcf8260ebd44bb2 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Aug 29 2023 02:32:27 +0000 Subject: Import openvswitch3.1-3.1.0-56 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 5206c13..1a2dfe7 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -5894,10 +5894,10 @@ index 3b5c66fe5..d63528e69 100644 ovs-appctl time/warp 1000 diff --git a/tests/pmd.at b/tests/pmd.at -index c707f762c..1cc9fed3d 100644 +index c707f762c..5546e063b 100644 --- a/tests/pmd.at +++ b/tests/pmd.at -@@ -1300,3 +1300,50 @@ OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD load based sleeps +@@ -1300,3 +1300,54 @@ OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD load based sleeps OVS_VSWITCHD_STOP AT_CLEANUP @@ -5925,18 +5925,22 @@ index c707f762c..1cc9fed3d 100644 + ovs-ofctl --bundle replace-flows br0 -]) +AT_CHECK([ovs-appctl revalidator/wait]) + ++dnl Prevent flows from expiring. ++AT_CHECK([ovs-appctl time/stop]) ++ +AT_CHECK([ovs-appctl netdev-dummy/receive p1 'ipv4(src=10.0.0.1,dst=10.1.0.2,proto=6),tcp(src=1,dst=2)']) +OVS_WAIT_UNTIL_EQUAL([ovs-appctl dpctl/dump-flows | sed 's/.*core: [[0-9]]*//' | strip_xout_keep_actions], [ +recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(dst=10.1.0.2/255.255.0.0,frag=no), packets:0, bytes:0, used:never, actions:ct(commit) +recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(dst=10.1.2.2/255.255.255.0,frag=no), packets:0, bytes:0, used:0.0s, actions:ct(commit)]) + -+dnl Hold the prefix 10.1.2.2/24 by another 10s. -+AT_CHECK([ovs-appctl netdev-dummy/receive p1 'ipv4(src=10.0.0.1,dst=10.1.2.2,proto=6),tcp(src=1,dst=2)']) +dnl Send more 10.1.0.2 to make 10.1.0.0/16 tuple prepend 10.1.2.0/24 tuple in the pvector of subtables. +for i in $(seq 0 256); do + AT_CHECK([ovs-appctl netdev-dummy/receive p1 'ipv4(src=10.0.0.1,dst=10.1.0.2,proto=6),tcp(src=1,dst=2)']) +done + ++dnl Warp time enough to trigger subtable optimization. ++AT_CHECK([ovs-appctl time/warp 500 2000], [0], [ignore]) ++ +AT_CHECK([echo 'table=0,in_port=p1,ip,nw_dst=10.1.0.0/16 actions=p2' | dnl + ovs-ofctl --bundle replace-flows br0 -]) + diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 4a052fb..ce7a6ec 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: 55%{?dist} +Release: 56%{?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 +* Mon Aug 28 2023 Open vSwitch CI - 3.1.0-56 +- Merging upstream branch-3.1 [RH git: 7c51401b95] + Commit list: + b6e62a481c tests: Fix time dependency in overlapping flows modification test. + + * Fri Aug 25 2023 Open vSwitch CI - 3.1.0-55 - Merging upstream branch-3.1 [RH git: c2c05ceb2a] Commit list: