Hi,
This series adds run-time configuration of allowed OpenFlow versions to
ovs-vswtichd, ovs-ofctl and ovs-controller; and adds tests for Open Flow
1.2 messages that utilise the run-time configuration of allowed OpenFlow
versions.
Changes since v3:
* Rebased, including dropping patches from v3 that have been merged
* Added "ofp-util: Correct length of hello version bitmap" which
corrects what seems to be a regression in the merge of v3 patches.
* Replaced "ofproto: Make set_pvconns() aware of OpenFlow versions" with
"vonn: Allow snoops to use the OpenFlow version of the controller connection"
* Dropped "ofp-util: Optimize ofputil_version_bitmap_scanr"
This is no longer relevant.
Git and diffstat information is provided below to aid review.
----------------------------------------------------------------
The following changes since commit b099cd5f555a22646fe0be565ccef3c0cf9dcd87:
bridge: Fix a segmentation fault in bridge_init_ofproto(). (2012-11-06
12:40:05 -0800)
are available in the git repository at:
git://github.com/horms/openvswitch.git devel/of1.2-runtime-switch4
for you to fetch changes up to 5842a08dfe157923492fb9abff6d3d5288cb419c:
test: add ofproto OpenFlow1.2 tests (2012-11-07 16:45:55 +0900)
----------------------------------------------------------------
Simon Horman (14):
ofp-util: Correct length of hello version bitmap
rconn: Add allowed OpenFlow versions
vonn: Allow snoops to use the OpenFlow version of the controller
connection
ofproto, connmgr: Parameterise OpenFlow versions for adding controller
ofp-util: Allow use of OpenFlow 12 flow format
connmgr: Use version of underlying rconn
vswitchd: Configuration of allowed OpenFlow versions
lib: Add helpers for OpenFlow version command line options
ovs-ofctl: Add option to set allowed OpenFlow versions
ovs-controller: Allow setting of allowed OpenFlow versions
ovs-ofctl: By default, do not set flow format for OpenFlow 1.1+
ofp-util: Open Flow 1.1 and 1.2 flow format capabilities
ofp-util: Flow Dump Protocol for OpenFlow 12
test: add ofproto OpenFlow1.2 tests
lib/automake.mk | 3 +
lib/ofp-util.c | 76 +++---
lib/ofp-util.h | 20 +-
lib/ofp-version-opt.c | 41 +++
lib/ofp-version-opt.h | 28 ++
lib/ofp-version.man | 26 ++
lib/rconn.c | 34 ++-
lib/rconn.h | 4 +-
lib/vconn.c | 8 +
lib/vconn.h | 2 +
manpages.mk | 2 +
ofproto/connmgr.c | 27 +-
ofproto/connmgr.h | 3 +-
ofproto/ofproto.c | 5 +-
ofproto/ofproto.h | 3 +-
tests/learn.at | 2 +-
tests/ofproto-macros.at | 2 +-
tests/ofproto.at | 595 ++++++++++++++++++++++++++++++++++++++---
tests/ovs-ofctl.at | 2 +-
utilities/ovs-controller.8.in | 1 +
utilities/ovs-controller.c | 20 +-
utilities/ovs-ofctl.8.in | 1 +
utilities/ovs-ofctl.c | 96 ++++---
vswitchd/bridge.c | 18 +-
24 files changed, 883 insertions(+), 136 deletions(-)
create mode 100644 lib/ofp-version-opt.c
create mode 100644 lib/ofp-version-opt.h
create mode 100644 lib/ofp-version.man
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
