Preparation to multiqueue support for dummy_pmd.
Signed-off-by: Ilya Maximets <i.maxim...@samsung.com>
---
tests/bridge.at | 6 +++---
tests/dpctl.at | 8 ++++----
tests/mpls-xlate.at | 2 +-
tests/ofproto-dpif.at | 8 ++++----
tests/ovs-ofctl.at | 2 +-
tests/ovs-vswitchd.at | 2 +-
tests/tunnel-push-pop.at | 2 +-
tests/tunnel.at | 28 ++++++++++++++--------------
8 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/tests/bridge.at b/tests/bridge.at
index c9ad1e6..bcd6b3c 100644
--- a/tests/bridge.at
+++ b/tests/bridge.at
@@ -9,7 +9,7 @@ OVS_VSWITCHD_START
# Add some ports and make sure that they show up in the datapath.
add_of_ports br0 1 2
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
@@ -20,7 +20,7 @@ dummy@ovs-dummy: hit:0 missed:0
# Delete p1 from the datapath as if by "ovs-dpctl del-port"
# and check that it disappeared.
AT_CHECK([ovs-appctl dpif-dummy/delete-port ovs-dummy p1])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
@@ -29,7 +29,7 @@ dummy@ovs-dummy: hit:0 missed:0
# Force reconfiguration and make sure that p1 got added back.
AT_CHECK([ovs-vsctl del-port p2])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
diff --git a/tests/dpctl.at b/tests/dpctl.at
index ab7c89c..49a633f 100644
--- a/tests/dpctl.at
+++ b/tests/dpctl.at
@@ -19,14 +19,14 @@ AT_CLEANUP
AT_SETUP([dpctl - add-if set-if del-if])
OVS_VSWITCHD_START([], [], [=override])
AT_CHECK([ovs-appctl dpctl/add-dp dummy@br0])
-AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/show dummy@br0 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
dummy@br0:
lookups: hit:0 missed:0 lost:0
flows: 0
port 0: br0 (internal)
])
AT_CHECK([ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy,port_no=5])
-AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/show dummy@br0 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
dummy@br0:
lookups: hit:0 missed:0 lost:0
flows: 0
@@ -49,7 +49,7 @@ AT_CHECK([ovs-appctl dpctl/set-if dummy@br0 br0,type=dummy],
[2], [],
ovs-appctl: ovs-vswitchd: server returned an error
])
AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 vif1.0])
-AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/show dummy@br0 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
dummy@br0:
lookups: hit:0 missed:0 lost:0
flows: 0
@@ -59,7 +59,7 @@ AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 vif1.0], [2], [],
[ovs-vswitchd: no port named vif1.0
ovs-appctl: ovs-vswitchd: server returned an error
])
-AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl
+AT_CHECK([ovs-appctl dpctl/show dummy@br0 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
dummy@br0:
lookups: hit:0 missed:0 lost:0
flows: 0
diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at
index 7df52f5..7095c89 100644
--- a/tests/mpls-xlate.at
+++ b/tests/mpls-xlate.at
@@ -4,7 +4,7 @@ AT_SETUP([MPLS xlate action])
OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy
ofport_request=1])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 6a12484..9445bad 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -5464,7 +5464,7 @@ AT_CHECK([ovs-vsctl -- add-port int-br t1 -- set
Interface t1 type=gre \
options:ifindex=2011 ofport_request=5
], [0])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/,* [[a-z_]]*queues=[[0-9]]*,*//g' |
sed 's/: *)/)/'], [0], [dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
@@ -5994,7 +5994,7 @@ OVS_VSWITCHD_START([add-br br1 -- set bridge br1
datapath-type=dummy])
add_of_ports br0 1 2
add_of_ports br1 3
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
@@ -6169,7 +6169,7 @@ AT_CHECK([ovs-appctl time/warp 500], [0],
])
sleep 1 # wait for log writer
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:13 missed:2
br0:
br0 65534/100: (dummy)
@@ -6234,7 +6234,7 @@ AT_CHECK([ovs-appctl time/warp 500], [0],
OVS_WAIT_UNTIL([test `grep flow_add ovs-vswitchd.log | wc -l` -ge 1])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:1
br0:
br0 65534/100: (dummy)
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index f26f622..2df9042 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -2789,7 +2789,7 @@ AT_CHECK([ovs-ofctl add-flow br0
"tcp,tcp_flags=+ack-ack,action="], [1], [],
[ovs-ofctl: ack: Each TCP flag can be specified only once
])
-AT_CHECK([ovs-appctl dpif/show | tail -n +4], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +4 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
p1 1/1: (dummy)
p2 2/2: (dummy)
])
diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at
index 848daa3..25ca1d1 100644
--- a/tests/ovs-vswitchd.at
+++ b/tests/ovs-vswitchd.at
@@ -180,7 +180,7 @@ AT_CHECK([ovs-vsctl add-port br0 p0 -- set interface p0
type=internal])
AT_CHECK([ovs-vsctl add-port br0 p1 -- set interface p1 type=internal])
dnl ovs-vswitchd should still 'see' ovsdb change with the 'monitor' method
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p0 1/1: (dummy)
p1 2/2: (dummy)
diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at
index 583abb5..57e8258 100644
--- a/tests/tunnel-push-pop.at
+++ b/tests/tunnel-push-pop.at
@@ -14,7 +14,7 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2
type=vxlan \
options:remote_ip=flow options:key=123 ofport_request=5\
], [0])
-AT_CHECK([ovs-appctl dpif/show], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | sed 's/:* configured_rx_queues=.*)/)/'], [0],
[dnl
dummy@ovs-dummy: hit:0 missed:0
br0:
br0 65534/100: (dummy)
diff --git a/tests/tunnel.at b/tests/tunnel.at
index 0c033da..cc9958f 100644
--- a/tests/tunnel.at
+++ b/tests/tunnel.at
@@ -15,7 +15,7 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: remote_ip=1.1.1.1)
p2 2/1: (gre: local_ip=2.2.2.2, remote_ip=1.1.1.1)
@@ -38,7 +38,7 @@ dnl reconfigure, local_ip, remote_ip
AT_CHECK([ovs-vsctl set Interface p2 type=gre options:local_ip=2.2.2.3 \
options:df_default=false options:ttl=1 options:csum=true \
-- set Interface p3 type=vxlan])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: remote_ip=1.1.1.1)
p2 2/1: (gre: csum=true, df_default=false, local_ip=2.2.2.3,
remote_ip=1.1.1.1, ttl=1)
@@ -73,7 +73,7 @@ actions=2
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: remote_ip=1.1.1.1)
p2 2/2: (dummy)
@@ -122,7 +122,7 @@ actions=output:1
OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1)
p2 2/2: (dummy)
@@ -155,7 +155,7 @@ actions=output:1
OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: remote_ip=1.1.1.1, tos=inherit, ttl=inherit)
p2 2/2: (dummy)
@@ -198,7 +198,7 @@
actions=set_tunnel:1,output:1,set_tunnel:2,output:2,set_tunnel:3,output:3,set_tu
OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: key=flow, remote_ip=1.1.1.1)
p2 2/1: (gre: key=flow, remote_ip=2.2.2.2)
@@ -231,7 +231,7 @@ actions=IN_PORT,output:1,output:2,output:3
OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: key=1, remote_ip=1.1.1.1)
p2 2/1: (gre: in_key=2, out_key=3, remote_ip=1.1.1.1)
@@ -284,7 +284,7 @@ tun_id=4,actions=output:5
OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/1: (gre: key=flow, remote_ip=1.1.1.1)
p2 2/1: (gre: key=3, remote_ip=3.3.3.3)
@@ -320,7 +320,7 @@ AT_SETUP([tunnel - Geneve])
OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=geneve \
options:remote_ip=1.1.1.1 ofport_request=1
options:dst_port=5000])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/5000: (geneve: dst_port=5000, remote_ip=1.1.1.1)
])
@@ -332,7 +332,7 @@ AT_SETUP([tunnel - VXLAN])
OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
options:remote_ip=1.1.1.1 ofport_request=1])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/4789: (vxlan: remote_ip=1.1.1.1)
])
@@ -344,7 +344,7 @@ AT_SETUP([tunnel - LISP])
OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=lisp \
options:remote_ip=1.1.1.1 ofport_request=1])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/4341: (lisp: remote_ip=1.1.1.1)
])
@@ -356,7 +356,7 @@ AT_SETUP([tunnel - different VXLAN UDP port])
OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
options:remote_ip=1.1.1.1 ofport_request=1
options:dst_port=4341])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/4341: (vxlan: dst_port=4341, remote_ip=1.1.1.1)
])
@@ -365,7 +365,7 @@ dnl change UDP port
AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=5000])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/5000: (vxlan: dst_port=5000, remote_ip=1.1.1.1)
])
@@ -374,7 +374,7 @@ dnl change UDP port to default
AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=4789])
-AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+AT_CHECK([ovs-appctl dpif/show | tail -n +3 | sed 's/:*
configured_rx_queues=.*)/)/'], [0], [dnl
br0 65534/100: (dummy)
p1 1/4789: (vxlan: remote_ip=1.1.1.1)
])
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
