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. The existing SET_IPV4_DSCP action is renamed as SET_IP_DSCP action, and the limitation to IPv4 only is lifted. Even though the spec says the action applies to IPv4 only, the limitation makes compatability between different versions impossible, since actions in group buckets do not have a match from which the ethertype could be checked. Jarno Rajahalme (15): ofp-actions: Make union ofp_action more generic. Fix ovs-ofctl documentation. lib/ofp-actions: Enforce action consistency. Rename OFPACT_SET_IPV4_DSCP to OFPACT_SET_IP_DSCP. Add OF11 set IPv4 ECN action. Add OF11 SET IP TTL action. OF 1.1 set vlan vid/pcp compatibility. OF 1.1 pop vlan compatibility. Inline mf_from_id(), add OXM names. Native OpenFlow 1.2 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: Translate 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 | 223 ++++--- lib/meta-flow.h | 38 +- lib/nx-match.c | 135 +---- lib/nx-match.h | 2 - lib/ofp-actions.c | 1282 +++++++++++++++++++++++++++++++---------- lib/ofp-actions.h | 117 +++- lib/ofp-parse.c | 141 ++++- lib/ofp-parse.h | 12 +- lib/ofp-util.c | 151 +++-- lib/ofp-util.def | 12 +- lib/ofp-util.h | 3 + ofproto/ofproto-dpif-xlate.c | 112 +++- ofproto/ofproto.c | 21 +- tests/learn.at | 2 + tests/ofp-actions.at | 6 +- tests/ovs-ofctl.at | 74 ++- utilities/ovs-controller.c | 2 +- utilities/ovs-ofctl.8.in | 33 +- utilities/ovs-ofctl.c | 54 +- 20 files changed, 1731 insertions(+), 713 deletions(-) -- 1.7.10.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
