diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch index ada46cf..4d8e809 100644 --- a/SOURCES/openvswitch-3.5.0.patch +++ b/SOURCES/openvswitch-3.5.0.patch @@ -166,6 +166,32 @@ index f9f79f1941..bac6bf2764 100644 OVSDB_CHECK_IDL_PY([simple idl, python, add_op], [], +diff --git a/tests/system-traffic.at b/tests/system-traffic.at +index 0215453230..f2d3552808 100644 +--- a/tests/system-traffic.at ++++ b/tests/system-traffic.at +@@ -7590,6 +7590,10 @@ dnl Solicit another "destination unreachable" response. + dnl To verify that after flushing, the same openflow rules are matched. + NS_CHECK_EXEC([at_ns0], [bash -c "echo a | nc $NC_EOF_OPT -u 10.1.1.2 10000"]) + ++AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl ++udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=) ++]) ++ + AT_CHECK([ovs-appctl revalidator/purge], [0]) + AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_bytes | sort | grep -v drop], [0], [dnl + n_packets=1, priority=10,arp actions=NORMAL +@@ -7606,10 +7610,6 @@ AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip | ofctl_strip_byt + OFPST_FLOW reply (OF1.5): + ]) + +-AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/'], [0], [dnl +-udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=,dport=),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=,dport=) +-]) +- + AT_CHECK([tcpdump -n -v "icmp" -r p0.pcap 2>/dev/null | grep -E 'wrong|bad'], [1], [ignore-nolog]) + + OVS_TRAFFIC_VSWITCHD_STOP diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 710341b655..8011850fdf 100644 --- a/tests/test-ovsdb.c diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec index 9d0b502..8d1abf2 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: 9%{?dist} +Release: 10%{?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 +* Thu Mar 13 2025 Open vSwitch CI - 3.5.0-10 +- Merging upstream branch-3.5 [RH git: b718729bae] + Commit list: + 59a155c931 tests: Fix 'ICMP related with SNAT' test case in offload scenario. + + * Wed Mar 12 2025 Open vSwitch CI - 3.5.0-9 - Merging upstream branch-3.5 [RH git: 9249932a8b] Commit list: