This series adds many of the missing OpenFlow 1.1 actions. Due to the different semantics, the vlan actions are annotated based on the policy on missing vlan header.
A native OF 1.2 Set Field action with translation to/from OF 1.0/1.1 actions is added. Action consistency is enforced for OF 1.1+, as suggested in the specification. v4: - Address Ben's comments: - separate user visible changes to meta-flows from internal changes. - Enforce presence of the OFPVID_PRESENT bit for Set-Field on OXM_OF_VLAN_VID. - Add OFPVID_PRESENT when parsing from string, and omit the bit when printing. - Clear the OFPVID_PRESENT bit when translating Set-Field OXM_OF_VLAN_VID to OpenFlow 1.0/1.1. - Explicitly check for header presence before action execution. v3: - Rebase - Fix issues raised by Ben: - Fix reported offset error in ofp-actions.c - Do not enforce consistency for Write-Actions - Silence a compiler warning about mf_fields. - Fix byte-order errors in MPLS label handling found with sparse. Jarno Rajahalme (10): OF 1.1 set vlan vid/pcp compatibility. OF 1.1 pop vlan compatibility. Inline mf_from_id(). OXM inspired match field names. Native Set-Field action. lib/ofp-actions: Set field OF 1.0/1.1 compatibility. lib/ofp-action: Simplify interface and internal structure. lib/ofp-actions: Send deprecated actions as set fields. lib/ofp-actions: Log a warning on deprecated actions. Add OF11 SET MPLS LABEL and SET MPLS TC actions. include/openflow/nicira-ext.h | 24 + lib/meta-flow.c | 22 +- lib/meta-flow.h | 18 +- lib/nx-match.c | 131 +----- lib/nx-match.h | 2 - lib/ofp-actions.c | 969 +++++++++++++++++++++++++++++++++-------- lib/ofp-actions.h | 93 ++-- lib/ofp-parse.c | 75 +++- lib/ofp-util.c | 151 ++++--- lib/ofp-util.def | 8 +- lib/ofp-util.h | 2 + ofproto/ofproto-dpif-xlate.c | 97 ++++- ofproto/ofproto.c | 2 +- tests/ofp-actions.at | 6 +- tests/ovs-ofctl.at | 33 +- utilities/ovs-ofctl.8.in | 11 + utilities/ovs-ofctl.c | 21 +- 17 files changed, 1196 insertions(+), 469 deletions(-) -- 1.7.10.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
