[ovs-git] Open vSwitch: OXM: Add tests for masked VLAN VID match (master)

dev at openvswitch.org dev at openvswitch.org
Mon Jul 23 16:27:59 UTC 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  4b9f923273fb79079fcfa15350299b71a0062969 (commit)
       via  476a0e9e7c0aae41f5b3bd093b5b5d666142f630 (commit)
       via  8069b0da045f1b8a5879f5d2dfedcaa7e7c86578 (commit)
       via  95f61ba8829a545d5e3edfb5b4d6e7341bd58f0f (commit)
       via  cc34bc8c8611868474253b8fbd9e79cd66c60c94 (commit)
       via  fb0451d9bfbfb1d2803423c4491fe2d4da4cdc3a (commit)
       via  441c57a919fbd9d4961be767a796c836ce45bced (commit)
      from  44d3732d5e172a8528ae2f36c232dfa5a1c18b74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b9f923273fb79079fcfa15350299b71a0062969
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4b9f923273fb79079fcfa15350299b71a0062969
Author: Simon Horman <horms at verge.net.au>
		
OXM: Add tests for masked VLAN VID match
		
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 476a0e9e7c0aae41f5b3bd093b5b5d666142f630
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=476a0e9e7c0aae41f5b3bd093b5b5d666142f630
Author: Simon Horman <horms at verge.net.au>
		
tests: OXM VLAN match encoding and decoding
		
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 8069b0da045f1b8a5879f5d2dfedcaa7e7c86578
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=8069b0da045f1b8a5879f5d2dfedcaa7e7c86578
Author: Simon Horman <horms at verge.net.au>
		
OXM: Add VLAN VID as a prerequisite for VLAN PCP
		
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit 95f61ba8829a545d5e3edfb5b4d6e7341bd58f0f
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=95f61ba8829a545d5e3edfb5b4d6e7341bd58f0f
Author: Simon Horman <horms at verge.net.au>
		
OXM: Add encoding of VLAN VID and VLAN PCP
		
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


commit cc34bc8c8611868474253b8fbd9e79cd66c60c94
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=cc34bc8c8611868474253b8fbd9e79cd66c60c94
Author: Ben Pfaff <blp at nicira.com>
		
meta-flow: Add OF1.2-like MFF_VLAN_VID and MFF_VLAN_PCP.
		
OpenFlow 1.0 and 1.2 have notions of VLAN that are different
enough to warrant separate "meta-flow" fields, which this commit
adds.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Simon Horman <horms at verge.net.au>


commit fb0451d9bfbfb1d2803423c4491fe2d4da4cdc3a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=fb0451d9bfbfb1d2803423c4491fe2d4da4cdc3a
Author: Ben Pfaff <blp at nicira.com>
		
flow: Rename flow_set_vlan_vid() to flow_set_dl_vlan().
		
This function is specific to the OF1.0 dl_vlan field, so name it
consistently.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Simon Horman <horms at verge.net.au>


commit 441c57a919fbd9d4961be767a796c836ce45bced
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=441c57a919fbd9d4961be767a796c836ce45bced
Author: Ben Pfaff <blp at nicira.com>
		
meta-flow: Rename MFF_VLAN_VID->MFF_DL_VLAN, MFF_VLAN_PCP->MFF_DL_VLAN_PCP.
		
Giving these fields names that are the same as the OpenFlow 1.0 struct
member names should help make it clear what they are for.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Simon Horman <horms at verge.net.au>


-----------------------------------------------------------------------

Summary of changes:
 lib/classifier.c      |   27 ++++++++++++++++++-
 lib/classifier.h      |    3 ++
 lib/flow.c            |   13 ++++++++-
 lib/flow.h            |    1 +
 lib/meta-flow.c       |   71 ++++++++++++++++++++++++++++++++++++++++++------
 lib/meta-flow.h       |    7 +++-
 lib/nx-match.c        |   22 ++++++++++++---
 tests/ovs-ofctl.at    |   50 ++++++++++++++++++++++++++++++++++
 utilities/ovs-ofctl.c |   24 ++++++++++++++++
 9 files changed, 201 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list