openvswitch: rename openvswitch-controller

As of version 2.4.0 openvswitch-controller has been renamed to
openvswitch-testcontroller. This was documented in the upstream 'NEWS':

   - test-controller has been renamed ovs-testcontroller at request of users
     who find it useful for testing basic OpenFlow setups.  It is still not
     a necessary or desirable part of most Open vSwitch deployments.

Our initscripts and such have continued to reference the old name
despite the application name name changing and so
openvswitch-controller packaging has been broken for some time now.

We rename the openvswitch-controller package to reflect the upstream
name change and apply  this name change throughout. We also drop the
RDEPENDS as the upstream comments also indicate that this package is
not needed for a normal openvswitch deployment.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 31 insertions, 31 deletions

diff --git a/recipes-networking/openvswitch/files/openvswitch-controller b/recipes-networking/openvswitch/files/openvswitch-testcontroller
index 026974a7..aad5ad60 100755
--- a/recipes-networking/openvswitch/files/openvswitch-controller
+++ b/recipes-networking/openvswitch/files/openvswitch-testcontroller
@@ -19,7 +19,7 @@
 # Suite 330, Boston, MA 02111-1307 USA
 #
 ### BEGIN INIT INFO
-# Provides:          openvswitch-controller
+# Provides:          openvswitch-testcontroller
 # Required-Start:    $network $local_fs $remote_fs
 # Required-Stop:     $remote_fs
 # Should-Start:      $named
@@ -31,9 +31,9 @@
 
 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
+DAEMON=/usr/bin/ovs-testcontroller # Introduce the server's location here
+NAME=ovs-testcontroller         # Introduce the short server's name here
+DESC=ovs-testcontroller         # Introduce a short description here
 LOGDIR=/var/log/openvswitch # Log directory to use
 
 PIDFILE=/var/run/openvswitch/$NAME.pid 
@@ -43,7 +43,7 @@ test -x $DAEMON || exit 0
 . /lib/lsb/init-functions
 
 # Default options, these can be overriden by the information
-# at /etc/default/openvswitch-controller
+# at /etc/default/openvswitch-testcontroller
 DAEMON_OPTS=""          # Additional options given to the server 
 
 DODTIME=10              # Time to wait for the server to die, in seconds
@@ -56,7 +56,7 @@ LOGFILE=$LOGDIR/$NAME.log  # Server logfile
                         # is set start-stop-daemon will chuid the server
 
 # Include defaults if available
-default=/etc/default/openvswitch-controller
+default=/etc/default/openvswitch-testcontroller
 if [ -f $default ] ; then
     . $default
 fi
@@ -113,9 +113,9 @@ start_server() {
     SSL_OPTS=
     case $LISTEN in
         *ssl*)
-            : ${PRIVKEY:=/etc/openvswitch-controller/privkey.pem}
-            : ${CERT:=/etc/openvswitch-controller/cert.pem}
-            : ${CACERT:=/etc/openvswitch-controller/cacert.pem}
+            : ${PRIVKEY:=/etc/openvswitch-testcontroller/privkey.pem}
+            : ${CERT:=/etc/openvswitch-testcontroller/cert.pem}
+            : ${CACERT:=/etc/openvswitch-testcontroller/cacert.pem}
             if test ! -e "$PRIVKEY" || test ! -e "$CERT" ||
                 test ! -e "$CACERT"; then
                 if test ! -e "$PRIVKEY"; then
@@ -265,7 +265,7 @@ case "$1" in
         log_warning_msg "cannot re-read the config file (use restart)."
         ;;
   *)
-        N=/etc/init.d/openvswitch-controller
+        N=/etc/init.d/openvswitch-testcontroller
         echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
         exit 1
         ;;
diff --git a/recipes-networking/openvswitch/files/openvswitch-controller-setup b/recipes-networking/openvswitch/files/openvswitch-testcontroller-setup
index 1d9f9261..b431ece5 100644
--- a/recipes-networking/openvswitch/files/openvswitch-controller-setup
+++ b/recipes-networking/openvswitch/files/openvswitch-testcontroller-setup
@@ -15,15 +15,15 @@ LISTEN="pssl:"
 
 # PRIVKEY: Name of file containing controller's private key.
 # Required if SSL enabled.
-PRIVKEY=/etc/openvswitch-controller/privkey.pem
+PRIVKEY=/etc/openvswitch-testcontroller/privkey.pem
 
 # CERT: Name of file containing certificate for private key.
 # Required if SSL enabled.
