From c7582c7f67d085cf247122969522f6cf5824f873 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Fri, 26 Apr 2019 15:45:20 +0300 Subject: [PATCH] system-offloads-traffic.at: Fix requesting HW offloaded flows from veth. veth pair doesn't offload anything to HW. i.e. we should use 'tc' type while requesting flows. 'offloaded' kept just in case to not update the test if veths will be HW offloaded someday. Additionally fixed missed for unknown reason 'ipv4' fields. Also dropped stripping of the errors from log. Fixes test: 2: offloads - ping between two ports - offloads enabled ok CC: Gavi Teitz Fixes: d63ca5329ff9 ("dpctl: Properly reflect a rule's offloaded to HW state") Acked-by: Roi Dayan Signed-off-by: Ilya Maximets --- tests/system-offloads-traffic.at | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 1f8079344e7..379a8a5e928 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -53,16 +53,16 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 10 -i 0.1 -w 2 10.1.1.2 | FORMAT_PING], [0], ]) AT_CHECK([ovs-appctl dpctl/dump-flows | grep "eth_type(0x0800)" | DUMP_CLEAN_SORTED], [0], [dnl -in_port(2),eth(macs),eth_type(0x0800), packets:9, bytes:756, used:0.001s, actions:output -in_port(3),eth(macs),eth_type(0x0800), packets:9, bytes:756, used:0.001s, actions:output +in_port(2),eth(macs),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:756, used:0.001s, actions:output +in_port(3),eth(macs),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:756, used:0.001s, actions:output ]) AT_CHECK([ovs-appctl dpctl/dump-flows type=ovs | grep "eth_type(0x0800)" | DUMP_CLEAN_SORTED], [0], []) -AT_CHECK([ovs-appctl dpctl/dump-flows type=offloaded | grep "eth_type(0x0800)" | DUMP_CLEAN_SORTED], [0], [dnl -in_port(2),eth(macs),eth_type(0x0800), packets:9, bytes:756, used:0.001s, actions:output -in_port(3),eth(macs),eth_type(0x0800), packets:9, bytes:756, used:0.001s, actions:output +AT_CHECK([ovs-appctl dpctl/dump-flows type=tc,offloaded | grep "eth_type(0x0800)" | DUMP_CLEAN_SORTED], [0], [dnl +in_port(2),eth(macs),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:756, used:0.001s, actions:output +in_port(3),eth(macs),eth_type(0x0800),ipv4(frag=no), packets:9, bytes:756, used:0.001s, actions:output ]) -OVS_TRAFFIC_VSWITCHD_STOP('/.*/d') +OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP