Tests: Fix ofproto/trace and expose megaflows when having a set action.
authorJarno Rajahalme <jrajahalme@nicira.com>
Wed, 9 Apr 2014 18:13:57 +0000 (11:13 -0700)
committerJarno Rajahalme <jrajahalme@nicira.com>
Wed, 9 Apr 2014 18:38:11 +0000 (11:38 -0700)
commitce58df5be1933ff218aa8f892394756892f0e85c
tree1f2eeea8d9491682299bfdcc088bdde34e7aa0fc
parent1ac9326da58915bc096eb5cd3d48b472d8b9e0fc
Tests: Fix ofproto/trace and expose megaflows when having a set action.

ofproto/trace incorrectly reported the megaflow based on the modified
flow, rather than the original flow key.  Now the original flow key is
stored before any modifications and is used for reporting the megaflow.

Also, flow reporting is suppressed only for resubmit flows, so that
the final flow will be printed if it is different from the incoming
flow key.

Test for the megaflow key and mask with flows having set actions.
This helps in verifying the correctness of operation with masked set
actions in the following patches.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
ofproto/ofproto-dpif.c
tests/ofproto-dpif.at
tests/tunnel.at