ovs-openflowd: Rename test-openflowd and move to "tests" directory.

Too many users thought that they needed to run ovs-openflowd at the same
time as ovs-vswitchd.  I hope that this change discourages them.

ChangeLog

@@ -4,6 +4,9 @@ post v1.1.0
       counters for each port.
     - ovs-vsctl:
       - New "show" command to print an overview of configuration.
+    - ovs-openflowd has been renamed test-openflowd and moved into the
+      tests directory.  Its presence confused too many users.  Please
+      use ovs-vswitchd instead.
     - Feature removals:
       - Dropped support for "tun_id_from_cookie" OpenFlow extension.
 	(Use the extensible match extensions instead.)

INSTALL.userspace

@@ -47,18 +47,6 @@ ovs-vswitchd will create a TAP device as the bridge's local interface,
 named the same as the bridge, as well as for each configured internal
 interface.
 
-Using the Userspace Datapath with ovs-openflowd
------------------------------------------------
-
-To use ovs-openflowd in userspace mode, specify a datapath name that
-begins with "netdev@", and specify --ports with the names of the ports
-that should be included in the datapath as argument.  For example:
-
-    ovs-openflowd netdev@br0 --ports=eth0,eth1,eth2
-
-ovs-openflowd will create a TAP device as the bridge's local
-interface, named the same as the bridge minus the "netdev@" prefix.
-
 Bug Reporting
 -------------
 

Makefile.am

@@ -34,7 +34,6 @@ EXTRA_DIST = \
 	DESIGN \
 	INSTALL.KVM \
 	INSTALL.Linux \
-	INSTALL.OpenFlow \
 	INSTALL.SSL \
 	INSTALL.XenServer \
 	INSTALL.bridge \
@@ -58,6 +57,7 @@ man_MANS =
 noinst_DATA =
 noinst_HEADERS =
 noinst_LIBRARIES =
+noinst_man_MANS =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 OVSIDL_BUILT =

PORTING

@@ -242,9 +242,9 @@ latter is equivalent to the one of the former, but the difference in
 name makes the intended use obvious.
 
 ovs-vswitchd is the most sophisticated of ofproto's clients, but
-ofproto can have other clients as well.  ovs-openflowd, in the
-utilities directory, is much simpler than ovs-vswitchd.  It may be
-easier to initially bring up ovs-openflowd as part of a port.
+ofproto can have other clients as well.  test-openflowd, in the
+tests directory, is much simpler than ovs-vswitchd.  It may be
+easier to initially bring up test-openflowd as part of a port.
 
 lib/entropy.c assumes that it can obtain high-quality random number
 seeds at startup by reading from /dev/urandom.  You will need to

README

@@ -71,12 +71,7 @@ The main components of this distribution are:
     * ovsdbmonitor, a GUI tool for remotely viewing OVS databases and
       OpenFlow flow tables.
 
-Open vSwitch also provides an OpenFlow implementation and tools for
-those interested in OpenFlow but not additional Open vSwitch features:
-
-    * ovs-openflowd, an alternative to ovs-vswitchd that implements a
-      simple OpenFlow switch, without the special features provided by
-      ovs-vswitchd.
+Open vSwitch also provides some tools:
 
     * ovs-controller, a simple OpenFlow controller.
 

tests/.gitignore

@@ -21,6 +21,8 @@
 /test-list
 /test-lockfile
 /test-multipath
+/test-openflowd
+/test-openflowd.8
 /test-ovsdb
 /test-packets
 /test-random

tests/automake.mk

@@ -113,7 +113,6 @@ check-lcov: all tests/atconfig tests/atlocal $(TESTSUITE) $(lcov_wrappers)
 
 valgrind_wrappers = \
 	tests/valgrind/ovs-appctl \
-	tests/valgrind/ovs-openflowd \
 	tests/valgrind/ovs-vsctl \
 	tests/valgrind/ovsdb-client \
 	tests/valgrind/ovsdb-server \
@@ -131,6 +130,7 @@ valgrind_wrappers = \
 	tests/valgrind/test-list \
 	tests/valgrind/test-lockfile \
 	tests/valgrind/test-multipath \
+	tests/valgrind/test-openflowd \
 	tests/valgrind/test-ovsdb \
 	tests/valgrind/test-packets \
 	tests/valgrind/test-random \
@@ -230,6 +230,18 @@ noinst_PROGRAMS += tests/test-multipath
 tests_test_multipath_SOURCES = tests/test-multipath.c
 tests_test_multipath_LDADD = lib/libopenvswitch.a
 
+noinst_PROGRAMS += tests/test-openflowd
+EXTRA_DIST += tests/test-openflowd.8.in
+DISTCLEANFILES += tests/test-openflowd.8
+noinst_man_MANS += tests/ovs-openflowd.8
+tests_test_openflowd_SOURCES = tests/test-openflowd.c
+tests_test_openflowd_LDADD = \
+	ofproto/libofproto.a \
+	lib/libsflow.a \
+	lib/libopenvswitch.a \
+	$(SSL_LIBS)
+
+
 noinst_PROGRAMS += tests/test-packets
 tests_test_packets_SOURCES = tests/test-packets.c
 tests_test_packets_LDADD = lib/libopenvswitch.a

tests/ofproto-macros.at

@@ -5,10 +5,10 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
 m4_define([OFPROTO_START],
   [OVS_RUNDIR=$PWD; export OVS_RUNDIR
    OVS_LOGDIR=$PWD; export OVS_LOGDIR
-   trap 'kill `cat ovs-openflowd.pid`' 0
-   AT_CAPTURE_FILE([ovs-openflowd.log])
+   trap 'kill `cat test-openflowd.pid`' 0
+   AT_CAPTURE_FILE([test-openflowd.log])
    AT_CHECK(
-     [ovs-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1],
+     [test-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1],
      [0], [], [stderr])
    AT_CHECK([[sed < stderr '
 /vlog|INFO|opened log file/d
@@ -19,5 +19,5 @@ m4_define([OFPROTO_START],
 ])
 
 m4_define([OFPROTO_STOP],
-  [AT_CHECK([ovs-appctl -t ovs-openflowd exit])
+  [AT_CHECK([ovs-appctl -t test-openflowd exit])
    trap '' 0])