On Wed, Aug 08, 2012 at 06:49:35AM +0900, Simon Horman wrote: > Hi Ben, Hi All, > > this series adds infrastructure and message encoding and decoding > to allow OpenFlow 1.2 to be used to the extent that ovs-controller > works as a learning-switch and similar logic implemented using Ryu[1]. > Note that some previously posted hacks are required in order for Open > vSwtich to actually use OpenFlow 1.2. > > [1] Ryu is an OpenFlow controller implemented in Python > http://osrg.github.com/ryu/ > > Differing from the previous posting, this series supports encoding and > decoding of Queue Status request and reply messages. > > This series also allows OXM for OpenFlow 1.1, as suggested by > Ben Pfaff when reviewing v9 of this series. > > > Base > ---- > > This series is based the current master branch
That was true yesterday afternoon when I prepared the series, but it was no longer true by the time that I posted it this morning. I have rebased again. And resolved a minor conflict in patch 7, which I will re-post. > Availability > ------------ > > This series is available in the devel/of1.2 (n.b: not devel/of12) branch > of git://github.com/horms/openvswitch.git > (ef8848df4aca375913d0829554effa260064d74b "ovs-ofpctl: Enable queue-stats > for Open Flow 1.1 & 1.2") The series is now available in the devel/of1.2 branch of git://github.com/horms/openvswitch.git, revision eea3e4b58c8e20c2747879b8bed46e3263e480f0 ("ovs-ofpctl: Enable queue-stats for Open Flow 1.1 & 1.2"). The only change is the merge conflict resolution of patch 7. > Patches > ------- > > [PATCH 01/41] ofp-util: ofputil_pull_ofp11_match: Allow OXM match > [PATCH 02/41] ofp-print: Open Flow 1.2 Flow Mod message tests > [PATCH 03/41] ofp-util: Allow encoding of Open Flow 1.2 Packet In > [PATCH 04/41] ofp-util: Allow decoding of Open Flow 1.2 Packet In > [PATCH 05/41] ofp-msgs: Update OFPRAW_OFPT_SET_CONFIG for OpenFlow > [PATCH 06/41] ofp-actions: Return action size > [PATCH 07/41] ofp-util: Prepare Packet Out encoder for other Open > [PATCH 08/41] ofp-util: Allow encoding of Open Flow 1.1 and 1.2 > [PATCH 09/41] ofp-util: Prepare Packet Out decoder for other Open > [PATCH 10/41] ofp-util: Allow decoding of Open Flow 1.1 and 1.2 > [PATCH 11/41] ofp-util: Allow encoding of Open Flow 1.2 Flow Removed > [PATCH 12/41] ofp-util: Allow encoding Open Flow 1.2 Flow Stats > [PATCH 13/41] ofp-util: Allow use of OF12 flow format > [PATCH 14/41] ofp-util: Allow encoding of Open Flow 1.2 Port Mod > [PATCH 15/41] ofp-util: Allow decoding of Open Flow 1.2 Port Mod > [PATCH 16/41] ofp-msgs: Split OFPRAW_OFPST_FLOW_{REQUEST,REPLY} > [PATCH 17/41] ofp-util: Prepare Flow Statistics Request Decoder for > [PATCH 18/41] ofp-util: Allow decoding of Open Flow 1.2 Flow > [PATCH 19/41] ofp-util: Allow encoding of Open Flow 1.2 Flow > [PATCH 20/41] ofp-util: Allow decoding of Open Flow 1.2 Flow > [PATCH 21/41] ofp-msgs: Split OFPRAW_OFPST_AGGREGATE_REQUEST > [PATCH 22/41] ofp-msgs: Allow 1.0-1.2 range > [PATCH 23/41] ofp-msgs: Split OFPRAW_OFPST_TABLE_REPLY > [PATCH 24/41] ofp-print: Enable display of Open Flow 1.1 & 1.2 Table > [PATCH 25/41] ofp-util: Allow decoding of Open Flow 1.1 & 1.2 Table > [PATCH 26/41] ovs-ofctl: Use vconn as a parameter of > [PATCH 27/41] ofp-msgs: Allow encoding and decoding of Open Flow 1.1 > [PATCH 28/41] ofp-msgs: Split OFPRAW_OFPST_PORT_{REQUEST,REPLY} > [PATCH 29/41] ovs-ofputil: Make str_to_port_no() aware of invalid > [PATCH 30/41] ofp-util: Pass vconn to fetch_port_by_features() > [PATCH 31/41] ofp-util: Allow encoding of Open Flow 1.1 & 1.2 Port > [PATCH 32/41] ofp-print: Allow printing of Open Flow 1.1 & 1.2 Port > [PATCH 33/41] ofp-util: Allow decoding of Open Flow 1.1 & 1.2 Port > [PATCH 34/41] ofp-print: Allow printing of Open Flow 1.1 & 1.2 Port > [PATCH 35/41] ovs-ofctl: Teach dump-ports about Open Flow 1.1 & 1.2 > [PATCH 36/41] ofp-msgs: Split OFPRAW_OFPST_QUEUE_{REQUEST,REPLY} > [PATCH 37/41] ofp-print: Enable display of Open Flow 1.1 & 1.2 Queue > [PATCH 38/41] ofp-util: Allow encoding of Open Flow 1.1 & 1.2 Queue > [PATCH 39/41] ofp-util: Allow decoding of Open Flow 1.1 & 1.2 Queue > [PATCH 40/41] ovs-print: Enable display of Open Flow 1.1 & 1.2 Queue > [PATCH 41/41] ovs-ofpctl: Enable queue-stats for Open Flow 1.1 & 1.2 > > Overall Diffstat > ---------------- > > build-aux/extract-ofp-msgs | 3 > include/openflow/openflow-1.1.h | 4 > include/openflow/openflow-1.2.h | 5 > lib/learning-switch.c | 4 > lib/ofp-actions.c | 5 > lib/ofp-actions.h | 4 > lib/ofp-msgs.h | 77 +++-- > lib/ofp-print.c | 357 +++++++++++++++++++++---- > lib/ofp-util.c | 426 ++++++++++++++++++++++++------ > lib/ofp-util.h | 11 > ofproto/connmgr.c | 3 > ofproto/ofproto-dpif.c | 32 +- > ofproto/ofproto-provider.h | 71 ++++- > ofproto/ofproto.c | 295 ++++++++++++++++++-- > tests/learn.at | 2 > tests/ofp-print.at | 405 +++++++++++++++++++++++++++- > tests/ofproto.at | 12 > utilities/ovs-ofctl.c | 191 +++++++++---- > 18 files changed, 1617 insertions(+), 290 deletions(-) > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev