Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

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

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs
index 0f6c402..44ad3f9 100755 (executable)
--- a/planetlab/scripts/sliver-ovs
+++ b/planetlab/scripts/sliver-ovs
@@ -181,7 +181,7 @@ function create_bridge () {
        $PREFIX
 EOF
     wait_device $TAPNAME 60 && \
-       ovs-vsctl --db=$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
+       ovs-vsctl --db=unix:$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
     echo $TAPNAME
     return 0
 }
@@ -197,8 +197,8 @@ function create_port () {
     is_switch_running || { echo "ovs-vswitchd not running" >&2 ; exit 1 ; }
 
     set -e
-    if ! ovs-vsctl --db=$DB_SOCKET list-ports "$bridge" | grep -q "^$port\$"; then
-       ovs-vsctl --db=$DB_SOCKET 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 --target=$SWITCH_SOCKET netdev-tunnel/get-port "$port"
     return 0
@@ -219,9 +219,8 @@ function del_bridge () {
        W="--no-wait"
     fi
 
-    set -e
-    if ovs-vsctl --db=$DB_SOCKET $W br-exists "$bridge_name"; then
-       ovs-vsctl --db=$DB_SOCKET $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
 }
@@ -240,8 +239,8 @@ function del_port () {
     fi
 
     set -e
-    if ovs-vsctl --db=$DB_SOCKET $W port-to-br "$1" >/dev/null 2>&1; then
-       ovs-vsctl --db=$DB_SOCKET $W 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 $W del-port "$1"
     fi
     return 0
 }