bugfix - create-port was broken

[sliver-openvswitch.git] / planetlab / scripts / sliver-ovs

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs
index 03dcafb..026e6b4 100755 (executable)
--- 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=/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 () {
@@ -27,28 +40,35 @@ function tapname () {
     
 function wait_server () {
     pid_file=$1; shift
-    server_name="$@"; shift
+    server_name=$1; shift
+    timeout=$1; shift
+
+    expire=$(($(date +%s) + $timeout))
 
     ## wait for it to be up - xxx todo - could use a timeout of some kind
     while [ ! -f "$pid_file" ]; do
-       echo "Waiting for $server_name to start..." >&2
+       echo "Waiting for $server_name to start... $(($expire - $(date +%s)))s left" >&2
        sleep 1;
+       [ $(date +%s) -ge $expire ] && return 1
     done
     cat "$pid_file"
 }
 
-######################################## 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 wait_device () {
+    tapname=$1; shift
+    timeout=$1; shift
+
+    expire=$(($(date +%s) + $timeout))
+
+    while ! ip link show up | egrep -q "^[0-9]+: +$tapname:"; do
+       echo "Waiting for $tapname to come UP...$(($expire - $(date +%s)))s left" >&2
+       sleep 1
+       [ $(date +%s) -ge $expire ] && return 1
+    done
+    return 0
+}
 
+######################################## startup
 function start_db () {
 
     [[ -n "$@" ]] && error "Usage: $COMMAND start-db"
@@ -78,7 +98,7 @@ function start_db () {
     else
        echo 'ovsdb-server appears to be running already, *not* starting'
     fi
-    wait_server $DB_PID_FILE ovsdb-server
+    wait_server $DB_PID_FILE ovsdb-server 30
 }
 
 function stop_db () { pkill ovsdb-server; }
@@ -92,12 +112,13 @@ function start_switch () {
        ovs-vswitchd \
            --pidfile=$SWITCH_PID_FILE \
            --log-file=$SWITCH_LOG \
+           --unixctl=$SWITCH_SOCKET \
            --detach \
            unix:$DB_SOCKET >& /dev/null
     else
        echo 'ovs-vswitchd appears to be running already, *not* starting'
     fi
-    wait_server $SWITCH_PID_FILE ovs-vswitchd
+    wait_server $SWITCH_PID_FILE ovs-vswitchd 30
 }
 
 function stop_switch () { pkill ovs-vswitchd ; }
@@ -107,6 +128,16 @@ function status () {
     [ -n "$pids" ] && ps $pids
 }
 
+function start () {
+    start_db
+    start_switch
+}
+
+function stop () {
+    stop_switch
+    stop_db
+}
+
 #################### create functions
 function create_bridge () {
     
@@ -124,7 +155,7 @@ function create_bridge () {
     # check whether the address is already assigned
     TAPNAME=$(tapname $IP)
     if [ ! -z "$TAPNAME" ]; then
-       if ovs-vsctl br-exists "$TAPNAME"; then
+       if ovs-vsctl --db=unix:$DB_SOCKET br-exists "$TAPNAME"; then
            echo $TAPNAME
            exit 0
        fi
@@ -140,27 +171,25 @@ function create_bridge () {
        $IP
        $PREFIX
 EOF
-    while ! ip link show up | egrep -q "^[0-9]+: +$TAPNAME:"; do
-       echo "Waiting for $TAPNAME to come UP..." >&2
-       sleep 1
-    done
-    ovs-vsctl add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
+    wait_device $TAPNAME 60 && \
+       ovs-vsctl --db=unix:$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
     echo $TAPNAME
     return 0
 }
 
 function create_port () {
 
+    [[ -z "$@" ]] && error "$COMMAND create-port <bridge> <port>"
     bridge=$1; shift
-    [[ -z "$@" ]] || error "$COMMAND create-port <bridge> <port>"
+    [[ -z "$@" ]] && error "$COMMAND create-port <bridge> <port>"
     port=$1; shift
-    [[ -n "$@" ]] || error "$COMMAND create-port <bridge> <port>"
+    [[ -n "$@" ]] && error "$COMMAND create-port <bridge> <port>"
 
     set -e
-    if ! ovs-vsctl list-ports "$bridge" | grep -q "^$port\$"; then
-       ovs-vsctl add-port "$bridge" "$port" -- set interface "$port" type=tunnel
+    if ! ovs-vsctl --db=unix:$DB_SOCKET list-ports "$bridge" | grep -q "^$port\$"; then
+       ovs-vsctl --db=unix:$DB_SOCKET 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
 }
 
@@ -174,8 +203,8 @@ function del_bridge () {
     W=
     is_switch_running || W="--no-wait"
 
-    if ovs-vsctl br-exists "$bridge_name"; then
-       ovs-vsctl $W del-br $bridge_name
+    if ovs-vsctl --db=unix:$DB_SOCKET br-exists "$bridge_name"; then
+       ovs-vsctl --db=unix:$DB_SOCKET $W del-br $bridge_name
     fi
     return 0
 }
@@ -186,14 +215,16 @@ function del_port () {
     [[ -n "$@" ]] && error "Usage: ${COMMAND} del-port <port>"
 
     set -e
-    if ovs-vsctl port-to-br "$1" >/dev/null 2>&1; then
-       ovs-vsctl del-port "$1"
+    if ovs-vsctl --db=unix:$DB_SOCKET port-to-br "$1" >/dev/null 2>&1; then
+       ovs-vsctl --db=unix:$DB_SOCKET del-port "$1"
     fi
     return 0
 }
 
 ####################
-SUPPORTED_SUBCOMMANDS="start_db stop_db start_switch stop_switch status create_bridge create_port del_bridge del_port"
+SUPPORTED_SUBCOMMANDS="start stop status 
+start_db stop_db start_switch stop_switch
+create_bridge create_port del_bridge del_port"
 
 function main () {
        message="Usage: $COMMAND <subcommand> ...