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 v4: * Rebased, including dropping patches from v4 that have been merged * Use new protocols column rather than existing other_config column of bridge table to configure the allowed versions for vswitchd. * Make "ofp-util: Allow use of OpenFlow 12 flow format" more complete by merging in other changes. * Make "connmgr: Use version of underlying rconn" more robust Changes are noted in the changelog of each patch. Git and diffstat information is provided below to aid review. Ben, please feel free to modify these patches or send me feedback, whichever is more convenient for you. ---------------------------------------------------------------- The following changes since commit 29c7a2b26ed005902b2179d7fe242eb711184b88: odp-utils: Print human readable ipv4-tunnel-key flags. (2012-11-14 21:17:27 -0800) are available in the git repository at: git://github.com/horms/openvswitch.git devel/of1.2-runtime-switch5 for you to fetch changes up to 7719ac235f4ada55e269027995ca1f0e6cfa9d8b: test: add ofproto OpenFlow1.2 tests (2012-11-16 11:05:37 +0900) ---------------------------------------------------------------- Simon Horman (9): 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: Flow Dump Protocol for OpenFlow 12 test: add ofproto OpenFlow1.2 tests lib/automake.mk | 3 + lib/ofp-util.c | 66 +++-- lib/ofp-util.h | 15 +- lib/ofp-version-opt.c | 41 +++ lib/ofp-version-opt.h | 28 ++ lib/ofp-version.man | 26 ++ manpages.mk | 2 + ofproto/connmgr.c | 18 +- tests/learn.at | 2 +- tests/ofproto-macros.at | 2 +- tests/ofproto.at | 595 ++++++++++++++++++++++++++++++++++++++--- tests/ovs-ofctl.at | 2 +- tests/ovs-vsctl.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 | 16 +- vswitchd/vswitch.ovsschema | 8 +- vswitchd/vswitch.xml | 7 + 20 files changed, 833 insertions(+), 118 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