From 95c9f54e93225b1c4d906559a1bb0deb36d139a8 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Wed, 20 May 2009 22:46:29 -0700 Subject: [PATCH] Change project name to "Open vSwitch" The project was most recently called "OpenVSwitch". This commit changes the name to "Open vSwitch", which should be the official name (and capitalization) going forward. --- INSTALL | 36 ++++++------- README | 10 ++-- datapath/brc_sysfs_dp.c | 2 +- datapath/brc_sysfs_if.c | 2 +- datapath/brcompat.c | 4 +- datapath/datapath.c | 4 +- debian/changelog | 2 +- debian/control | 54 +++++++++---------- debian/control.modules.in | 6 +-- debian/openvswitch-controller.init | 2 +- .../openvswitch-datapath-source.README.Debian | 2 +- debian/openvswitch-monitor.default | 2 +- debian/openvswitch-monitor.init | 4 +- debian/openvswitch-switch.README.Debian | 2 +- debian/openvswitch-switch.init | 2 +- debian/openvswitch-switch.template | 4 +- debian/openvswitch-switchui.init | 4 +- debian/openvswitch-wdt.default | 2 +- debian/openvswitch-wdt.init | 4 +- debian/ovs-switch-setup | 2 +- debian/ovs-switch-setup.8 | 14 ++--- secchan/main.c | 2 +- secchan/secchan.8.in | 2 +- tests/test-dhcp-client.c | 2 +- utilities/ovs-appctl.8.in | 8 +-- utilities/ovs-cfg-mod.8.in | 2 +- utilities/ovs-controller.8.in | 2 +- utilities/ovs-discover.8.in | 10 ++-- utilities/ovs-dpctl.8.in | 16 +++--- utilities/ovs-dpctl.c | 2 +- utilities/ovs-kill.8.in | 2 +- utilities/ovs-kill.c | 2 +- utilities/ovs-ofctl.8.in | 2 +- utilities/ovs-parse-leaks.in | 2 +- utilities/ovs-pki.8.in | 2 +- utilities/ovs-pki.in | 10 ++-- vswitchd/brcompatd.8.in | 4 +- vswitchd/vswitchd.8.in | 18 +++---- vswitchd/vswitchd.conf.5.in | 2 +- 39 files changed, 127 insertions(+), 127 deletions(-) diff --git a/INSTALL b/INSTALL index 091e75e3..e6dde2e7 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,9 @@ - OpenVSwitch Installation Instructions + Open vSwitch Installation Instructions This document describes how to build, install, and execute -OpenVSwitch. +Open vSwitch. -OpenVSwitch implements an Ethernet switch with MAC learning that may +Open vSwitch implements an Ethernet switch with MAC learning that may be configured with any of the following features: * NIC bonding with automatic fail-over and source MAC-based TX @@ -38,7 +38,7 @@ There are two principal ways to build and install this distribution: Base Prerequisites ------------------ -Regardless of how it is built, OpenVSwitch has a common set of +Regardless of how it is built, Open vSwitch has a common set of prerequisites. To compile the userspace programs in the OpenFlow reference distribution, you will need the following software: @@ -49,10 +49,10 @@ reference distribution, you will need the following software: with version 4.2 or 4.3. - libssl, from OpenSSL (http://www.openssl.org/), is optional but - recommended if you plan to connect the OpenVSwitch to an + recommended if you plan to connect the Open vSwitch to an OpenFlow controller. libssl is required to establish confidentiality and authenticity in the connections from an - OpenVSwitch to an OpenFlow controller. To enable, configure + Open vSwitch to an OpenFlow controller. To enable, configure with --enable-ssl=yes. To compile the kernel module, you must also install the following: @@ -77,7 +77,7 @@ To compile the kernel module, you must also install the following: infrastructure. If you are working from a Git tree or snapshot (instead of from a -distribution tarball), or if you modify the OpenVSwitch build system, +distribution tarball), or if you modify the Open vSwitch build system, you will also need the following software: - Autoconf version 2.60 or later (http://www.gnu.org/software/autoconf). @@ -90,7 +90,7 @@ you will also need the following software: Debian Prerequisites -------------------- -To build Debian packages from the OpenVSwitch distribution, you will +To build Debian packages from the Open vSwitch distribution, you will need to install a number of Debian packages in addition to the base prerequisites listed above. These additional prerequisites may be found listed as "Build-Depends" in debian/control in the source tree. @@ -104,7 +104,7 @@ To build Debian packages without being root, also install the Building Conventionally ======================= -This section explains how to build and install the OpenVSwitch +This section explains how to build and install the Open vSwitch distribution in the ordinary way using "configure" and "make". 0. Check that you have installed all the prerequisites listed above in @@ -280,7 +280,7 @@ Follow these instructions to build Debian packages for OpenFlow. Installation ============ -This section explains how to install OpenVSwitch in a network with one +This section explains how to install Open vSwitch in a network with one controller and one or more switches, each of which runs on a separate machine. Before you begin, you must decide on one of two ways for each switch to reach the controller over the network: @@ -314,7 +314,7 @@ switch. Testing the Virtual Switch -------------------------- -The OpenVSwitch kernel module must be loaded, as described under +The Open vSwitch kernel module must be loaded, as described under "Building Conventionally", before it may be used. 0. The commands below must run as root, so log in as root, or use a @@ -406,16 +406,16 @@ Configuration Secure operation over SSL ------------------------- -The instructions above set up OpenVSwitch for operation over a -plaintext TCP connection. Production use of OpenVSwitch should use +The instructions above set up Open vSwitch for operation over a +plaintext TCP connection. Production use of Open vSwitch should use SSL[*] to ensure confidentiality and authenticity of traffic among switches and controllers. The source must be configured with --enable-ssl=yes to build with SSL support. -To use SSL with OpenVSwitch, you must set up a public-key infrastructure +To use SSL with Open vSwitch, you must set up a public-key infrastructure (PKI) including a pair of certificate authorities (CAs), one for controllers and one for switches. If you have an established PKI, -OpenVSwitch can use it directly. Otherwise, refer to "Establishing a +Open vSwitch can use it directly. Otherwise, refer to "Establishing a Public Key Infrastructure" below. To configure the controller to listen for SSL connections on port 6633 @@ -450,7 +450,7 @@ like: # secchan -v DATAPATH ssl:192.168.1.2 --private-key=sc-privkey.pem \ --certificate=sc-cert.pem --ca-cert=pki/controllerca/cacert.pem -[*] To be specific, OpenVSwitch uses TLS version 1.0 or later (TLSv1), as +[*] To be specific, Open vSwitch uses TLS version 1.0 or later (TLSv1), as specified by RFC 2246, which is very similar to SSL version 3.0. TLSv1 was released in January 1999, so all current software and hardware should implement it. @@ -458,11 +458,11 @@ like: Establishing a Public Key Infrastructure ---------------------------------------- -If you do not have a PKI, the ovs-pki script included with OpenVSwitch +If you do not have a PKI, the ovs-pki script included with Open vSwitch can help. To create an initial PKI structure, invoke it as: % ovs-pki init which will create and populate a new PKI directory. The default -location for the PKI directory depends on how the OpenVSwitch tree was +location for the PKI directory depends on how the Open vSwitch tree was configured (to see the configured default, look for the --dir option description in the output of "ovs-pki --help"). diff --git a/README b/README index 737029a1..bb33e54e 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ - OpenVSwitch + Open vSwitch -What is OpenVSwitch? --------------------- +What is Open vSwitch? +--------------------- -OpenVSwitch is an Ethernet switch for virtual servers with the +Open vSwitch is an Ethernet switch for virtual servers with the following features: * NIC bonding with automatic fail-over and source MAC-based TX @@ -42,7 +42,7 @@ This distribution includes some additional software as well: - ovs-ofctl, a utility for querying and controlling OpenFlow switches and controllers. - - vlog-appctl, a utility that can control OpenVSwitch daemons, + - vlog-appctl, a utility that can control Open vSwitch daemons, adjusting their logging levels among other uses. - ovs-pki, a utility for creating and managing the public-key diff --git a/datapath/brc_sysfs_dp.c b/datapath/brc_sysfs_dp.c index 6d12b04e..fc02f279 100644 --- a/datapath/brc_sysfs_dp.c +++ b/datapath/brc_sysfs_dp.c @@ -1,7 +1,7 @@ #include /* - * Sysfs attributes of bridge for OpenVSwitch + * Sysfs attributes of bridge for Open vSwitch * * This has been shamelessly copied from the kernel sources. */ diff --git a/datapath/brc_sysfs_if.c b/datapath/brc_sysfs_if.c index 245cd7f6..20bb109b 100644 --- a/datapath/brc_sysfs_if.c +++ b/datapath/brc_sysfs_if.c @@ -1,5 +1,5 @@ /* - * Sysfs attributes of bridge ports for OpenVSwitch + * Sysfs attributes of bridge ports for Open vSwitch * * This has been shamelessly copied from the kernel sources. */ diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 4de694f4..5b68c8b4 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -493,7 +493,7 @@ __init brc_init(void) int i; int err; - printk("OpenVSwitch Bridge Compatibility, built "__DATE__" "__TIME__"\n"); + printk("Open vSwitch Bridge Compatibility, built "__DATE__" "__TIME__"\n"); rcu_read_lock(); for (i=0; i Mon, 19 Nov 2007 14:57:52 -0800 + -- Open vSwitch developers Mon, 19 Nov 2007 14:57:52 -0800 diff --git a/debian/control b/debian/control index 770f11b7..09eda114 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: openvswitch Section: net Priority: extra -Maintainer: OpenVSwitch developers +Maintainer: Open vSwitch developers Build-Depends: debhelper (>= 5), autoconf (>= 2.60), automake1.10, libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl, libncurses5-dev, libpcre3-dev Standards-Version: 3.7.3 @@ -9,44 +9,44 @@ Package: openvswitch-datapath-source Architecture: all Depends: module-assistant, bzip2, debhelper (>= 5.0.37) Suggests: openvswitch-switch -Description: Source code for OpenVSwitch datapath Linux module - This package provides the OpenVSwitch datapath module source code +Description: Source code for Open vSwitch datapath Linux module + This package provides the Open vSwitch datapath module source code that is needed by openvswitch-switch. The kernel module can be built from it using module-assistant or make-kpkg. README.Debian in this package provides further instructions. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-common Architecture: any Depends: ${shlibs:Depends}, openssl -Description: OpenVSwitch common components +Description: Open vSwitch common components openvswitch-common provides components required by both openvswitch-switch and openvswitch-controller. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-switch Architecture: any Suggests: openvswitch-datapath-module Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common, dhcp3-client, module-init-tools, dmidecode, procps, debianutils -Description: OpenVSwitch switch implementations +Description: Open vSwitch switch implementations openvswitch-switch provides the userspace components and utilities for - the Openvswitch kernel-based switch. + the Open vSwitch kernel-based switch. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-switch-config Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-switch, libwww-perl, libdigest-sha1-perl -Description: OpenVSwitch switch implementations +Description: Open vSwitch switch implementations openvswitch-switch-config provides a utility for interactively configuring - the OpenVSwitch switch provided in the openvswitch-switch package. + the Open vSwitch switch provided in the openvswitch-switch package. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-switchui @@ -66,35 +66,35 @@ Description: Monitoring utility for OpenFlow switches Package: openvswitch-pki Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common -Description: OpenVSwitch public key infrastructure +Description: Open vSwitch public key infrastructure openvswitch-pki provides PKI (public key infrastructure) support for - OpenVSwitch switches and controllers, reducing the risk of - man-in-the-middle attacks on the Openvswitch network infrastructure. + Open vSwitch switches and controllers, reducing the risk of + man-in-the-middle attacks on the Open vSwitch network infrastructure. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-pki-server Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, openvswitch-pki, apache2 -Description: OpenVSwitch public key infrastructure (HTTP server support) - openvswitch-pki-server provides HTTP access to the OpenVSwitch PKI (public +Description: Open vSwitch public key infrastructure (HTTP server support) + openvswitch-pki-server provides HTTP access to the Open vSwitch PKI (public key infrastructure) maintained on the local machine by the openvswitch-pki package. This HTTP access is needed for secure and convenient OpenFlow switch setup using the ovs-switch-setup program in the openvswitch-switch package. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: openvswitch-controller Architecture: any Depends: ${shlibs:Depends}, openvswitch-common, openvswitch-pki -Description: OpenVSwitch controller implementation - The OpenVSwitch controller enables OpenFlow switches that connect to it +Description: Open vSwitch controller implementation + The Open vSwitch controller enables OpenFlow switches that connect to it to act as MAC-learning Ethernet switches. . - OpenVSwitch is a software-based Ethernet switch targeted at virtual + Open vSwitch is a software-based Ethernet switch targeted at virtual servers. Package: corekeeper @@ -107,7 +107,7 @@ Description: Core file centralizer and reaper Package: openvswitch-dbg Architecture: any Depends: ${shlibs:Depends} -Description: Debug symbols for OpenVSwitch packages +Description: Debug symbols for Open vSwitch packages This package contains the debug symbols for all the other openvswitch-* packages. Install it to debug one of them or to examine a core dump produced by one of them. @@ -116,7 +116,7 @@ Package: openvswitch-monitor Architecture: any Recommends: openvswitch-switch Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Monitor utility for OpenVSwitch switches +Description: Monitor utility for Open vSwitch switches The ovs-monitor utility included in this package monitors the secure channel and datapath. If either become unresponsive, the switch is rebooted. @@ -125,7 +125,7 @@ Package: openvswitch-wdt Architecture: any Recommends: openvswitch-switch Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Watchdog utility for OpenVSwitch switches +Description: Watchdog utility for Open vSwitch switches The ovs-wdt program included in this package manages the hardware watchdog timer in switches based on the Portwell NAR-5520 hardware. @@ -137,7 +137,7 @@ Depends: openvswitch-switchui (= ${source:Version}), openvswitch-datapath-module (= ${source:Version}), corekeeper, openvswitch-monitor, openvswitch-wdt -Description: Metapackage for installing a Nicira OpenVSwitch switch +Description: Metapackage for installing a Nicira Open vSwitch switch Installing this package will install everything needed for a Nicira - Portwell-based OpenVSwitch switch, including monitoring and the switch UI. + Portwell-based Open vSwitch switch, including monitoring and the switch UI. diff --git a/debian/control.modules.in b/debian/control.modules.in index cc163299..4da85b40 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -1,7 +1,7 @@ Source: openvswitch Section: net Priority: extra -Maintainer: OpenVSwitch developers +Maintainer: Open vSwitch developers Build-Depends: debhelper (>= 5.0.37) Standards-Version: 3.7.3 @@ -9,8 +9,8 @@ Package: openvswitch-datapath-module-_KVERS_ Architecture: any Recommends: kernel-image-_KVERS_, openvswitch-switch Provides: openvswitch-datapath-module -Description: OpenVSwitch Linux datapath kernel module - This package contains the OpenVSwitch loadable datapath kernel modules for +Description: Open vSwitch Linux datapath kernel module + This package contains the Open vSwitch loadable datapath kernel modules for the kernel-image-_KVERS_ package. . If you compiled a custom kernel, you will most likely need to compile diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init index 43a9c533..ee9c44d5 100755 --- a/debian/openvswitch-controller.init +++ b/debian/openvswitch-controller.init @@ -25,7 +25,7 @@ # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenVSwitch controller +# Short-Description: Open vSwitch controller ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin diff --git a/debian/openvswitch-datapath-source.README.Debian b/debian/openvswitch-datapath-source.README.Debian index 171aa9bd..73bba7a1 100644 --- a/debian/openvswitch-datapath-source.README.Debian +++ b/debian/openvswitch-datapath-source.README.Debian @@ -1,4 +1,4 @@ -OpenVSwitch for Debian +Open vSwitch for Debian ---------------------- * How do I build this module the Debian way? diff --git a/debian/openvswitch-monitor.default b/debian/openvswitch-monitor.default index 62f20ba9..f0c356e8 100644 --- a/debian/openvswitch-monitor.default +++ b/debian/openvswitch-monitor.default @@ -1,6 +1,6 @@ # This is a POSIX shell fragment -*- sh -*- -# To configure the OpenVSwitch monitor package, modify the following. +# To configure the Open vSwitch monitor package, modify the following. # Afterward, the monitor will be configured automatically at boot time. # It can be started immediately with # /etc/init.d/openvswitch-monitor start diff --git a/debian/openvswitch-monitor.init b/debian/openvswitch-monitor.init index 6e363471..8c7e1ad0 100755 --- a/debian/openvswitch-monitor.init +++ b/debian/openvswitch-monitor.init @@ -30,14 +30,14 @@ # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenVSwitch switch monitor +# Short-Description: Open vSwitch switch monitor ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/ovs-monitor NAME=openvswitch-monitor -DESC="OpenVSwitch switch monitor" +DESC="Open vSwitch switch monitor" PIDFILE=/var/run/$NAME.pid diff --git a/debian/openvswitch-switch.README.Debian b/debian/openvswitch-switch.README.Debian index 7c5e08d8..eb504f65 100644 --- a/debian/openvswitch-switch.README.Debian +++ b/debian/openvswitch-switch.README.Debian @@ -8,7 +8,7 @@ README.Debian for openvswitch-switch with "/etc/init.d/openvswitch-switch start". * To use the Linux kernel-based switch implementation, you will need - to build and install the OpenVSwitch kernel module. To do so, install + to build and install the Open vSwitch kernel module. To do so, install the openvswitch-datapath-source package, then follow the instructions given in /usr/share/doc/openvswitch-datapath-source/README.Debian diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index 50ea4b8b..b238f72e 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -15,7 +15,7 @@ # Required-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenVSwitch switch +# Short-Description: Open vSwitch switch ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin diff --git a/debian/openvswitch-switch.template b/debian/openvswitch-switch.template index 739475bc..7fe0e15c 100644 --- a/debian/openvswitch-switch.template +++ b/debian/openvswitch-switch.template @@ -17,7 +17,7 @@ # The network devices that you select should not be configured with IP # or IPv6 addresses, even if the switch contacts the controller over # one of the selected network devices. This is because a running -# OpenVSwitch switch takes over network devices at a low level: they +# Open vSwitch switch takes over network devices at a low level: they # become part of the switch and cannot be used for other purposes. #NETDEVS="" @@ -37,7 +37,7 @@ # * out-of-band: OpenFlow traffic uses a network separate from the # data traffic that it controls. If this is the case, the control # network must already be configured on a network device other than -# one of those selected as an OpenVSwitch switch port in the previous +# one of those selected as an Open vSwitch switch port in the previous # question. # # Set MODE to 'discovery', 'in-band', or 'out-of-band' for these diff --git a/debian/openvswitch-switchui.init b/debian/openvswitch-switchui.init index 1857bb51..7a02c5ea 100755 --- a/debian/openvswitch-switchui.init +++ b/debian/openvswitch-switchui.init @@ -30,14 +30,14 @@ # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenVSwitch switch monitor +# Short-Description: Open vSwitch switch monitor ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/ovs-switchui NAME=openvswitch-switchui -DESC="OpenVSwitch switch monitor" +DESC="Open vSwitch switch monitor" PIDFILE=/var/run/$NAME.pid diff --git a/debian/openvswitch-wdt.default b/debian/openvswitch-wdt.default index 56b7e418..35625d45 100644 --- a/debian/openvswitch-wdt.default +++ b/debian/openvswitch-wdt.default @@ -1,6 +1,6 @@ # This is a POSIX shell fragment -*- sh -*- -# To configure the OpenVSwitch reliability packages, modify the following. +# To configure the Open vSwitch reliability packages, modify the following. # Afterward, the watchdog timer and oops handling will be configured # automatically at boot time. It can be started immediately with # /etc/init.d/openvswitch-wdt start diff --git a/debian/openvswitch-wdt.init b/debian/openvswitch-wdt.init index 33cd19c0..b1c0ec5e 100755 --- a/debian/openvswitch-wdt.init +++ b/debian/openvswitch-wdt.init @@ -30,14 +30,14 @@ # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: OpenVSwitch switch watchdog +# Short-Description: Open vSwitch switch watchdog ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/ovs-wdt NAME=openvswitch-wdt -DESC="OpenVSwitch switch watchdog" +DESC="Open vSwitch switch watchdog" PIDFILE=/var/run/$NAME.pid diff --git a/debian/ovs-switch-setup b/debian/ovs-switch-setup index 39a9dc96..7a720727 100755 --- a/debian/ovs-switch-setup +++ b/debian/ovs-switch-setup @@ -32,7 +32,7 @@ kill_ovs_discover(); version('2.0'); capb('backup'); -title('OpenVSwitch Switch Setup'); +title('Open vSwitch Switch Setup'); my (%netdevs) = find_netdevs(); db_subst('netdevs', 'choices', diff --git a/debian/ovs-switch-setup.8 b/debian/ovs-switch-setup.8 index e34656d7..696ad365 100644 --- a/debian/ovs-switch-setup.8 +++ b/debian/ovs-switch-setup.8 @@ -1,14 +1,14 @@ -.TH ovs-switch-setup 8 "June 2008" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs-switch-setup 8 "June 2008" "Open vSwitch" "Open vSwitch Manual" .SH NAME -ovs\-switch\-setup \- interactive setup for OpenVSwitch switch +ovs\-switch\-setup \- interactive setup for Open vSwitch switch .SH SYNOPSIS .B ovs\-switch\-setup .SH DESCRIPTION The \fBovs\-switch\-setup\fR program is an interactive program that -assists the system administrator in configuring an OpenVSwitch switch, +assists the system administrator in configuring an Open vSwitch switch, including the underlying public key infrastructure (PKI). .SH OPTIONS @@ -16,20 +16,20 @@ ovs\-switch\-setup does not accept any command-line options. .SH FILES .IP /etc/default/openvswitch-switch -Main configuration file for OpenVSwitch switch. +Main configuration file for Open vSwitch switch. .IP /etc/openvswitch-switch/cacert.pem Default location of CA certificate for OpenFlow controllers. .IP /etc/openvswitch-switch/of0-cert.pem -Default location of certificate for the OpenVSwitch switch's private key. +Default location of certificate for the Open vSwitch switch's private key. .IP /etc/openvswitch-switch/of0-privkey.pem -Default location of the OpenVSwitch switch's private key. This file +Default location of the Open vSwitch switch's private key. This file should be readable only by \fBroot\fR. .IP /etc/openvswitch-switch/of0-req.pem -Default location of certificate request for the OpenVSwitch switch's +Default location of certificate request for the Open vSwitch switch's certificate. This file is not used after the signed certificate (typically \fB/etc/openvswitch-switch/of0-cert.pem\fR, above) has been obtained from the OpenFlow PKI server. diff --git a/secchan/main.c b/secchan/main.c index 5ed57824..148b3d7a 100644 --- a/secchan/main.c +++ b/secchan/main.c @@ -152,7 +152,7 @@ main(int argc, char *argv[]) ovs_fatal(error, "Could not listen for unixctl connections"); } - VLOG_INFO("OpenVSwitch version %s", VERSION BUILDNR); + VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR); VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION); /* Start OpenFlow processing. */ diff --git a/secchan/secchan.8.in b/secchan/secchan.8.in index c567c785..d3889dac 100644 --- a/secchan/secchan.8.in +++ b/secchan/secchan.8.in @@ -1,4 +1,4 @@ -.TH secchan 8 "March 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH secchan 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN secchan .SH NAME diff --git a/tests/test-dhcp-client.c b/tests/test-dhcp-client.c index 459fc9ab..fa19646f 100644 --- a/tests/test-dhcp-client.c +++ b/tests/test-dhcp-client.c @@ -187,7 +187,7 @@ parse_options(int argc, char *argv[]) static void usage(void) { - printf("%s: standalone program for testing OpenVSwitch DHCP client.\n" + printf("%s: standalone program for testing Open vSwitch DHCP client.\n" "usage: %s [OPTIONS] NETDEV\n" "where NETDEV is a network device (e.g. eth0).\n" "\nDHCP options:\n" diff --git a/utilities/ovs-appctl.8.in b/utilities/ovs-appctl.8.in index f4538179..1e516215 100644 --- a/utilities/ovs-appctl.8.in +++ b/utilities/ovs-appctl.8.in @@ -4,11 +4,11 @@ . ns . IP "\\$1" .. -.TH ovs\-appctl 8 "April 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-appctl 8 "April 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-appctl .SH NAME -ovs\-appctl \- utility for configuring running OpenVSwitch daemons +ovs\-appctl \- utility for configuring running Open vSwitch daemons .SH SYNOPSIS \fBovs\-appctl\fR [\fB-h\fR | \fB--help\fR] [\fItarget\fR...] [\fIaction\fR...] @@ -27,7 +27,7 @@ The available \fIaction\fR options are: .SH DESCRIPTION The \fBovs\-appctl\fR program connects to one or more running -OpenVSwitch daemons (such as \fBvswitchd\fR(8)), as specified by the +Open vSwitch daemons (such as \fBvswitchd\fR(8)), as specified by the user, and sends them commands to query or modify their behavior. Its primary purpose is currently to adjust daemons' logging levels. @@ -40,7 +40,7 @@ The specified \fIsocket\fR must be the name of a Unix domain socket for a \fBovs\-appctl\fR-controllable process. If \fIsocket\fR does not begin with \fB/\fR, it is treated as relative to \fB@RUNDIR@\fR. -Each OpenVSwitch daemon by default creates a socket named +Each Open vSwitch daemon by default creates a socket named \fB@RUNDIR@/\fIprogram\fB.\fIpid\fB.ctl\fR, where \fIprogram\fR is the program's name (such as \fBvswitchd\fR) and \fIpid\fR is the daemon's PID. diff --git a/utilities/ovs-cfg-mod.8.in b/utilities/ovs-cfg-mod.8.in index 41d12d86..ebe2c143 100644 --- a/utilities/ovs-cfg-mod.8.in +++ b/utilities/ovs-cfg-mod.8.in @@ -1,4 +1,4 @@ -.TH ovs-cfg-mod 8 "April 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs-cfg-mod 8 "April 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs-cfg-mod . .SH NAME diff --git a/utilities/ovs-controller.8.in b/utilities/ovs-controller.8.in index c28efac3..31c7a865 100644 --- a/utilities/ovs-controller.8.in +++ b/utilities/ovs-controller.8.in @@ -1,4 +1,4 @@ -.TH ovs\-controller 8 "March 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-controller 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-controller .SH NAME diff --git a/utilities/ovs-discover.8.in b/utilities/ovs-discover.8.in index 9943a3c0..d38ce9ee 100644 --- a/utilities/ovs-discover.8.in +++ b/utilities/ovs-discover.8.in @@ -1,4 +1,4 @@ -.TH ovs\-discover 8 "May 2008" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-discover 8 "May 2008" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-discover .SH NAME @@ -100,16 +100,16 @@ effect. .SH BUGS If the network devices specified on the command line have been added -to an OpenVSwitch datapath with \fBovs\-dpctl add\-if\fR, then controller +to an Open vSwitch datapath with \fBovs\-dpctl add\-if\fR, then controller discovery will fail because \fBovs\-discover\fR will not be able to see DHCP responses, even though tools such as \fBtcpdump\fR(8) and \fBwireshark\fR(1) can see them on the wire. This is because of the structure of the Linux kernel networking stack, which hands packets first to programs that listen for all arriving packets, then to -OpenVSwitch, then to programs that listen for a specific kind of packet. -OpenVSwitch consumes all the packets handed to it, so tools like +Open vSwitch, then to programs that listen for a specific kind of packet. +Open vSwitch consumes all the packets handed to it, so tools like \fBtcpdump\fR that look at all packets will see packets arriving on -OpenVSwitch interfaces, but \fRovs\-discover\fR, which listens only for +Open vSwitch interfaces, but \fRovs\-discover\fR, which listens only for arriving IP packets, will not. .SH "SEE ALSO" diff --git a/utilities/ovs-dpctl.8.in b/utilities/ovs-dpctl.8.in index fab0a4f5..8f1f6079 100644 --- a/utilities/ovs-dpctl.8.in +++ b/utilities/ovs-dpctl.8.in @@ -1,8 +1,8 @@ -.TH ovs\-dpctl 8 "March 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-dpctl 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-dpctl .SH NAME -ovs\-dpctl \- administer OpenVSwitch datapaths +ovs\-dpctl \- administer Open vSwitch datapaths .SH SYNOPSIS .B ovs\-dpctl @@ -10,7 +10,7 @@ ovs\-dpctl \- administer OpenVSwitch datapaths .SH DESCRIPTION -The \fBovs\-dpctl\fR program can create, modify, and delete OpenVSwitch +The \fBovs\-dpctl\fR program can create, modify, and delete Open vSwitch datapaths. A single machine may host up to 256 datapaths (numbered 0 to 255). @@ -100,15 +100,15 @@ about all configured datapaths. Prints to the console all flow entries in datapath \fIdp\fR's flow table. -This command is primarily useful for debugging OpenVSwitch. The flow +This command is primarily useful for debugging Open vSwitch. The flow table entries that it displays are not OpenFlow flow entries. Instead, they are different and considerably -simpler flows maintained by the OpenVSwitch kernel module. +simpler flows maintained by the Open vSwitch kernel module. .IP "\fBdel-flows \fIdp\fR" Deletes all flow entries from datapath \fIdp\fR's flow table. -This command is primarily useful for debugging OpenVSwitch. As +This command is primarily useful for debugging Open vSwitch. As discussed in \fBdump-flows\fR, these entries are not OpenFlow flow entries. By deleting them, the process that set them up may be confused about their disappearance. @@ -120,7 +120,7 @@ that \fBsecchan\fR or \fBvswitch\fR is controlling: group 0 contains all ports except those disabled by STP, and group 1 contains all ports. Additional groups might be used in the future. -This command is primarily useful for debugging OpenVSwitch. OpenFlow +This command is primarily useful for debugging Open vSwitch. OpenFlow does not have a concept of port groups. .SH OPTIONS @@ -136,7 +136,7 @@ signal. .SH EXAMPLES A typical \fBovs\-dpctl\fR command sequence for controlling an -OpenVSwitch kernel module: +Open vSwitch kernel module: .TP \fBovs\-dpctl add\-dp dp0\fR diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index 1406763f..298e9ee3 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -168,7 +168,7 @@ parse_options(int argc, char *argv[]) static void usage(void) { - printf("%s: OpenVSwitch datapath management utility\n" + printf("%s: Open vSwitch datapath management utility\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" " add-dp DP [IFACE...] add new datapath DP (with IFACEs)\n" " del-dp DP delete local datapath DP\n" diff --git a/utilities/ovs-kill.8.in b/utilities/ovs-kill.8.in index 447c676c..af4ec987 100644 --- a/utilities/ovs-kill.8.in +++ b/utilities/ovs-kill.8.in @@ -1,4 +1,4 @@ -.TH ovs\-kill 8 "May 2008" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-kill 8 "May 2008" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-kill .SH NAME diff --git a/utilities/ovs-kill.c b/utilities/ovs-kill.c index 935a0bc1..44d37e38 100644 --- a/utilities/ovs-kill.c +++ b/utilities/ovs-kill.c @@ -200,7 +200,7 @@ usage(void) { printf("%s: kills a program using a pidfile\n" "usage: %s [OPTIONS] PIDFILE [PIDFILE...]\n" - "where PIDFILE is a pidfile created by an OpenVSwitch daemon.\n" + "where PIDFILE is a pidfile created by an Open vSwitch daemon.\n" "\nOptions:\n" " -s, --signal=NUMBER|NAME signal to send (default: TERM)\n" " -f, --force ignore errors\n" diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 1243f04b..8dc50a37 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1,4 +1,4 @@ -.TH ovs\-ofctl 8 "March 2009" "OpenVSwitch" "OpenVSwitch Manual" +.TH ovs\-ofctl 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" .ds PN ovs\-ofctl .SH NAME diff --git a/utilities/ovs-parse-leaks.in b/utilities/ovs-parse-leaks.in index 31f7eaa8..4e06847c 100755 --- a/utilities/ovs-parse-leaks.in +++ b/utilities/ovs-parse-leaks.in @@ -7,7 +7,7 @@ if (grep($_ eq '--help', @ARGV)) { print <