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 () {
}
function is_switch_running {
- ovs-appctl version >/dev/null 2>&1
+ ovs-appctl --target=$SWITCH_SOCKET version >& /dev/null
}
function tapname () {
}
######################################## 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"
ovs-vswitchd \
--pidfile=$SWITCH_PID_FILE \
--log-file=$SWITCH_LOG \
+ --unixctl=$SWITCH_SOCKET \
--detach \
unix:$DB_SOCKET >& /dev/null
else
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
}