[ovs-dev] [PATCHv3 6/6] tests: Check dpif-netdev odp_actions consistency.

Joe Stringer joestringer at nicira.com
Mon May 19 04:35:42 UTC 2014


Thanks for the review. Applied patches 1, 4, 5, 6 to master.


On 19 May 2014 13:26, Andy Zhou <azhou at nicira.com> wrote:

> On Wed, May 14, 2014 at 11:57 PM, Joe Stringer <joestringer at nicira.com>
> wrote:
> > Ensure that upcall key matches flow install and flow_dump for userspace
> > datapath. This was previously assumed, but not tested. This makes the
> > assumption more explicit.
> >
> > Signed-off-by: Joe Stringer <joestringer at nicira.com>
> Thanks for adding the tests.
> Acked-by: Andy Zhou <azhou at nicira.com>
>
> > ---
> > v3: No change.
> > v2: Shift to dpif-netdev.at.
> > ---
> >  tests/dpif-netdev.at |   70
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 70 insertions(+)
> >
> > diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at
> > index 6e81354..2a624d1 100644
> > --- a/tests/dpif-netdev.at
> > +++ b/tests/dpif-netdev.at
> > @@ -51,3 +51,73 @@
> skb_priority(0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(8),eth(src=50:54
> >
> >  OVS_VSWITCHD_STOP
> >  AT_CLEANUP
> > +
> > +AT_SETUP([dpif-netdev - miss upcall key matches flow_install])
> > +OVS_VSWITCHD_START(
> > +  [add-port br0 p1 -- set interface p1 type=dummy
> options:pstream=punix:$OVS_RUNDIR/p0.sock
> > +   set bridge br0 datapath-type=dummy other-config:datapath-id=1234 \
> > +                  fail-mode=secure])
> > +AT_CHECK([ovs-appctl vlog/set dpif:dbg])
> > +
> > +AT_CHECK([ovs-ofctl add-flow br0 action=normal])
> > +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),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'])
> > +sleep 1
> > +
> > +AT_CHECK([cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)
> > +])
> > +AT_CHECK([cat ovs-vswitchd.log | FILTER_FLOW_INSTALL | STRIP_XOUT],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=
> 10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no/0xff),icmp(type=8/0,code=0/0),
> actions: <del>
> > +])
> > +
> > +# Now, the same again without megaflows.
> > +AT_CHECK([ovs-appctl upcall/disable-megaflows], [0], [megaflows disabled
> > +])
> > +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),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'])
> > +sleep 1
> > +
> > +AT_CHECK([cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)
> > +])
> > +AT_CHECK([cat ovs-vswitchd.log | FILTER_FLOW_INSTALL | STRIP_XOUT],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0),
> actions: <del>
> >
> +skb_priority(0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=
> 10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no/0xff),icmp(type=8/0,code=0/0),
> actions: <del>
> > +])
> > +
> > +OVS_VSWITCHD_STOP
> > +AT_CLEANUP
> > +
> > +AT_SETUP([dpif-netdev - miss upcall key matches flow_dump])
> > +OVS_VSWITCHD_START(
> > +  [add-port br0 p1 -- set interface p1 type=dummy
> options:pstream=punix:$OVS_RUNDIR/p0.sock
> > +   set bridge br0 datapath-type=dummy other-config:datapath-id=1234 \
> > +                  fail-mode=secure])
> > +AT_CHECK([ovs-appctl vlog/set dpif:dbg])
> > +
> > +AT_CHECK([ovs-ofctl add-flow br0 action=normal])
> > +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),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'])
> > +sleep 1
> > +
> > +AT_CHECK([cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)
> > +])
> > +AT_CHECK([cat ovs-vswitchd.log | FILTER_FLOW_DUMP | STRIP_XOUT], [0],
> [dnl
> >
> +skb_priority(0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=
> 10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no/0xff),icmp(type=8/0,code=0/0),
> packets:0, bytes:0, used:never, actions: <del>
> > +])
> > +
> > +# Now, the same again without megaflows.
> > +AT_CHECK([ovs-appctl upcall/disable-megaflows], [0], [megaflows disabled
> > +])
> > +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),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'])
> > +sleep 1
> > +
> > +AT_CHECK([cat ovs-vswitchd.log | grep -A 1 'miss upcall' | tail -n 1],
> [0], [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)
> > +])
> > +AT_CHECK([cat ovs-vswitchd.log | FILTER_FLOW_DUMP | STRIP_XOUT], [0],
> [dnl
> >
> +skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0),
> packets:0, bytes:0, used:never, actions: <del>
> >
> +skb_priority(0),skb_mark(0/0),recirc_id(0),dp_hash(0/0),in_port(1),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=
> 10.0.0.2/0.0.0.0,dst=10.0.0.1/0.0.0.0,proto=1/0,tos=0/0,ttl=64/0,frag=no/0xff),icmp(type=8/0,code=0/0),
> packets:0, bytes:0, used:never, actions: <del>
> > +])
> > +
> > +OVS_VSWITCHD_STOP
> > +AT_CLEANUP
> > --
> > 1.7.10.4
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20140519/f9ac2c02/attachment-0005.html>


More information about the dev mailing list