[ovs-dev] [PATCH 04/10] ofproto-dpif.at: Ignore port type while checking result of dpctl/dump-flows.

[Ilya Maximets]

Many ofproto-dpif tests works only with non-pmd interfaces because
of hard coded output of 'dpctl/dump-flows'.

Fix that by clearing out port types.

Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
---
 tests/ofproto-dpif.at | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index bf6661d..8868ddd 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -3768,8 +3768,8 @@ for type in no first later; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "$flow"], [0], [stdout])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(dst=80), packets:0, bytes:0, used:never, actions:set(tcp(dst=81)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=first),tcp(dst=80), packets:0, bytes:0, used:never, actions:set(tcp(dst=81)),5
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:0, bytes:0, used:never, actions:6
@@ -3786,8 +3786,8 @@ for type in no first later; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "$flow"], [0], [stdout])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(dst=80), packets:0, bytes:0, used:never, actions:set(tcp(dst=81)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(frag=first), packets:0, bytes:0, used:never, actions:drop
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(frag=later), packets:0, bytes:0, used:never, actions:drop
@@ -3804,8 +3804,8 @@ for type in no first later; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "$flow"], [0], [stdout])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(dst=80), packets:0, bytes:0, used:never, actions:set(tcp(dst=81)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=first),tcp(dst=80), packets:0, bytes:0, used:never, actions:set(tcp(dst=81)),2
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:0, bytes:0, used:never, actions:6
@@ -3876,8 +3876,8 @@ for frag in 4000 6000 6008 4010; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 003c 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016 751e267b 00000000 a002 16d0 1736 0000 02 04 05 b4 04 02 08 0a 2d 25 08 5f 00 00 00 00 01 03 03 07"])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/' | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(src=33419), packets:0, bytes:0, used:never, actions:set(tcp(src=33322)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=first),tcp(src=33419), packets:0, bytes:0, used:never, actions:set(tcp(src=33322)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:74, used:0.001s, actions:1
@@ -3891,8 +3891,8 @@ for frag in 4000 6000 6008 4010; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 0018 2e24 $frag 40 06 465d ac11370d ac11370b 828b 0016"])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/' | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(src=0), packets:0, bytes:0, used:never, actions:set(tcp(src=42)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=first),tcp(src=0), packets:0, bytes:0, used:never, actions:set(tcp(src=42)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:60, used:0.001s, actions:1
@@ -3906,8 +3906,8 @@ for frag in 4000 6000 6001 4002; do
   AT_CHECK([ovs-appctl netdev-dummy/receive p90 "0021853763af 0026b98cb0f9 0800 4500 0014 2e24 $frag 40 06 465d ac11370d ac11370b"])
 done
 
-AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/' | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=no),tcp(src=0), packets:0, bytes:0, used:never, actions:set(tcp(src=42)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=first),tcp(src=0), packets:0, bytes:0, used:never, actions:set(tcp(src=42)),1
 recirc_id(0),in_port(90),eth_type(0x0800),ipv4(proto=6,frag=later), packets:1, bytes:60, used:0.001s, actions:1
@@ -5788,8 +5788,8 @@ 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)'])
 done
-AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/.*\(packets:\)/\1/' | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/.*\(packets:\)/\1/' | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/' | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 packets:2, bytes:120, used:0.001s, actions:sample(sample=100.0%,actions(userspace(pid=0,ipfix(output_port=4294967295))))
 ])
 
@@ -5801,8 +5801,8 @@ dnl Send some more packets, to ensure that these are not 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)'])
 done
-AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/.*\(packets:\)/\1/' | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/'], [0], [dnl
-flow-dump from non-dpdk interfaces:
+AT_CHECK([ovs-appctl dpctl/dump-flows | sed 's/.*\(packets:\)/\1/' | sed 's/used:[[0-9]].[[0-9]]*s/used:0.001s/' | sed 's/\(flow-dump from\).*/\1 <cleared>/'], [0], [dnl
+flow-dump from <cleared>
 packets:2, bytes:120, used:0.001s, actions:drop
 ])
 
-- 
2.5.0