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:42:22 +0000 (08:42 -0700)
commit51a903f1f3ef0147711575a3eba9ba26f13d0382
tree0c89fba1c011b54fa54b9549f9a4e0716a20f412
parent0020b5b59aa385c571a428af694504ab4a649342
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