-CERT=/etc/openvswitch-controller/cert.pem
+CERT=/etc/openvswitch-testcontroller/cert.pem
 
 # CACERT: Name of file containing switch CA certificate.
 # Required if SSL enabled.
-CACERT=/etc/openvswitch-controller/cacert.pem
+CACERT=/etc/openvswitch-testcontroller/cacert.pem
 
 # Additional options to pass to controller, e.g. "--hub"
 DAEMON_OPTS=""
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 454aadf0..13c7d062 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -14,9 +14,9 @@ LICENSE = "Apache-2"
 DEPENDS += "bridge-utils openssl python perl"
 
 RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \
-        python perl perl-module-strict ${PN}-switch ${PN}-controller \
+        python perl perl-module-strict ${PN}-switch \
         bash"
-RDEPENDS_${PN}-controller = "${PN} lsb ${PN}-pki"
+RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki"
 RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen"
 RDEPENDS_${PN}-pki = "${PN}"
 RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
@@ -29,8 +29,8 @@ RDEPENDS_${PN} += "sed gawk grep"
 SRC_URI = "\
         file://openvswitch-switch \
         file://openvswitch-switch-setup \
-        file://openvswitch-controller \
-        file://openvswitch-controller-setup \
+        file://openvswitch-testcontroller \
+        file://openvswitch-testcontroller-setup \
         file://openvswitch-add-target-python-handling.patch \
         file://openvswitch-add-target-perl-handling.patch \
         "
@@ -47,13 +47,13 @@ CONFIGUREOPT_DEPTRACK = ""
 # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}"
 
 ALLOW_EMPTY_${PN}-pki = "1"
-PACKAGES =+ "${PN}-controller ${PN}-switch ${PN}-brcompat ${PN}-pki"
+PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki"
 
-FILES_${PN}-controller = "\
-        ${sysconfdir}/init.d/openvswitch-controller \
-        ${sysconfdir}/default/openvswitch-controller \
-        ${sysconfdir}/openvswitch-controller \
-        ${bindir}/ovs-controller \
+FILES_${PN}-testcontroller = "\
+        ${sysconfdir}/init.d/openvswitch-testcontroller \
+        ${sysconfdir}/default/openvswitch-testcontroller \
+        ${sysconfdir}/openvswitch-testcontroller \
+        ${bindir}/ovs-testcontroller \
         "
 
 FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd"
@@ -69,21 +69,21 @@ FILES_${PN} += "/run"
 
 inherit autotools update-rc.d
 
-INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller"
+INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller"
 INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch"
 INITSCRIPT_PARAMS_${PN}-switch = "defaults 71"
 
-INITSCRIPT_NAME_${PN}-controller = "openvswitch-controller"
-INITSCRIPT_PARAMS_${PN}-controller = "defaults 72"
+INITSCRIPT_NAME_${PN}-testcontroller = "openvswitch-testcontroller"
+INITSCRIPT_PARAMS_${PN}-testcontroller = "defaults 72"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/default/
         install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
-        install -d ${D}/${sysconfdir}/openvswitch-controller
-        install -m 660 ${WORKDIR}/openvswitch-controller-setup ${D}/${sysconfdir}/default/openvswitch-controller
+        install -d ${D}/${sysconfdir}/openvswitch-testcontroller
+        install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
 
         install -d ${D}/${sysconfdir}/init.d/
-        install -m 755 ${WORKDIR}/openvswitch-controller ${D}/${sysconfdir}/init.d/openvswitch-controller
+        install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
         install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
         true || rm -fr ${D}/${datadir}/${PN}/pki
 
@@ -102,7 +102,7 @@ pkg_postinst_${PN}-pki () {
         fi
 }
 
-pkg_postinst_${PN}-controller () {
+pkg_postinst_${PN}-testcontroller () {
         # can't do this offline
         if [ "x$D" != "x" ]; then
                 exit 1
@@ -112,7 +112,7 @@ pkg_postinst_${PN}-controller () {
                 ovs-pki init --dir=$D/${datadir}/${PN}/pki
         fi
 
-        cd $D/${sysconfdir}/openvswitch-controller
+        cd $D/${sysconfdir}/openvswitch-testcontroller
         if ! test -e cacert.pem; then
                 ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem
         fi