From d97d2a48a6d1964ebe69c8b78e0a2648de887d7a Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Aug 29 2023 01:43:31 +0000 Subject: Import openvswitch2.17-2.17.0-120 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 27f0b65..8167d7f 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -70396,7 +70396,7 @@ index 054dcc9ccf..d63528e69e 100644 ovs-appctl time/warp 1000 diff --git a/tests/pmd.at b/tests/pmd.at -index a2f9d34a2a..287a5df15c 100644 +index a2f9d34a2a..d336609a7e 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -199,7 +199,7 @@ pmd thread numa_id core_id : @@ -70589,7 +70589,7 @@ index a2f9d34a2a..287a5df15c 100644 AT_CHECK([ovs-appctl dpif-netdev/subtable-lookup-prio-set autovalidator 3], [0], [dnl Lookup priority change affected 0 dpcls ports and 0 subtables. -@@ -1162,3 +1193,50 @@ ovs-appctl: ovs-vswitchd: server returned an error +@@ -1162,3 +1193,54 @@ ovs-appctl: ovs-vswitchd: server returned an error OVS_VSWITCHD_STOP AT_CLEANUP @@ -70617,18 +70617,22 @@ index a2f9d34a2a..287a5df15c 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/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 161db6e..a01e615 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 119%{?dist} +Release: 120%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Mon Aug 28 2023 Open vSwitch CI - 2.17.0-120 +- Merging upstream branch-2.17 [RH git: ef93dc708f] + Commit list: + bd95fe3d7b tests: Fix time dependency in overlapping flows modification test. + + * Fri Aug 25 2023 Open vSwitch CI - 2.17.0-119 - Merging upstream branch-2.17 [RH git: 8a264107bd] Commit list: