From: Ben Pfaff Date: Sat, 14 Sep 2013 20:45:13 +0000 (-0700) Subject: ovs-ofctl: Document a few Nicira extensions as standardized in OF1.1+. X-Git-Tag: sliver-openvswitch-2.0.90-1~5^2~49 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=70d0aed308a0788df241262256013bf5e2c571e1 ovs-ofctl: Document a few Nicira extensions as standardized in OF1.1+. The update is incomplete, so document that also. Reported-by: Stephen Finucane Signed-off-by: Ben Pfaff --- diff --git a/AUTHORS b/AUTHORS index 8154e4060..8fc99adf3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -218,6 +218,7 @@ Sébastien RICCIO sr@swisscenter.com Spiro Kourtessis spiro@vmware.com Srini Seetharaman seethara@stanford.edu Stephen Hemminger shemminger@vyatta.com +Stephen Finucane stephen.finucane@intel.com Takayuki HAMA t-hama@cb.jp.nec.com Teemu Koponen koponen@nicira.com Timothy Chen tchen@nicira.com diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+ index 1bb5a81de..d7c2b5fe6 100644 --- a/OPENFLOW-1.1+ +++ b/OPENFLOW-1.1+ @@ -243,6 +243,12 @@ OpenFlow 1.4 [EXT-235] [optional for OF1.4+] +General +----- + + * ovs-ofctl(8) often lists as Nicira extensions features that + later OpenFlow versions support in standard ways. + How to contribute ----------------- diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index dc866191c..82ad87f82 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -382,7 +382,8 @@ between a switch and its controller. When a switch has more than one controller configured, only the traffic to and from a single controller is output. If none of the controllers is configured as a master or a slave (using a Nicira -extension to OpenFlow), then a controller is chosen arbitrarily among +extension to OpenFlow 1.0 or 1.1, or a standard request in OpenFlow +1.2 or later), then a controller is chosen arbitrarily among them. If there is a master controller, it is chosen; otherwise, if there are any controllers that are not masters or slaves, one is chosen arbitrarily; otherwise, a slave controller is chosen