From: Thierry Parmentelat Date: Wed, 5 Sep 2012 14:10:36 +0000 (+0200) Subject: trash old scripts X-Git-Tag: sliver-openvswitch-1.8.90-0~40 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=b175d3123f7aca933e7e57d58c27ba3ef5b6a2d4 trash old scripts --- diff --git a/planetlab/scripts/create_bridge b/planetlab/scripts/create_bridge deleted file mode 100755 index ad8830506..000000000 --- a/planetlab/scripts/create_bridge +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -function error -{ - echo $1 >&2 - killall pltap-ovs 2>/dev/null || true - exit 1 -} - -function is_switch_running -{ - ovs-appctl version >/dev/null 2>&1 -} - -if [ -z "$1" ]; then - error "Usage: ${0##*/} " -fi - -# TODO: check paramether validity - -IP=${1%/*} -PREFIX=${1#*/} - -set -e - -# ensure ovs-vswitchd is running -if ! is_switch_running; then - echo "ovs-vswitchd not running" >&2 - exit 1 -fi - - -# check whether the address is already assigned -set -e -TAPNAME=$(ip addr show to "$IP/32" | perl -ne '/^\s*\d+:\s*([\w-]+):/ && print $1') -if [ ! -z "$TAPNAME" ]; then - if ovs-vsctl br-exists "$TAPNAME"; then - echo $TAPNAME - exit 0 - fi - error "$IP already assigned to $TAPNAME" -fi - -TAPNAME=$(pltap-ovs) -vsysc vif_up << EOF - $TAPNAME - $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 add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab -echo $TAPNAME diff --git a/planetlab/scripts/create_port b/planetlab/scripts/create_port deleted file mode 100755 index 211a82781..000000000 --- a/planetlab/scripts/create_port +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -function error -{ - echo $1 >&2 - exit 1 -} - -if [ -z "$2" ]; then - error "Usage ${0##*/} " -fi - -set -e -if ! ovs-vsctl list-ports "$1" | grep -q "^$2\$"; then - ovs-vsctl add-port "$1" "$2" -- set interface "$2" type=tunnel -fi -ovs-appctl netdev-tunnel/get-port "$2" diff --git a/planetlab/scripts/del_bridge b/planetlab/scripts/del_bridge deleted file mode 100755 index d19049aa4..000000000 --- a/planetlab/scripts/del_bridge +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -function error -{ - echo $1 >&2 - exit 1 -} - -function is_switch_running -{ - ovs-appctl version >/dev/null 2>&1 -} - -if [ -z "$1" ]; then - error "Usage: ${0##*/} " -fi - -W= -if ! is_switch_running; then - W="--no-wait" -fi - -if ovs-vsctl br-exists "$1"; then - ovs-vsctl $W del-br $1 -fi diff --git a/planetlab/scripts/del_port b/planetlab/scripts/del_port deleted file mode 100755 index 8fbfb2a6d..000000000 --- a/planetlab/scripts/del_port +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -function error -{ - echo $1 >&2 - exit 1 -} - -if [ -z "$1" ]; then - error "Usage ${0##*/} " -fi - -set -e -if ovs-vsctl port-to-br "$1" >/dev/null 2>&1; then - ovs-vsctl del-port "$1" -fi diff --git a/planetlab/scripts/start_ovsdb-server b/planetlab/scripts/start_ovsdb-server deleted file mode 100644 index 49bd0a4d0..000000000 --- a/planetlab/scripts/start_ovsdb-server +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -PIDF=/usr/local/var/run/openvswitch/ovsdb-server.pid - -if [ ! -f "$PIDF" ]; then - sudo ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock \ - --remote=db:Open_vSwitch,manager_options \ - --private-key=db:SSL,private_key \ - --certificate=db:SSL,certificate \ - --bootstrap-ca-cert=db:SSL,ca_cert \ - --pidfile --detach -fi -while [ ! -f "$PIDF" ]; do - echo "Waiting for ovsdb-server to start..." >&2 - sleep 1; -done -cat "$PIDF" diff --git a/planetlab/scripts/start_vswitchd b/planetlab/scripts/start_vswitchd deleted file mode 100644 index 248e8cbb0..000000000 --- a/planetlab/scripts/start_vswitchd +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -PIDF=/usr/local/var/run/openvswitch/ovs-vswitchd.pid - -if [ ! -f "$PIDF" ]; then - sudo ovs-vswitchd --pidfile --detach --log-file >/dev/null -fi -while [ ! -f "$PIDF" ]; do - echo "Waiting for ovs-vswitchd to start..." >&2 - sleep 1; -done -cat "$PIDF"