[ovs-git] Open vSwitch: Tests: Fix ofproto/trace and expose megaflows when having a set action. (master)

dev at openvswitch.org dev at openvswitch.org
Wed Apr 9 19:03:06 UTC 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  ce58df5be1933ff218aa8f892394756892f0e85c (commit)
       via  1ac9326da58915bc096eb5cd3d48b472d8b9e0fc (commit)
       via  66ce9f09aa4bc71f60c7e5ff2226cfb4d5e3bf0b (commit)
       via  cd527139bbe08729f18112eea5073ffd0f435979 (commit)
       via  4347b9b38e75ddb30975039ae95eade9efe5be3e (commit)
      from  65a0903b26bdff3e42dc0fa78ef5b73a48448e80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce58df5be1933ff218aa8f892394756892f0e85c
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ce58df5be1933ff218aa8f892394756892f0e85c
Author: Jarno Rajahalme <jrajahalme at nicira.com>
		
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 at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>

commit 1ac9326da58915bc096eb5cd3d48b472d8b9e0fc
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1ac9326da58915bc096eb5cd3d48b472d8b9e0fc
Author: Jarno Rajahalme <jrajahalme at nicira.com>
		
ofproto: Fix wildcard masking with nw_tos.
		
Later patches rely on the DSCP and ECN masks to be properly set when
the fields are read.  Also, avoid reading nw_tos if tunnel's inner
packet is not IP.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>

commit 66ce9f09aa4bc71f60c7e5ff2226cfb4d5e3bf0b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=66ce9f09aa4bc71f60c7e5ff2226cfb4d5e3bf0b
Author: Jarno Rajahalme <jrajahalme at nicira.com>
		
lib/ofp-actions: Silently discard set ip ecn/ttl actions on OpenFlow10.
		
It is better to not abort().

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>

commit cd527139bbe08729f18112eea5073ffd0f435979
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=cd527139bbe08729f18112eea5073ffd0f435979
Author: Andy Zhou <azhou at nicira.com>
		
dpif-netdev: Use existing flow for computing dp hash
		
Signed-off-by: Andy Zhou <azhou at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


commit 4347b9b38e75ddb30975039ae95eade9efe5be3e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4347b9b38e75ddb30975039ae95eade9efe5be3e
Author: Andy Zhou <azhou at nicira.com>
		
dpif-netdev: preserve packet metadata fields across recirculation
		
If the actions executed during recirculation changed metadata fields,
then any actions after the recirculation returns would see those new
values. Now, all metadata are saved and restored across a recirculation.

Signed-off-by: Andy Zhou <azhou at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/dpif-netdev.c            |   23 +++++++++-------------
 lib/ofp-actions.c            |    4 ++--
 ofproto/ofproto-dpif-xlate.c |    2 +-
 ofproto/ofproto-dpif.c       |   10 +++++++---
 ofproto/tunnel.c             |   37 +++++++++++++++++++----------------
 tests/ofproto-dpif.at        |   44 +++++++++++++++++++++++++-----------------
 tests/tunnel.at              |   20 +++++++++++--------
 7 files changed, 77 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list