From cd1cf6a24b708b6f133fa83913ab3e4f586a200c Mon Sep 17 00:00:00 2001 From: Eelco Chaudron Date: Tue, 14 Feb 2023 14:53:45 +0100 Subject: test: Remove duplicate test from system-offloads-traffic.at. Remove the "offloads - simulated flow action update" test case, as it's covered by the "datapath - simulated flow action update" test. Fixes: b1f58f5072d6 ("netdev-offload-tc: Preserve tc statistics when flow gets modified.") Signed-off-by: Eelco Chaudron Signed-off-by: Ilya Maximets --- tests/system-offloads-traffic.at | 64 ---------------------------------------- 1 file changed, 64 deletions(-) (limited to 'tests') diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 8775f9922..f2bf9c063 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -680,67 +680,3 @@ OVS_CHECK_ACTIONS([check_pkt_len(size=200,gt(5),le(check_pkt_len(size=100,gt(5), OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP - - -AT_SETUP([offloads - simulated flow action update]) -OVS_TRAFFIC_VSWITCHD_START([], [], [-- set Open_vSwitch . other_config:hw-offload=true]) - -ADD_NAMESPACES(at_ns0, at_ns1) - -ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") -ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24") - -AT_DATA([flows.txt], [dnl -add in_port=ovs-p0,actions=ovs-p1,br0 -add in_port=ovs-p1,actions=ovs-p0,br0 -]) -AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) - -NS_CHECK_EXEC([at_ns0], [ping -q -c 10 -i 0.1 -w 2 10.1.1.2 | FORMAT_PING], [0], [dnl -10 packets transmitted, 10 received, 0% packet loss, time 0ms -]) - -AT_CHECK([ovs-appctl dpctl/dump-flows | grep "eth_type(0x0800)" | sort | dnl - strip_recirc | strip_used | dnl - sed 's/,packet_type(ns=[[0-9]]*,id=[[0-9]]*),/,/;s/,eth(),/,/;s/bytes:756/bytes:882/'], - [0], [dnl -recirc_id(),in_port(2),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:882, used:0.0s, actions:3,1 -recirc_id(),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:882, used:0.0s, actions:2,1 -]) - -AT_DATA([flows2.txt], [dnl -modify in_port=ovs-p0,actions=ovs-p1 -modify in_port=ovs-p1,actions=ovs-p0 -]) -AT_CHECK([ovs-ofctl add-flows br0 flows2.txt]) -AT_CHECK([ovs-appctl revalidator/wait], [0]) - -NS_CHECK_EXEC([at_ns0], [ping -q -c 10 -i 0.1 -w 2 10.1.1.2 | FORMAT_PING], [0], [dnl -10 packets transmitted, 10 received, 0% packet loss, time 0ms -]) - -AT_CHECK([ovs-appctl dpctl/dump-flows | grep "eth_type(0x0800)" | sort | dnl - strip_recirc | strip_used | dnl - sed -e 's/,packet_type(ns=[[0-9]]*,id=[[0-9]]*),/,/;s/,eth(),/,/;s/bytes:1596/bytes:1862/'], - [0], [dnl -recirc_id(),in_port(2),eth_type(0x0800),ipv4(frag=no), packets:19, bytes:1862, used:0.0s, actions:3 -recirc_id(),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:19, bytes:1862, used:0.0s, actions:2 -]) - -AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) -AT_CHECK([ovs-appctl revalidator/wait], [0]) - -NS_CHECK_EXEC([at_ns0], [ping -q -c 10 -i 0.1 -w 2 10.1.1.2 | FORMAT_PING], [0], [dnl -10 packets transmitted, 10 received, 0% packet loss, time 0ms -]) - -AT_CHECK([ovs-appctl dpctl/dump-flows | grep "eth_type(0x0800)" | sort | dnl - strip_recirc | strip_used | dnl - sed 's/,packet_type(ns=[[0-9]]*,id=[[0-9]]*),/,/;s/,eth(),/,/;s/bytes:2436/bytes:2842/'], - [0], [dnl -recirc_id(),in_port(2),eth_type(0x0800),ipv4(frag=no), packets:29, bytes:2842, used:0.0s, actions:3,1 -recirc_id(),in_port(3),eth_type(0x0800),ipv4(frag=no), packets:29, bytes:2842, used:0.0s, actions:2,1 -]) - -OVS_TRAFFIC_VSWITCHD_STOP -AT_CLEANUP -- cgit v1.2.1