ofp-actions: Support mixing "conjunction" and "note" actions.
authorBen Pfaff <blp@nicira.com>
Fri, 26 Jun 2015 15:14:15 +0000 (08:14 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 26 Jun 2015 15:14:20 +0000 (08:14 -0700)
commitf08e39dd023ff27c32166b76d6906fbf20f78991
treefaea61c999ab5d57d99950f33951ff4b082c13c0
parente3a4416aa5d706be158c6a2a1957616eb849d307
ofp-actions: Support mixing "conjunction" and "note" actions.

It doesn't make sense to mix "conjunction" actions with most other kinds
of actions.  That's because flows with "conjunction" actions aren't ever
actually executed, so any actions mixed up with them would never do
anything useful.  "note" actions are a little different because they never
do anything useful anyway: they are just there to allow a controller to
annotate flows.  It makes as much sense to annotate a flow with
"conjunction" actions as it does to annotate any other flow, so this
commit makes this possible.

Requested-by: Soner Sevinc <sevincs@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
lib/ofp-actions.c
ofproto/ofproto.c
tests/classifier.at
utilities/ovs-ofctl.8.in