function get_params {
params=$1; shift
err_msg="$COMMAND $SUBCOMMAND $(echo $params | perl -pe 's/\S+/<$&>/g')"
- for p in $(echo $params); do
+ for p in $params; do
[[ -z "$@" ]] && error "$err_msg"
pname=$(echo -n $p|perl -pe 's/\W/_/g')
eval $pname="$1"; shift
#################### create functions
function create_bridge () {
- get_params "bridge IP/PREFIX" "$@"
+ get_params "bridge IP/PREFIX" "$1" "$2"
+ shift; shift;
IP=${IP_PREFIX%/*}
PREFIX=${IP_PREFIX#*/}
set -e
ovs-vsctl --db=unix:$DB_SOCKET $W -- --may-exist add-br "$bridge" \
-- set bridge "$bridge" datapath_type=planetlab \
- -- set interface "$bridge" options:local_ip="$IP" option:local_netmask="$PREFIX"
+ -- set interface "$bridge" options:local_ip="$IP" option:local_netmask="$PREFIX" \
+ -- "$@"
}
function create_port () {
get_params "bridge port" "$@"
+
+ W=
+ if ! is_switch_running; then
+ # we can create the port even if ovs-vswitchd is not running,
+ # but we need a running ovsdb-server
+ is_db_running || { echo "ovsdb-server not running" >&2; exit 1; }
+ W="--no-wait"
+ fi
- # ensure ovs-vswitchd is running
- is_switch_running || { echo "ovs-vswitchd not running" >&2 ; exit 1 ; }
+ set -e
+ ovs-vsctl --db=unix:$DB_SOCKET $W -- --may-exist add-port "$bridge" "$port" \
+ -- set interface "$port" type=tunnel
+}
+
+function get_local_endpoint () {
+
+ get_params "local_port" "$@"
+
+ is_switch_running || { echo "ovs-vswitchd not running" >&2; exit 1; }
set -e
- ovs-vsctl --db=unix:$DB_SOCKET -- --may-exist add-port "$bridge" "$port" -- set interface "$port" type=tunnel
- ovs-appctl --target=ovs-vswitchd netdev-tunnel/get-port "$port"
+ ovs-appctl --target=ovs-vswitchd netdev-tunnel/get-port "$local_port"
}
function set_remote_endpoint () {
get_params "local_port remote_ip remote_UDP_port" "$@"
- # ensure ovs-vswitchd is running
- is_switch_running || { echo "ovs-vswitchd not running" >&2 ; exit 1 ; }
+ W=
+ if ! is_switch_running; then
+ # we can store the info even if ovs-vswitchd is not running,
+ # but we need a running ovsdb-server
+ is_db_running || { echo "ovsdb-server not running" >&2; exit 1; }
+ W="--no-wait"
+ fi
set -e
- ovs-vsctl --db=unix:$DB_SOCKET set interface $local_port \
+ ovs-vsctl --db=unix:$DB_SOCKET $W set interface $local_port \
options:remote_ip=$remote_ip \
options:remote_port=$remote_UDP_port
}
# this one-shot function writes the current statistics onto the ndnmap site
# it needs to be called regularly so that ndnmap can do the bw computations
# would make sense for the caller to redirect stderr onto some relevant location
-function gmap_report_once () {
+function gmap_probe_once () {
iface=$1; shift
hostname=$1; shift
linkid=$1; shift
}
### the front end, manages pid and so on
-function gmap_report () {
+function gmap_probe () {
iface=$1; shift
hostname=$1; shift
linkid=$1; shift
[ -n "$pid" ] && kill $pid >& /dev/null
rm $pid_file
fi
+ # close std fds so that ssh invokations can return
+ exec <&-
+ exec >&-
while true; do
- gmap_report_once $iface $hostname $linkid
+ gmap_probe_once $iface $hostname $linkid
sleep $looptime
done &
# this is the pid for the background process
SUPPORTED_SUBCOMMANDS="start stop status
start_db stop_db start_switch stop_switch
create_bridge create_port del_bridge del_port
-show set_remote_endpoint set_controller del_controller gmap_report"
+show get_local_endpoint set_remote_endpoint
+set_controller del_controller gmap_probe"
function main () {
message="Usage: $COMMAND <subcommand> ...