cache/bridge.%: | cache/db.%
@echo "Creating bridge on $(call display,$*) - logs in $(call log,$@)"
- @$(SSH) $(HOST_$*) $(SUDO) sliver-ovs create-bridge $(BRIDGE) $(IP_$*) &> $(call log,$@) \
+ @$(SSH) $(HOST_$*) $(SUDO) \
+ sliver-ovs create-bridge $(BRIDGE) $(IP_$*) $(call default,BROPTIONS,$*) &> $(call log,$@) \
&& touch $@
cache/controller.%: cache/bridge.%
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 () {