Too many users have incorrectly assumed that ovs-controller is a necessary
or desirable part of an Open vSwitch deployment. This commit should fix
the problem by renaming it test-controller and removing it from the
default install and from packaging.
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
FAQ | 7 +-
INSTALL.SSL | 2 +-
INSTALL.XenServer | 2 +-
NEWS | 4 +
README | 2 -
debian/automake.mk | 8 -
debian/changelog | 5 +-
debian/openvswitch-controller.README.Debian | 7 -
debian/openvswitch-controller.default | 29 --
debian/openvswitch-controller.dirs | 1 -
debian/openvswitch-controller.init | 278 --------------------
debian/openvswitch-controller.install | 1 -
debian/openvswitch-controller.manpages | 1 -
debian/openvswitch-controller.postinst | 60 -----
debian/openvswitch-controller.postrm | 44 ----
manpages.mk | 255 ------------------
rhel/openvswitch-fedora.spec.in | 2 -
rhel/openvswitch.spec.in | 2 -
tests/.gitignore | 2 +
tests/automake.mk | 7 +
.../test-controller.8.in | 45 ++--
.../ovs-controller.c => tests/test-controller.c | 0
utilities/.gitignore | 2 -
utilities/automake.mk | 7 -
xenserver/openvswitch-xen.spec.in | 2 -
25 files changed, 51 insertions(+), 724 deletions(-)
delete mode 100644 debian/openvswitch-controller.README.Debian
delete mode 100644 debian/openvswitch-controller.default
delete mode 100644 debian/openvswitch-controller.dirs
delete mode 100755 debian/openvswitch-controller.init
delete mode 100644 debian/openvswitch-controller.install
delete mode 100644 debian/openvswitch-controller.manpages
delete mode 100755 debian/openvswitch-controller.postinst
delete mode 100755 debian/openvswitch-controller.postrm
rename utilities/ovs-controller.8.in => tests/test-controller.8.in (77%)
rename utilities/ovs-controller.c => tests/test-controller.c (100%)
diff --git a/FAQ b/FAQ
index d36495c..f7bf78a 100644
--- a/FAQ
+++ b/FAQ
@@ -89,10 +89,9 @@ 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-controller, 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) that developers can script and
+ extend to provide distributed vswitch capabilities that are closely
+ integrated with their virtualization management platform.
Q: Why doesn't Open vSwitch support distribution?
diff --git a/INSTALL.SSL b/INSTALL.SSL
index 8eb0c49..061af97 100644
--- a/INSTALL.SSL
+++ b/INSTALL.SSL
@@ -115,7 +115,7 @@ that contains the PKI structure:
% ovs-pki req+sign ctl controller
ctl-privkey.pem and ctl-cert.pem would need to be copied to the
-controller for its use at runtime. If you were to use ovs-controller,
+controller for its use at runtime. If you were to use test-controller,
the simple OpenFlow controller included with Open vSwitch, then the
--private-key and --certificate options, respectively, would point to
these files.
diff --git a/INSTALL.XenServer b/INSTALL.XenServer
index e31788a..d6f5816 100644
--- a/INSTALL.XenServer
+++ b/INSTALL.XenServer
@@ -167,7 +167,7 @@ controller on XenServer and, as a consequence of the step
above that
deletes all of the bridges at boot time, controller configuration only
persists until XenServer reboot. The configuration database manager
can, however, configure controllers for bridges. See the BUGS section
-of ovs-controller(8) for more information on this topic.
+of test-controller(8) for more information on this topic.
* The Open vSwitch startup script automatically adds a firewall rule
to allow GRE traffic. This rule is needed for the XenServer feature
diff --git a/NEWS b/NEWS
index 94e0da9..a911160 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ Post-v2.0.0
IANA-assigned numbers in a future release. Consider updating
your installations to specify port numbers instead of using the
defaults.
+ - ovs-controller has been renamed test-controller. It is no longer
+ packaged or installed by default, because too many users assumed
+ incorrectly that ovs-controller was a necessary or desirable part
+ of an Open vSwitch deployment.
v2.0.0 - xx xxx xxxx
diff --git a/README b/README
index db1e3ef..63f2933 100644
--- a/README
+++ b/README
@@ -69,8 +69,6 @@ The main components of this distribution are:
Open vSwitch also provides some tools:
- * ovs-controller, a simple OpenFlow controller.
-
* ovs-ofctl, a utility for querying and controlling OpenFlow
switches and controllers.
diff --git a/debian/automake.mk b/debian/automake.mk
index 35c5a9e..2d9cc4f 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -11,14 +11,6 @@ EXTRA_DIST += \
debian/openvswitch-common.docs \
debian/openvswitch-common.install \
debian/openvswitch-common.manpages \
- debian/openvswitch-controller.README.Debian \
- debian/openvswitch-controller.default \
- debian/openvswitch-controller.dirs \
- debian/openvswitch-controller.init \
- debian/openvswitch-controller.install \
- debian/openvswitch-controller.manpages \
- debian/openvswitch-controller.postinst \
- debian/openvswitch-controller.postrm \
debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in \
debian/openvswitch-datapath-dkms.postinst \
debian/openvswitch-datapath-dkms.prerm \
diff --git a/debian/changelog b/debian/changelog
index cb55e8e..ee7dad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
openvswitch (2.0.90-1) unstable; urgency=low
[ Open vSwitch team ]
+ * The openvswitch-controller package has been removed, because too many
+ users assumed incorrectly that ovs-controller was a necessary or
+ desirable part of an Open vSwitch deployment.
* New upstream version
- - Nothing yet! Try NEWS...
+ - Try NEWS for more details...
-- Open vSwitch team <dev@openvswitch.org> Wed, 28 Aug 2013 16:17:38 -0700
diff --git a/debian/openvswitch-controller.README.Debian
b/debian/openvswitch-controller.README.Debian
deleted file mode 100644
index 0c5fcba..0000000
--- a/debian/openvswitch-controller.README.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-README.Debian for openvswitch-controller
--------------------------------------
-
-* To (re)configure the controller, edit /etc/default/openvswitch-controller
- and run "/etc/init.d/openvswitch-controller restart".
-
- -- Ben Pfaff <b...@nicira.com>, Fri, 4 Mar 2011 14:28:53 -0800
diff --git a/debian/openvswitch-controller.default
b/debian/openvswitch-controller.default
deleted file mode 100644
index a274f7e..0000000
--- a/debian/openvswitch-controller.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a POSIX shell fragment -*- sh -*-
-
-# LISTEN: What OpenFlow connection methods should the controller listen on?
-#
-# This is a space-delimited list of connection methods:
-#
-# * "pssl:[PORT]": Listen for SSL connections on the specified PORT
-# (default: 6633). The private key, certificate, and CA certificate
-# must be specified below.
-#
-# * "ptcp:[PORT]": Listen for TCP connections on the specified PORT
-# (default: 6633). Not recommended for security reasons.
-#
-LISTEN="pssl:"
-
-# PRIVKEY: Name of file containing controller's private key.
-# Required if SSL enabled.
-PRIVKEY=/etc/openvswitch-controller/privkey.pem
-
-# CERT: Name of file containing certificate for private key.
-# Required if SSL enabled.
-CERT=/etc/openvswitch-controller/cert.pem
-
-# CACERT: Name of file containing switch CA certificate.
-# Required if SSL enabled.
-CACERT=/etc/openvswitch-controller/cacert.pem
-
-# Additional options to pass to controller, e.g. "--hub"
-DAEMON_OPTS=""
diff --git a/debian/openvswitch-controller.dirs
b/debian/openvswitch-controller.dirs
deleted file mode 100644
index 4ada77c..0000000
--- a/debian/openvswitch-controller.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/openvswitch-controller
diff --git a/debian/openvswitch-controller.init
b/debian/openvswitch-controller.init
deleted file mode 100755
index 44d2c87..0000000
--- a/debian/openvswitch-controller.init
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2011 Nicira, Inc.
-# Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <j...@debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL; if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides: openvswitch-controller
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $remote_fs
-# Should-Start: $named
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Open vSwitch controller
-# Description: The Open vSwitch controller enables OpenFlow switches
that connect to it
-# to act as MAC-learning Ethernet switches.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/bin/ovs-controller # Introduce the server's location here
-NAME=ovs-controller # Introduce the short server's name here
-DESC=ovs-controller # Introduce a short description here
-LOGDIR=/var/log/openvswitch # Log directory to use
-
-PIDFILE=/var/run/openvswitch/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/openvswitch-controller
-DAEMON_OPTS="" # Additional options given to the server
-
-DODTIME=10 # Time to wait for the server to die, in seconds
- # If this value is set too low you might not
- # let some servers to die gracefully and
- # 'restart' will not work
-
-LOGFILE=$LOGDIR/$NAME.log # Server logfile
-#DAEMONUSER= # User to run the daemons as. If this value
- # is set start-stop-daemon will chuid the server
-
-# Include defaults if available
-default=/etc/default/openvswitch-controller
-if [ -f $default ] ; then
- . $default
-fi
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
- if getent passwd | grep -q "^$DAEMONUSER:"; then
- # Obtain the uid and gid
- DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
- DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
- else
- log_failure_msg "The user $DAEMONUSER, required to run $NAME does not
exist."
- exit 1
- fi
-fi
-
-
-set -e
-
-running_pid() {
-# Check if a given process pid's cmdline matches a given name
- pid=$1
- name=$2
- [ -z "$pid" ] && return 1
- [ ! -d /proc/$pid ] && return 1
- cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
- # Is this the expected server
- [ "$cmd" != "$name" ] && return 1
- return 0
-}
-
-running() {
-# Check if the process is running looking at /proc
-# (works for all users)
-
- # No pidfile, probably no daemon present
- [ ! -f "$PIDFILE" ] && return 1
- pid=`cat $PIDFILE`
- running_pid $pid $DAEMON || return 1
- return 0
-}
-
-start_server() {
- if [ -z "$LISTEN" ]; then
- echo "$default: No connection methods configured, controller disabled"
>&2
- exit 0
- fi
-
- if [ ! -d /var/run/openvswitch ]; then
- install -d -m 755 -o root -g root /var/run/openvswitch
- fi
-
- SSL_OPTS=
- case $LISTEN in
- *ssl*)
- : ${PRIVKEY:=/etc/openvswitch-controller/privkey.pem}
- : ${CERT:=/etc/openvswitch-controller/cert.pem}
- : ${CACERT:=/etc/openvswitch-controller/cacert.pem}
- if test ! -e "$PRIVKEY" || test ! -e "$CERT" ||
- test ! -e "$CACERT"; then
- if test ! -e "$PRIVKEY"; then
- echo "$PRIVKEY: private key missing" >&2
- fi
- if test ! -e "$CERT"; then
- echo "$CERT: certificate for private key missing" >&2
- fi
- if test ! -e "$CACERT"; then
- echo "$CACERT: CA certificate missing" >&2
- fi
- exit 1
- fi
- SSL_OPTS="--private-key=$PRIVKEY --certificate=$CERT
--ca-cert=$CACERT"
- ;;
- esac
-
-# Start the process using the wrapper
- if [ -z "$DAEMONUSER" ] ; then
- start-stop-daemon --start --pidfile $PIDFILE \
- --exec $DAEMON -- --detach --pidfile=$PIDFILE \
- $LISTEN $DAEMON_OPTS $SSL_OPTS
- errcode=$?
- else
-# if we are using a daemonuser then change the user id
- start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --chuid $DAEMONUSER --exec $DAEMON -- \
- --detach --pidfile=$PIDFILE $LISTEN $DAEMON_OPTS \
- $SSL_OPTS
- errcode=$?
- fi
- return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
- if [ -z "$DAEMONUSER" ] ; then
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
- errcode=$?
- else
-# if we are using a daemonuser then look for process that match
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --user $DAEMONUSER --exec $DAEMON
- errcode=$?
- fi
-
- return $errcode
-}
-
-reload_server() {
- [ ! -f "$PIDFILE" ] && return 1
- pid=`cat $PIDFILE` # This is the daemon's pid
- # Send a SIGHUP
- kill -1 $pid
- return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
- [ ! -e "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- sleep "$DODTIME"
- if running ; then
- kill -9 $pid
- sleep "$DODTIME"
- if running ; then
- echo "Cannot kill $NAME (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
-}
-
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC " "$NAME"
- # Check if it's running first
- if running ; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if start_server && running ; then
- # It's ok, the server started and is running
- log_end_msg 0
- else
- # Either we could not start it or it is not running
- # after we did
- # NOTE: Some servers might die some time after they start,
- # this code does not try to detect this and might give
- # a false positive (use 'status' for that)
- log_end_msg 1
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- if running ; then
- # Only stop the server if we see it running
- stop_server
- log_end_msg $?
- else
- # If it's not running don't do anything
- log_progress_msg "apparently not running"
- log_end_msg 0
- exit 0
- fi
- ;;
- force-stop)
- # First try to stop gracefully the program
- $0 stop
- if running; then
- # If it's still running try to kill it more forcefully
- log_daemon_msg "Stopping (force) $DESC" "$NAME"
- force_stop
- log_end_msg $?
- fi
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- if running; then
- stop_server
- # Wait some sensible amount, some server need this.
- [ -n "$DODTIME" ] && sleep $DODTIME
- fi
- start_server
- running
- log_end_msg $?
- ;;
- status)
-
- log_daemon_msg "Checking status of $DESC" "$NAME"
- if running ; then
- log_progress_msg "running"
- log_end_msg 0
- else
- log_progress_msg "apparently not running"
- log_end_msg 1
- exit 1
- fi
- ;;
- # Use this if the daemon cannot reload
- reload)
- log_warning_msg "Reloading $NAME daemon: not implemented, as the
daemon"
- log_warning_msg "cannot re-read the config file (use restart)."
- ;;
- *)
- N=/etc/init.d/openvswitch-controller
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}"
>&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/openvswitch-controller.install
b/debian/openvswitch-controller.install
deleted file mode 100644
index a22ec45..0000000
--- a/debian/openvswitch-controller.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ovs-controller
diff --git a/debian/openvswitch-controller.manpages
b/debian/openvswitch-controller.manpages
deleted file mode 100644
index 6a9911e..0000000
--- a/debian/openvswitch-controller.manpages
+++ /dev/null
@@ -1 +0,0 @@
-_debian/utilities/ovs-controller.8
diff --git a/debian/openvswitch-controller.postinst
b/debian/openvswitch-controller.postinst
deleted file mode 100755
index 3073dc0..0000000
--- a/debian/openvswitch-controller.postinst
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# postinst script for openvswitch-controller
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- configure)
- cd /etc/openvswitch-controller
-
- # If cacert.pem is a symlink to the old location for cacert.pem,
- # remove it so that we can symlink it to the new location.
- if test -h cacert.pem && \
- test X"`readlink cacert.pem`" =
X/usr/share/openvswitch/pki/switchca/cacert.pem; then
- rm -f cacert.pem
- fi
-
- if ! test -e cacert.pem; then
- ln -s /var/lib/openvswitch/pki/switchca/cacert.pem cacert.pem
- fi
- if ! test -e privkey.pem || ! test -e cert.pem; then
- oldumask=$(umask)
- umask 077
- ovs-pki req+sign tmp controller >/dev/null
- mv tmp-privkey.pem privkey.pem
- mv tmp-cert.pem cert.pem
- mv tmp-req.pem req.pem
- chmod go+r cert.pem req.pem
- umask $oldumask
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/openvswitch-controller.postrm
b/debian/openvswitch-controller.postrm
deleted file mode 100755
index 42cb523..0000000
--- a/debian/openvswitch-controller.postrm
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# postrm script for openvswitch-controller
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge)
- if cd /etc/openvswitch-controller; then
- rm -f cacert.pem cert.pem privkey.pem req.pem
- rm -f tmp-privkey.pem tmp-cert.pem tmp-req.pem
- fi
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/manpages.mk b/manpages.mk
index 2a34f04..e69de29 100644
--- a/manpages.mk
+++ b/manpages.mk
@@ -1,255 +0,0 @@
-# Generated automatically -- do not modify! -*- buffer-read-only: t -*-
-
-ovsdb/ovsdb-client.1: \
- ovsdb/ovsdb-client.1.in \
- lib/common-syn.man \
- lib/common.man \
- lib/daemon-syn.man \
- lib/daemon.man \
- lib/ssl-bootstrap-syn.man \
- lib/ssl-bootstrap.man \
- lib/ssl-syn.man \
- lib/ssl.man \
- lib/table.man \
- lib/vlog-syn.man \
- lib/vlog.man \
- ovsdb/remote-active.man \
- ovsdb/remote-passive.man
-ovsdb/ovsdb-client.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/daemon-syn.man:
-lib/daemon.man:
-lib/ssl-bootstrap-syn.man:
-lib/ssl-bootstrap.man:
-lib/ssl-syn.man:
-lib/ssl.man:
-lib/table.man:
-lib/vlog-syn.man:
-lib/vlog.man:
-ovsdb/remote-active.man:
-ovsdb/remote-passive.man:
-
-ovsdb/ovsdb-server.1: \
- ovsdb/ovsdb-server.1.in \
- lib/common-syn.man \
- lib/common.man \
- lib/coverage-unixctl.man \
- lib/daemon-syn.man \
- lib/daemon.man \
- lib/memory-unixctl.man \
- lib/ssl-bootstrap-syn.man \
- lib/ssl-bootstrap.man \
- lib/ssl-syn.man \
- lib/ssl.man \
- lib/unixctl-syn.man \
- lib/unixctl.man \
- lib/vlog-syn.man \
- lib/vlog-unixctl.man \
- lib/vlog.man \
- ovsdb/remote-active.man \
- ovsdb/remote-passive.man
-ovsdb/ovsdb-server.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/coverage-unixctl.man:
-lib/daemon-syn.man:
-lib/daemon.man:
-lib/memory-unixctl.man:
-lib/ssl-bootstrap-syn.man:
-lib/ssl-bootstrap.man:
-lib/ssl-syn.man:
-lib/ssl.man:
-lib/unixctl-syn.man:
-lib/unixctl.man:
-lib/vlog-syn.man:
-lib/vlog-unixctl.man:
-lib/vlog.man:
-ovsdb/remote-active.man:
-ovsdb/remote-passive.man:
-
-ovsdb/ovsdb-tool.1: \
- ovsdb/ovsdb-tool.1.in \
- lib/common-syn.man \
- lib/common.man \
- lib/vlog-syn.man \
- lib/vlog.man
-ovsdb/ovsdb-tool.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/vlog-syn.man:
-lib/vlog.man:
-
-utilities/bugtool/ovs-bugtool.8: \
- utilities/bugtool/ovs-bugtool.8.in
-utilities/bugtool/ovs-bugtool.8.in:
-
-utilities/ovs-appctl.8: \
- utilities/ovs-appctl.8.in \
- lib/common.man
-utilities/ovs-appctl.8.in:
-lib/common.man:
-
-utilities/ovs-benchmark.1: \
- utilities/ovs-benchmark.1.in \
- lib/ovs.tmac
-utilities/ovs-benchmark.1.in:
-lib/ovs.tmac:
-
-utilities/ovs-controller.8: \
- utilities/ovs-controller.8.in \
- lib/common.man \
- lib/daemon.man \
- lib/ssl-peer-ca-cert.man \
- lib/ssl.man \
- lib/unixctl.man \
- lib/vconn-active.man \
- lib/vconn-passive.man \
- lib/vlog.man
-utilities/ovs-controller.8.in:
-lib/common.man:
-lib/daemon.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/unixctl.man:
-lib/vconn-active.man:
-lib/vconn-passive.man:
-lib/vlog.man:
-
-utilities/ovs-dpctl-top.8: \
- utilities/ovs-dpctl-top.8.in
-utilities/ovs-dpctl-top.8.in:
-
-utilities/ovs-dpctl.8: \
- utilities/ovs-dpctl.8.in \
- lib/common.man \
- lib/vlog.man
-utilities/ovs-dpctl.8.in:
-lib/common.man:
-lib/vlog.man:
-
-utilities/ovs-l3ping.8: \
- utilities/ovs-l3ping.8.in \
- lib/common-syn.man \
- lib/common.man
-utilities/ovs-l3ping.8.in:
-lib/common-syn.man:
-lib/common.man:
-
-utilities/ovs-ofctl.8: \
- utilities/ovs-ofctl.8.in \
- lib/common.man \
- lib/daemon.man \
- lib/ofp-version.man \
- lib/ssl.man \
- lib/vconn-active.man \
- lib/vlog.man
-utilities/ovs-ofctl.8.in:
-lib/common.man:
-lib/daemon.man:
-lib/ofp-version.man:
-lib/ssl.man:
-lib/vconn-active.man:
-lib/vlog.man:
-
-utilities/ovs-pcap.1: \
- utilities/ovs-pcap.1.in \
- lib/common-syn.man \
- lib/common.man
-utilities/ovs-pcap.1.in:
-lib/common-syn.man:
-lib/common.man:
-
-utilities/ovs-pki.8: \
- utilities/ovs-pki.8.in
-utilities/ovs-pki.8.in:
-
-utilities/ovs-tcpundump.1: \
- utilities/ovs-tcpundump.1.in \
- lib/common-syn.man \
- lib/common.man
-utilities/ovs-tcpundump.1.in:
-lib/common-syn.man:
-lib/common.man:
-
-utilities/ovs-test.8: \
- utilities/ovs-test.8.in \
- lib/common-syn.man \
- lib/common.man \
- utilities/ovs-vlan-bugs.man
-utilities/ovs-test.8.in:
-lib/common-syn.man:
-lib/common.man:
-utilities/ovs-vlan-bugs.man:
-
-utilities/ovs-vlan-bug-workaround.8: \
- utilities/ovs-vlan-bug-workaround.8.in \
- lib/common.man \
- utilities/ovs-vlan-bugs.man
-utilities/ovs-vlan-bug-workaround.8.in:
-lib/common.man:
-utilities/ovs-vlan-bugs.man:
-
-utilities/ovs-vlan-test.8: \
- utilities/ovs-vlan-test.8.in \
- lib/common-syn.man \
- lib/common.man \
- utilities/ovs-vlan-bugs.man
-utilities/ovs-vlan-test.8.in:
-lib/common-syn.man:
-lib/common.man:
-utilities/ovs-vlan-bugs.man:
-
-utilities/ovs-vsctl.8: \
- utilities/ovs-vsctl.8.in \
- lib/ssl-bootstrap.man \
- lib/ssl-peer-ca-cert.man \
- lib/ssl.man \
- lib/table.man \
- lib/vconn-active.man \
- lib/vconn-passive.man \
- lib/vlog.man \
- ovsdb/remote-active.man \
- ovsdb/remote-active.man \
- ovsdb/remote-passive.man \
- ovsdb/remote-passive.man
-utilities/ovs-vsctl.8.in:
-lib/ssl-bootstrap.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/table.man:
-lib/vconn-active.man:
-lib/vconn-passive.man:
-lib/vlog.man:
-ovsdb/remote-active.man:
-ovsdb/remote-active.man:
-ovsdb/remote-passive.man:
-ovsdb/remote-passive.man:
-
-vswitchd/ovs-vswitchd.8: \
- vswitchd/ovs-vswitchd.8.in \
- lib/common.man \
- lib/coverage-unixctl.man \
- lib/daemon.man \
- lib/memory-unixctl.man \
- lib/ssl-bootstrap.man \
- lib/ssl.man \
- lib/vlog-unixctl.man \
- lib/vlog.man \
- ofproto/ofproto-dpif-unixctl.man \
- ofproto/ofproto-unixctl.man \
- ovsdb/remote-active.man \
- ovsdb/remote-passive.man
-vswitchd/ovs-vswitchd.8.in:
-lib/common.man:
-lib/coverage-unixctl.man:
-lib/daemon.man:
-lib/memory-unixctl.man:
-lib/ssl-bootstrap.man:
-lib/ssl.man:
-lib/vlog-unixctl.man:
-lib/vlog.man:
-ofproto/ofproto-dpif-unixctl.man:
-ofproto/ofproto-unixctl.man:
-ovsdb/remote-active.man:
-ovsdb/remote-passive.man:
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 27a3b03..4647d55 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -154,11 +154,9 @@ systemctl start openvswitch.service
/usr/bin/ovs-vsctl
/usr/bin/ovsdb-client
/usr/bin/ovsdb-tool
-/usr/bin/ovs-controller
/usr/bin/ovs-pki
/usr/bin/ovs-test
/usr/bin/ovs-l3ping
-%doc /usr/share/man/man8/ovs-controller.8.gz
%doc /usr/share/man/man8/ovs-pki.8.gz
%doc /usr/share/man/man1/ovsdb-client.1.gz
%doc /usr/share/man/man1/ovsdb-server.1.gz
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index f77cd3a..47989b0 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -56,8 +56,6 @@ install python/compat/argparse.py
$RPM_BUILD_ROOT/usr/share/openvswitch/python
# Get rid of stuff we don't want to make RPM happy.
rm \
- $RPM_BUILD_ROOT/usr/bin/ovs-controller \
- $RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
$RPM_BUILD_ROOT/usr/bin/ovs-test \
$RPM_BUILD_ROOT/usr/bin/ovs-l3ping \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \
diff --git a/tests/.gitignore b/tests/.gitignore
index 2b1049a..34187c4 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -13,6 +13,8 @@
/test-bundle
/test-byte-order
/test-classifier
+/test-controller.8
+/test-controller
/test-csum
/test-file_name
/test-flows
diff --git a/tests/automake.mk b/tests/automake.mk
index 8f51a65..e349ee9 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -189,6 +189,13 @@ noinst_PROGRAMS += tests/test-classifier
tests_test_classifier_SOURCES = tests/test-classifier.c
tests_test_classifier_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+noinst_PROGRAMS += tests/test-controller
+MAN_ROOTS += tests/test-controller.8.in
+DISTCLEANFILES += utilities/test-controller.8
+noinst_man_MANS += tests/test-controller.8
+tests_test_controller_SOURCES = tests/test-controller.c
+tests_test_controller_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
+
noinst_PROGRAMS += tests/test-csum
tests_test_csum_SOURCES = tests/test-csum.c
tests_test_csum_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
diff --git a/utilities/ovs-controller.8.in b/tests/test-controller.8.in
similarity index 77%
rename from utilities/ovs-controller.8.in
rename to tests/test-controller.8.in
index f29de6a..62bfa0f 100644
--- a/utilities/ovs-controller.8.in
+++ b/tests/test-controller.8.in
@@ -1,25 +1,38 @@
-.\" -*- nroff -*-
+ .\" -*- nroff -*-
.de IQ
. br
. ns
. IP "\\$1"
..
-.TH ovs\-controller 8 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
-.ds PN ovs\-controller
+.TH test\-controller 8 "@VERSION@" "Open vSwitch" "Open vSwitch Manual"
+.ds PN test\-controller
.
.SH NAME
-ovs\-controller \- simple OpenFlow controller reference implementation
+test\-controller \- simple OpenFlow controller for testing
.
.SH SYNOPSIS
-.B ovs\-controller
+.B test\-controller
[\fIoptions\fR] \fImethod\fR \fB[\fImethod\fR]\&...
.
.SH DESCRIPTION
-\fBovs\-controller\fR manages any number of remote switches over OpenFlow
-protocol, causing them to function as L2 MAC-learning switches or hub.
.PP
-\fBovs\-controller\fR controls one or more OpenFlow switches, specified as
-one or more of the following OpenFlow connection methods:
+\fBtest\-controller\fR is a simple OpenFlow controller. It is very
+easy to set up, so it may be suitable for initial testing of
+connectivity between an OpenFlow switch and a controller. It may also
+be useful for developer testing and debugging of some Open vSwitch
+features.
+.PP
+\fBtest\-controller\fR is not a general-purpose OpenFlow controller.
+It does not make sense to deploy it routinely or in production.
+\fBtest\-controller\fR does not provide any features that are not
+built into Open vSwitch, and lacks many that are built in to Open
+vSwitch, so adding it to an Open vSwitch deployment actually reduces
+functionality and performance while increasing latency.
+.PP
+\fBtest\-controller\fR manages any number of remote switches over
+OpenFlow protocol, causing them to function as L2 MAC-learning
+switches or hub. The switches it controls are specified as one or
+more of the following OpenFlow connection methods:
.
.RS
.so lib/vconn-passive.man
@@ -29,7 +42,7 @@ one or more of the following OpenFlow connection methods:
.SH OPTIONS
.IP "\fB\-n\fR"
.IQ "\fB\-\-noflow\fR"
-By default, \fBovs\-controller\fR sets up a flow in each OpenFlow switch
+By default, \fBtest\-controller\fR sets up a flow in each OpenFlow switch
whenever it receives a packet whose destination is known due through
MAC learning. This option disables flow setup, so that every packet
in the network passes through the controller.
@@ -62,7 +75,7 @@ performance, so it should not be used in production.
.
.IP "\fB\-w\fR[\fIwildcard_mask\fR]"
.IQ "\fB\-\-wildcards\fR[\fB=\fIwildcard_mask\fR]\fR"
-By default, \fBovs\-controller\fR sets up exact-match flows. This
+By default, \fBtest\-controller\fR sets up exact-match flows. This
option allows it to set up wildcarded flows, which may reduce
flow setup latency by causing less traffic to be sent up to the
controller.
@@ -79,7 +92,7 @@ This option has no effect when \fB\-n\fR (or
\fB\-\-noflow\fR) is in use
.
.IP "\fB\-N\fR"
.IQ "\fB\-\-normal\fR"
-By default, \fBovs\-controller\fR directs packets to a particular port
+By default, \fBtest\-controller\fR directs packets to a particular port
or floods them. This option causes it to direct non-flooded packets
to the OpenFlow \fBOFPP_NORMAL\fR port. This allows the switch itself
to make decisions about packet destinations. Support for
@@ -87,7 +100,7 @@ to make decisions about packet destinations. Support for
with some non-Open vSwitch switches.
.
.IP "\fB\-\-mute\fR"
-Prevents ovs\-controller from replying to any OpenFlow messages sent
+Prevents test\-controller from replying to any OpenFlow messages sent
to it by switches.
.IP
This option is only for debugging the Open vSwitch implementation of
@@ -95,7 +108,7 @@ This option is only for debugging the Open vSwitch
implementation of
.
.IP "\fB\-q \fIid\fR"
.IQ "\fB\-\-queue=\fIid\fR"
-By default, \fBovs\-controller\fR uses the default OpenFlow queue for
+By default, \fBtest\-controller\fR uses the default OpenFlow queue for
sending packets and setting up flows. Use one of these options,
supplying \fIid\fR as an OpenFlow queue ID as a decimal number, to
instead use that specific queue.
@@ -147,7 +160,7 @@ Use this option more than once to add flows from multiple
files.
To bind locally to port 6633 (the default) and wait for incoming
connections from OpenFlow switches:
.IP
-\fB% ovs\-controller ptcp:\fR
+\fB% test\-controller ptcp:\fR
.PP
In the future, the default port number will change to 6653, which is the
IANA-defined value.
@@ -157,7 +170,7 @@ Configuring a Citrix XenServer to connect to a particular
controller
only points the remote OVSDB management connection to that controller.
It does not also configure OpenFlow connections, because the manager
is expected to do that over the management protocol.
-\fBovs\-controller\fR is not an Open vSwitch manager and does not know
+\fBtest\-controller\fR is not an Open vSwitch manager and does not know
how to do that.
.PP
As a stopgap workaround, \fBovs\-vsctl\fR can wait for an OVSDB
diff --git a/utilities/ovs-controller.c b/tests/test-controller.c
similarity index 100%
rename from utilities/ovs-controller.c
rename to tests/test-controller.c
diff --git a/utilities/.gitignore b/utilities/.gitignore
index 4972685..d2baa66 100644
--- a/utilities/.gitignore
+++ b/utilities/.gitignore
@@ -8,8 +8,6 @@
/ovs-cfg-mod
/ovs-cfg-mod.8
/ovs-check-dead-ifs
-/ovs-controller
-/ovs-controller.8
/ovs-ctl
/ovs-dpctl
/ovs-dpctl.8
diff --git a/utilities/automake.mk b/utilities/automake.mk
index ff50a34..d26f961 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -1,6 +1,5 @@
bin_PROGRAMS += \
utilities/ovs-appctl \
- utilities/ovs-controller \
utilities/ovs-dpctl \
utilities/ovs-ofctl \
utilities/ovs-vsctl
@@ -38,7 +37,6 @@ EXTRA_DIST += \
MAN_ROOTS += \
utilities/ovs-appctl.8.in \
utilities/ovs-benchmark.1.in \
- utilities/ovs-controller.8.in \
utilities/ovs-ctl.8 \
utilities/ovs-dpctl.8.in \
utilities/ovs-dpctl-top.8.in \
@@ -58,7 +56,6 @@ DISTCLEANFILES += \
utilities/ovs-ctl \
utilities/ovs-benchmark.1 \
utilities/ovs-check-dead-ifs \
- utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-dpctl-top \
utilities/ovs-dpctl-top.8 \
@@ -83,7 +80,6 @@ DISTCLEANFILES += \
man_MANS += \
utilities/ovs-appctl.8 \
utilities/ovs-benchmark.1 \
- utilities/ovs-controller.8 \
utilities/ovs-dpctl.8 \
utilities/ovs-dpctl-top.8 \
utilities/ovs-l3ping.8 \
@@ -101,9 +97,6 @@ dist_man_MANS += utilities/ovs-ctl.8
utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
utilities_ovs_appctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-utilities_ovs_controller_SOURCES = utilities/ovs-controller.c
-utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-
utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c
utilities_ovs_dpctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
diff --git a/xenserver/openvswitch-xen.spec.in
b/xenserver/openvswitch-xen.spec.in
index 87efd88..937645d 100644
--- a/xenserver/openvswitch-xen.spec.in
+++ b/xenserver/openvswitch-xen.spec.in
@@ -123,12 +123,10 @@ cp -rf
$RPM_BUILD_ROOT/usr/share/openvswitch/bugtool-plugins/* $RPM_BUILD_ROOT/e
# Get rid of stuff we don't want to make RPM happy.
rm \
$RPM_BUILD_ROOT/usr/bin/ovs-benchmark \
- $RPM_BUILD_ROOT/usr/bin/ovs-controller \
$RPM_BUILD_ROOT/usr/bin/ovs-l3ping \
$RPM_BUILD_ROOT/usr/bin/ovs-pki \
$RPM_BUILD_ROOT/usr/bin/ovs-test \
$RPM_BUILD_ROOT/usr/share/man/man1/ovs-benchmark.1 \
- $RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
