#################### global vars
RUN_DIR=/var/run/openvswitch
-DB_CONF_FILE=/usr/etc/openvswitch/conf.db
+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
[ -n "$pids" ] && ps $pids
}
+function start () {
+ start_db
+ start_switch
+}
+
+function stop () {
+ stop_switch
+ stop_db
+}
+
#################### create functions
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=$DB_SOCKET br-exists "$TAPNAME"; then
echo $TAPNAME
exit 0
fi
echo "Waiting for $TAPNAME to come UP..." >&2
sleep 1
done
- ovs-vsctl add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
+ ovs-vsctl --db=$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
echo $TAPNAME
return 0
}
[[ -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=$DB_SOCKET list-ports "$bridge" | grep -q "^$port\$"; then
+ ovs-vsctl --db=$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 br-exists "$bridge_name"; then
- ovs-vsctl $W del-br $bridge_name
+ if ovs-vsctl --db=$DB_SOCKET br-exists "$bridge_name"; then
+ ovs-vsctl --db=$DB_SOCKET $W del-br $bridge_name
fi
return 0
}
[[ -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=$DB_SOCKET port-to-br "$1" >/dev/null 2>&1; then
+ ovs-vsctl --db=$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> ...