From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Sep 2012 15:38:55 +0000 (+0200)
Subject: specify where the switch daemon creates its control socket and pass
X-Git-Tag: sliver-openvswitch-1.8.90-0~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0221b75137d1cc29de25e9efed24f245f51f14c7;hp=aaa29c2b20a2c630afde23fcb4eb4ddfcadd0e07;p=sliver-openvswitch.git

specify where the switch daemon creates its control socket and pass
this to ovs-appctl
---

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs
index 03dcafb7b..5258356cd 100755
--- a/planetlab/scripts/sliver-ovs
+++ b/planetlab/scripts/sliver-ovs
@@ -5,6 +5,19 @@
 
 COMMAND=$0
 
+#################### global vars
+RUN_DIR=/var/run/openvswitch
+DB_CONF_FILE=/usr/etc/openvswitch/conf.db
+DB_SCHEMA=/usr/share/openvswitch/vswitch.ovsschema
+DB_PID_FILE=/var/run/openvswitch/db.pid
+DB_LOG=/var/log/ovs-db.log
+##
+DB_SOCKET=/var/run/openvswitch/db.sock
+##
+SWITCH_PID_FILE=/var/run/openvswitch/switch.pid
+SWITCH_LOG=/var/log/ovs-switch.log
+SWITCH_SOCKET=/var/run/openvswitch/switch.sock
+
 #################### helper functions
 
 function kill_pltap_ovs () {
@@ -17,7 +30,7 @@ function error {
 }
 
 function is_switch_running {
-    ovs-appctl version >/dev/null 2>&1
+    ovs-appctl --target=$SWITCH_SOCKET version >& /dev/null
 }
 
 function tapname () {
@@ -38,17 +51,6 @@ function wait_server () {
 }
 
 ######################################## startup
-RUN_DIR=/var/run/openvswitch
-DB_CONF_FILE=/usr/etc/openvswitch/conf.db
-DB_SCHEMA=/usr/share/openvswitch/vswitch.ovsschema
-DB_PID_FILE=/var/run/openvswitch/ovsdb-server.pid
-DB_LOG=/var/log/ovs-db.log
-##
-DB_SOCKET=/var/run/openvswitch/db.sock
-##
-SWITCH_PID_FILE=/var/run/openvswitch/ovs-vswitchd.pid
-SWITCH_LOG=/var/log/ovs-switch.log
-
 function start_db () {
 
     [[ -n "$@" ]] && error "Usage: $COMMAND start-db"
@@ -92,6 +94,7 @@ function start_switch () {
 	ovs-vswitchd \
 	    --pidfile=$SWITCH_PID_FILE \
 	    --log-file=$SWITCH_LOG \
+	    --unixctl=$SWITCH_SOCKET \
 	    --detach \
 	    unix:$DB_SOCKET >& /dev/null
     else
@@ -160,7 +163,7 @@ function create_port () {
     if ! ovs-vsctl list-ports "$bridge" | grep -q "^$port\$"; then
 	ovs-vsctl add-port "$bridge" "$port" -- set interface "$port" type=tunnel
     fi
-    ovs-appctl netdev-tunnel/get-port "$port"
+    ovs-appctl --target=$SWITCH_SOCKET netdev-tunnel/get-port "$port"
     return 0
 }