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"
}
+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 () {
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; }
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 ; }
# check whether the address is already assigned
TAPNAME=$(tapname $IP)
if [ ! -z "$TAPNAME" ]; then
- if ovs-vsctl --db=$DB_SOCKET br-exists "$TAPNAME"; then
+ if ovs-vsctl --db=unix:$DB_SOCKET br-exists "$TAPNAME"; then
echo $TAPNAME
exit 0
fi
$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 --db=$DB_SOCKET 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 --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
W=
is_switch_running || W="--no-wait"
- if ovs-vsctl --db=$DB_SOCKET 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
}
[[ -n "$@" ]] && error "Usage: ${COMMAND} del-port <port>"
set -e
- if ovs-vsctl --db=$DB_SOCKET port-to-br "$1" >/dev/null 2>&1; then
- ovs-vsctl --db=$DB_SOCKET 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
}