[ovs-dev] [PATCH] test-controller: Rename to ovs-testcontroller, again install.

Justin Pettit jpettit at nicira.com
Thu Aug 14 19:59:05 UTC 2014


On August 14, 2014 at 11:16:51 AM, Ben Pfaff (blp at nicira.com) wrote:

> diff --git a/FAQ b/FAQ
> index 3470983..7fbf9a9 100644
> --- a/FAQ
> +++ b/FAQ
> @@ -89,9 +89,10 @@ A: Distributed vswitch applications (e.g., VMware vNetwork distributed  
> environments: OpenFlow, which exposes flow-based forwarding state,
> and the OVSDB management protocol, which exposes switch port state.
> In addition to the switch implementation itself, Open vSwitch
> - includes tools (ovs-ofctl, ovs-vsctl) that developers can script and
> - extend to provide distributed vswitch capabilities that are closely
> - integrated with their virtualization management platform.
> + includes tools (ovs-ofctl, ovs-vsctl, ovs-appctl) that developers

Did you mean to introduce "ovs-appctl" in this patch?  It seems unrelated.


> +# Short-Description: Simple OpenFLow controller for testing

The "L" in "OpenFlow" is mistakenly capitalized.


> diff --git a/lib/ssl-bootstrap.man b/lib/ssl-bootstrap.man
> index c112f9a..37ed791 100644
> --- a/lib/ssl-bootstrap.man
> +++ b/lib/ssl-bootstrap.man
> @@ -14,7 +14,9 @@ for bootstrapping.
> .IP
> This option is only useful if the SSL peer sends its CA certificate as
> part of the SSL certificate chain. The SSL protocol does not require
> -the server to send the CA certificate.
> +the server to send the CA certificate, but
> +\fB\*(SN\fR(8) can be configured to do so with the
> +\fB\-\-peer\-ca\-cert\fR option.
> .IP
> This option is mutually exclusive with \fB\-C\fR and
> \fB\-\-ca\-cert\fR.

Did you mean to include this patch?  It also seems unrelated.


> +utilities/ovs-controller.8: \
> + utilities/ovs-controller.8.in \

Should these references to ovs-controller be here?


> diff --git a/ovsdb/ovsdb-client.1.in b/ovsdb/ovsdb-client.1.in
> index fbb7148..5704127 100644
> --- a/ovsdb/ovsdb-client.1.in
> +++ b/ovsdb/ovsdb-client.1.in
> @@ -8,6 +8,8 @@
> .TH ovsdb\-client 1 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
> .\" This program's name:
> .ds PN ovsdb\-client
> +.\" SSL peer program's name:
> +.ds SN ovsdb\-server
> .
> .SH NAME
> ovsdb\-client \- command-line interface to \fBovsdb-server\fR(1)
> diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
> index ec408a6..db0c216 100644
> --- a/ovsdb/ovsdb-server.1.in
> +++ b/ovsdb/ovsdb-server.1.in
> @@ -7,6 +7,8 @@
> .TH ovsdb\-server 1 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
> .\" This program's name:
> .ds PN ovsdb\-server
> +.\" SSL peer program's name:
> +.ds SN ovsdb\-client
> .
> .SH NAME
> ovsdb\-server \- Open vSwitch database server
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in

These changes also seem unrelated.


> --- a/utilities/bugtool/ovs-bugtool.in
> +++ b/utilities/bugtool/ovs-bugtool.in
> @@ -13,8 +13,8 @@
> # License along with this library; if not, write to the Free Software
> # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> #
> -# Copyright (c) 2005, 2007 XenSource Ltd.
> -# Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
> +# Copyright (c) 2005, 2007, 2014 XenSource Ltd.
> +# Copyright (c) 2010, 2011, 2012 Nicira, Inc.

This removes 2013 from our copyright.


> diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
> index aafda23..989eca4 100644
> --- a/utilities/ovs-ofctl.8.in
> +++ b/utilities/ovs-ofctl.8.in
> @@ -2162,5 +2162,6 @@ Prints the flow entries in the switch.
> .SH "SEE ALSO"
> .
> .BR ovs\-appctl (8),
> +.BR ovs\-controller (8),

I assume this should be "ovs\-testcontroller".


> .BR ovs\-vswitchd (8)
> .BR ovs\-vswitchd.conf.db (8)
> diff --git a/utilities/ovs-pki.8.in b/utilities/ovs-pki.8.in
> index 9c3019b..6d042b4 100644
> --- a/utilities/ovs-pki.8.in
> +++ b/utilities/ovs-pki.8.in
> @@ -236,3 +236,7 @@ Sets the log file to \fIfile\fR. Default:
> .IP "\fB\-h\fR"
> .IQ "\fB\-\^\-help\fR"
> Prints a help usage message and exits.
> +
> +.SH "SEE ALSO"
> +
> +.BR ovs\-controller (8).

Again, I assume this should be "ovs\-testcontroller".


> .SH NAME
> -test\-controller \- simple OpenFlow controller for testing
> +ovs\-testcontroller \- simple OpenFlow controller for

"for"...testing?


> \fB% ovs\-vsctl \-t0 \-\-db=pssl: \-\-certificate=cert.pem
> \-\-ca\-cert=none \-\-private\-key=privkey.pem
> -\-\-peer\-ca\-cert=cacert.pem set\-controller ssl:\fIip\fR
> +\-\-peer\-ca\-cert=cacert.pem set\-testcontroller ssl:\fIip\fR

I think this should stay as "set\-controller".


> diff --git a/utilities/ovs-vsctl.8.in b/utilities/ovs-vsctl.8.in
> index d397721..66a501e 100644
> --- a/utilities/ovs-vsctl.8.in
> +++ b/utilities/ovs-vsctl.8.in
> @@ -13,6 +13,8 @@
> .TH ovs\-vsctl 8 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
> .\" This program's name:
> .ds PN ovs\-vsctl
> +.\" SSL peer program's name:
> +.ds SN ovsdb\-server

I don't think you intended to introduce this change in this patch.


> @@ -467,7 +469,9 @@ for bootstrapping.
> .PP
> This option is only useful if the controller sends its CA certificate
> as part of the SSL certificate chain. The SSL protocol does not
> -require the controller to send the CA certificate.
> +require the controller to send the CA certificate, but
> +\fBovs\-controller\fR(8) can be configured to do so with the

I assume this should be "ovs-\testcontroller".


> diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
> index 6e4929c..80305d1 100644
> --- a/vswitchd/ovs-vswitchd.8.in
> +++ b/vswitchd/ovs-vswitchd.8.in
> @@ -7,6 +7,8 @@
> .TH ovs\-vswitchd 8 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
> .\" This program's name:
> .ds PN ovs\-vswitchd
> +.\" SSL peer program's name:
> +.ds SN ovs\-controller

Should be "ovs\-testcontroller", I believe.


> ovs\-vswitchd \- Open vSwitch daemon
> diff --git a/vtep/vtep-ctl.8.in b/vtep/vtep-ctl.8.in
> index 3203854..6a30db3 100644
> --- a/vtep/vtep-ctl.8.in
> +++ b/vtep/vtep-ctl.8.in
> @@ -13,6 +13,8 @@
> .TH vtep\-ctl 8 "March 2013" "Open vSwitch" "Open vSwitch Manual"
> .\" This program's name:
> .ds PN vtep\-ctl
> +.\" SSL peer program's name:
> +.ds SN ovsdb\-server

I don't think you intended to introduce this change.

I read through it pretty quickly, so let me know if you want me to review a second version.

--Justin








More information about the dev mailing list