Introduce a helper and hide the hideousness of having to check a value with a trailing \n.
Signed-off-by: David Marchand <[email protected]> --- tests/dpif-netdev.at | 108 ++++++++++--------------------- tests/drop-stats.at | 60 ++++------------- tests/ofproto-dpif.at | 41 +++--------- tests/ofproto-macros.at | 8 ++- tests/system-offloads-traffic.at | 4 +- tests/tunnel-push-pop-ipv6.at | 30 +++------ tests/tunnel-push-pop.at | 36 ++++------- tests/tunnel.at | 6 +- 8 files changed, 87 insertions(+), 206 deletions(-) diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index 2311979709..4bb8ec1bd3 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -387,11 +387,7 @@ meter:2 flow_count:1 packet_in_count:17 byte_in_count:1020 duration:0.0s bands: ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter datapath_drop_meter -], [0], [dnl -20 -]) +CHECK_COVERAGE([datapath_drop_meter], [20]) AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:meter(0),7 @@ -2926,10 +2922,8 @@ AT_CHECK([ovs-ofctl compose-packet --bare "${flow_s}" > good_frame]) AT_CHECK([ovs-vsctl set Interface p2 options:tx_pcap=p2.pcap]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [0 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [0]) +CHECK_COVERAGE([conntrack_l3csum_err], [0]) dnl Checks for good packet (Tx offloads disabled). flow_expected=$(echo "${flow_s}" | sed 's/192.168.123.1/192.168.1.1/g') @@ -2937,62 +2931,46 @@ AT_CHECK([ovs-ofctl compose-packet --bare "${flow_expected}" > good_expected]) dnl No Rx flag. CHECK_FWD_PACKET(p1, p2, , [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [0 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [1]) +CHECK_COVERAGE([conntrack_l3csum_err], [0]) dnl Flag as Rx good. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_good, [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [0 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [1]) +CHECK_COVERAGE([conntrack_l3csum_err], [0]) dnl Flag as Rx bad. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_bad, [good_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [1 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [1]) +CHECK_COVERAGE([conntrack_l3csum_err], [1]) dnl Flag as Rx partial. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_partial, [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [1 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [1]) +CHECK_COVERAGE([conntrack_l3csum_err], [1]) dnl Checks for bad packet (Tx offloads disabled). AT_CHECK([ovs-ofctl compose-packet --bare --bad-csum "${flow_s}" > bad_frame]) dnl No Rx flag. CHECK_FWD_PACKET(p1, p2, , [bad_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [2 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [2 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [2]) +CHECK_COVERAGE([conntrack_l3csum_err], [2]) dnl Flag as Rx good. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_good, [bad_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [2 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [2 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [2]) +CHECK_COVERAGE([conntrack_l3csum_err], [2]) dnl Flag as Rx bad. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_bad, [bad_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [2 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [3 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [2]) +CHECK_COVERAGE([conntrack_l3csum_err], [3]) dnl Flag as Rx partial. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_partial, [bad_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [2 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [3 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [2]) +CHECK_COVERAGE([conntrack_l3csum_err], [3]) AT_CHECK([ovs-vsctl set Interface p2 options:ol_ip_tx_csum=true]) @@ -3000,61 +2978,45 @@ dnl Checks for good packet (Tx offloads enabled). dnl No Rx flag. CHECK_FWD_PACKET(p1, p2, , [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [3 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [3 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [3]) +CHECK_COVERAGE([conntrack_l3csum_err], [3]) dnl Flag as Rx good. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_good, [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [3 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [3 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [3]) +CHECK_COVERAGE([conntrack_l3csum_err], [3]) dnl Flag as Rx bad. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_bad, [good_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [3 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [4 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [3]) +CHECK_COVERAGE([conntrack_l3csum_err], [4]) dnl Flag as Rx partial. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_partial, [good_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [3 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [4 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [3]) +CHECK_COVERAGE([conntrack_l3csum_err], [4]) dnl Checks for bad packet (Tx offloads enabled). dnl No Rx flag. CHECK_FWD_PACKET(p1, p2, , [bad_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [4 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [5 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [4]) +CHECK_COVERAGE([conntrack_l3csum_err], [5]) dnl Flag as Rx good. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_good, [bad_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [4 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [5 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [4]) +CHECK_COVERAGE([conntrack_l3csum_err], [5]) dnl Flag as Rx bad. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_bad, [bad_frame], [none]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [4 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [6 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [4]) +CHECK_COVERAGE([conntrack_l3csum_err], [6]) dnl Flag as Rx partial. CHECK_FWD_PACKET(p1, p2, ol_ip_rx_csum_set_partial, [bad_frame], [good_expected]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_checked], [0], [4 -]) -AT_CHECK([ovs-appctl coverage/read-counter conntrack_l3csum_err], [0], [6 -]) +CHECK_COVERAGE([conntrack_l3csum_checked], [4]) +CHECK_COVERAGE([conntrack_l3csum_err], [6]) dnl Special case, check natted ICMP (for traffic flagged good). icmp_frame="0a8f393fe0738abf7e2f05840800450000440001000040010364c0a87b02c0a87b010303746c0000000045000028000100004006037bc0a87b01c0a87b021451d4780000000000000000500220002fc40000" diff --git a/tests/drop-stats.at b/tests/drop-stats.at index 946c998a1f..748eaed359 100644 --- a/tests/drop-stats.at +++ b/tests/drop-stats.at @@ -30,11 +30,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), p ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_of_pipeline -], [0], [dnl -3 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [3]) OVS_VSWITCHD_STOP @@ -65,11 +61,7 @@ AT_CHECK([ ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_of_pipeline -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [1]) AT_DATA([flows.txt], [dnl @@ -92,11 +84,7 @@ AT_CHECK([ ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_recursion_too_deep -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_recursion_too_deep], [1]) OVS_VSWITCHD_STOP(["/|WARN|/d"]) @@ -119,11 +107,7 @@ ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50: ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_too_many_resubmit -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_too_many_resubmit], [1]) OVS_VSWITCHD_STOP(["/|WARN|/d"]) AT_CLEANUP @@ -145,11 +129,7 @@ ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50: ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_stack_too_deep -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_stack_too_deep], [1]) OVS_VSWITCHD_STOP(["/resubmits yielded over 64 kB of stack/d"]) @@ -182,11 +162,7 @@ AT_CHECK([ ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_too_many_mpls_labels -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_too_many_mpls_labels], [1]) OVS_VSWITCHD_STOP(["/|WARN|/d"]) @@ -229,9 +205,7 @@ actions:userspace(pid=0,ipfix(output_port=4294967295)) AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -0 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [0]) dnl Now activate explicit sampled drops. AT_CHECK([ovs-vsctl set Open_vSwitch . other-config:explicit-sampled-drops=true]) @@ -250,9 +224,7 @@ actions:userspace(pid=0,ipfix(output_port=4294967295)),drop AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -3 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [3]) OVS_VSWITCHD_STOP(["/sending to collector failed/d"]) AT_CLEANUP @@ -294,9 +266,7 @@ actions:USERSPACE_SAMPLE_ACTION(65535) AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -0 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [0]) dnl Now activate explicit sampled drops. AT_CHECK([ovs-vsctl set Open_vSwitch . other-config:explicit-sampled-drops=true]) @@ -315,9 +285,7 @@ actions:USERSPACE_SAMPLE_ACTION(65535),drop AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -3 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [3]) AT_CHECK([ovs-appctl dpctl/del-flows]) @@ -334,9 +302,7 @@ actions:sample(sample=50.0%,actions(USERSPACE_SAMPLE_ACTION(32767))),drop AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -6 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [6]) AT_CHECK([ovs-appctl dpctl/del-flows]) @@ -353,9 +319,7 @@ actions:USERSPACE_SAMPLE_ACTION(65535),drop AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter drop_action_of_pipeline], [0], [dnl -9 -]) +CHECK_COVERAGE([drop_action_of_pipeline], [9]) OVS_VSWITCHD_STOP(["/sending to collector failed/d"]) AT_CLEANUP diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 39e43d3768..3fa631072d 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -56,30 +56,22 @@ OVS_VSWITCHD_START( [add-port br0 p1 -- set interface p1 ofport_request=1 type=dummy] ) dnl first revalidation triggered by add interface -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -1 -]) +CHECK_COVERAGE([rev_reconfigure], [1]) dnl enable lldp AT_CHECK([ovs-vsctl set interface p1 lldp:enable=true]) AT_CHECK([ovs-appctl revalidator/wait]) -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -2 -]) +CHECK_COVERAGE([rev_reconfigure], [2]) dnl disable lldp AT_CHECK([ovs-vsctl set interface p1 lldp:enable=false]) AT_CHECK([ovs-appctl revalidator/wait]) -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -3 -]) +CHECK_COVERAGE([rev_reconfigure], [3]) dnl remove lldp, no revalidation as lldp was disabled AT_CHECK([ovs-vsctl remove interface p1 lldp enable]) AT_CHECK([ovs-appctl revalidator/wait]) -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -3 -]) +CHECK_COVERAGE([rev_reconfigure], [3]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -8293,9 +8285,7 @@ AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/ *[[0-9]]\{1,\}$//' | grep - ]) dnl Check mac_move coverage counter mac_learning_static_none_move. -AT_CHECK([ovs-appctl coverage/read-counter mac_learning_static_none_move], [0], [dnl -1 -]) +CHECK_COVERAGE([mac_learning_static_none_move], [1]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -8928,27 +8918,19 @@ dnl datapath level. AT_SETUP([ofproto-dpif - Bridge IPFIX sanity check]) OVS_VSWITCHD_START dnl first revalidation triggered by add interface -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -1 -]) +CHECK_COVERAGE([rev_reconfigure], [1]) add_of_ports br0 1 2 3 -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -2 -]) +CHECK_COVERAGE([rev_reconfigure], [2]) dnl Sample every packet using bridge-based sampling. AT_CHECK([ovs-vsctl -- set bridge br0 ipfix=@fix -- \ --id=@fix create ipfix targets=\"127.0.0.1:4739\" \ sampling=2], [0], [ignore]) -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -3 -]) +CHECK_COVERAGE([rev_reconfigure], [3]) AT_CHECK([ovs-vsctl set ipfix `ovs-vsctl get bridge br0 ipfix` sampling=1], [0]) -AT_CHECK([ovs-appctl coverage/read-counter rev_reconfigure], [0], [dnl -4 -]) +CHECK_COVERAGE([rev_reconfigure], [4]) dnl Send some packets that should be sampled. for i in `seq 1 3`; do AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800)']) @@ -13620,10 +13602,7 @@ AT_CHECK([ovs-appctl upcall/show | grep '(keys' | awk '{print $3}' | \ grep -qv '0)'], [1]) dnl Verify coverage counter was hit. -AT_CHECK([ovs-appctl coverage/read-counter revalidate_missing_dp_flow], [0], - [dnl -1 -]) +CHECK_COVERAGE([revalidate_missing_dp_flow], [1]) OVS_VSWITCHD_STOP(["/failed to flow_del (No such file or directory)/d"]) AT_CLEANUP diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 7f6ab89044..59f3b07ca1 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -398,4 +398,10 @@ m4_define([WAIT_FOR_DUMMY_PORTS], \ OVS_WAIT_WHILE([ovs-appctl netdev-dummy/conn-state dummy_port \ | grep 'unknown\|disconnected'])])]) - +# CHECK_COVERAGE(NAME, VALUE) +# +# Check the coverage counter NAME value against VALUE +m4_define([CHECK_COVERAGE], + [AT_CHECK([ovs-appctl coverage/read-counter $1], [0], [$2 +]) +]) diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 13a8054a40..4e0f793bff 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -779,9 +779,7 @@ recirc_id(<recirc>),in_port(2),eth(),eth_type(0x0800),ipv4(frag=no), packets:10, recirc_id(<recirc>),in_port(3),eth(),eth_type(0x0800),ipv4(frag=no), packets:10, bytes:840, used:0.0s, actions:2 ]) -AT_CHECK([ovs-appctl coverage/read-counter ukey_invalid_stat_reset], [0], [dnl -0 -]) +CHECK_COVERAGE([ukey_invalid_stat_reset], [0]) OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index b113873451..84710fb258 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -595,32 +595,22 @@ AT_CHECK([tail -1 stdout], [0], ]) dnl No drop so far. -AT_CHECK([ovs-appctl coverage/read-counter datapath_drop_tunnel_pop_error], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_err], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_err], [0], [0 -]) +CHECK_COVERAGE([datapath_drop_tunnel_pop_error], [0]) +CHECK_COVERAGE([native_tnl_l3csum_err], [0]) +CHECK_COVERAGE([native_tnl_l4csum_err], [0]) dnl Yet csum validation happened on all previous packets (with non null checksums). -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_checked], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_checked], [0], [1 -]) +CHECK_COVERAGE([native_tnl_l3csum_checked], [0]) +CHECK_COVERAGE([native_tnl_l4csum_checked], [1]) dnl Send a VXLAN packet with bad UDP checksum. AT_CHECK([ovs-appctl netdev-dummy/receive p0 'aa55aa550000f8bc1244cafe86dd60000000003a11402001cafe0000000000000000000000922001cafe000000000000000000000088c85312b5003aDEAD0c00000300007b00ffffffffffff00000000000008004500001c0001000040117cce7f0000017f0000010035003500080172']) -AT_CHECK([ovs-appctl coverage/read-counter datapath_drop_tunnel_pop_error], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_err], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_err], [0], [1 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_checked], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_checked], [0], [2 -]) +CHECK_COVERAGE([datapath_drop_tunnel_pop_error], [1]) +CHECK_COVERAGE([native_tnl_l3csum_err], [0]) +CHECK_COVERAGE([native_tnl_l4csum_err], [1]) +CHECK_COVERAGE([native_tnl_l3csum_checked], [0]) +CHECK_COVERAGE([native_tnl_l4csum_checked], [2]) AT_CHECK([ovs-appctl tnl/arp/show | tail -n+3 | sort], [0], [dnl 2001:cafe::92 f8:bc:12:44:ca:fe br0 diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index f22a375704..8f5cdddeb0 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -574,17 +574,12 @@ AT_CHECK([ovs-ofctl dump-ports int-br | grep 'port 7'], [0], [dnl ]) dnl No drop so far. -AT_CHECK([ovs-appctl coverage/read-counter datapath_drop_tunnel_pop_error], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_err], [0], [0 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_err], [0], [0 -]) +CHECK_COVERAGE([datapath_drop_tunnel_pop_error], [0]) +CHECK_COVERAGE([native_tnl_l3csum_err], [0]) +CHECK_COVERAGE([native_tnl_l4csum_err], [0]) dnl Yet csum validation happened on all previous packets. -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_checked], [0], [9 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_checked], [0], [6 -]) +CHECK_COVERAGE([native_tnl_l3csum_checked], [9]) +CHECK_COVERAGE([native_tnl_l4csum_checked], [6]) dnl Send various incorrect bad IP checksum packets. dnl GRE @@ -611,26 +606,17 @@ AT_CHECK([ovs-vsctl set interface p0 options:ol_l4_rx_csum_set_bad=false]) ovs-appctl time/warp 5000 -AT_CHECK([ovs-appctl coverage/read-counter datapath_drop_tunnel_pop_error], [0], [8 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_err], [0], [5 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_err], [0], [3 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l3csum_checked], [0], [15 -]) -AT_CHECK([ovs-appctl coverage/read-counter native_tnl_l4csum_checked], [0], [7 -]) +CHECK_COVERAGE([datapath_drop_tunnel_pop_error], [8]) +CHECK_COVERAGE([native_tnl_l3csum_err], [5]) +CHECK_COVERAGE([native_tnl_l4csum_err], [3]) +CHECK_COVERAGE([native_tnl_l3csum_checked], [15]) +CHECK_COVERAGE([native_tnl_l4csum_checked], [7]) AT_CHECK([ovs-appctl netdev-dummy/receive p0 'aa55aa550000001b213cab6408004503007079464000402fba600101025c0101025820000800000001c845000054ba200000400184861e0000011e00000200004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637']) ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter drop_action_congestion -], [0], [dnl -1 -]) +CHECK_COVERAGE([drop_action_congestion], [1]) dnl Check GREL3 only accepts non-fragmented packets? diff --git a/tests/tunnel.at b/tests/tunnel.at index c4b84603ad..972e7b41e2 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -250,11 +250,7 @@ AT_CHECK([ovs-appctl netdev-dummy/receive p2 'aa55aa550001f8bc124434b60800450000 ovs-appctl time/warp 5000 -AT_CHECK([ -ovs-appctl coverage/read-counter datapath_drop_invalid_port -], [0], [dnl -1 -]) +CHECK_COVERAGE([datapath_drop_invalid_port], [1]) OVS_VSWITCHD_STOP AT_CLEANUP -- 2.53.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
