kill pltap-ovs on create-bridge timeout

[sliver-openvswitch.git] / planetlab / scripts / sliver-ovs

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs
index f58caa8..dabb016 100755 (executable)
--- a/planetlab/scripts/sliver-ovs
+++ b/planetlab/scripts/sliver-ovs
@@ -189,6 +189,7 @@ function create_bridge () {
 
     # we're clear
     TAPNAME=$(pltap-ovs)
+    trap kill_pltap_ovs EXIT
     # xxx wouldn't that be safer if left-aligned ?
     vsysc vif_up << EOF
        $TAPNAME
@@ -268,11 +269,20 @@ function del_port () {
     return 0
 }
 
+function show () {
+
+    get_params "" "$@"
+
+    is_db_running || { echo "ovsdb-server not running" >&2; exit 1; }
+
+    ovs-vsctl --db=unix:$DB_SOCKET show
+}
+
 ####################
 SUPPORTED_SUBCOMMANDS="start stop status 
 start_db stop_db start_switch stop_switch
 create_bridge create_port del_bridge del_port
-set_remote_endpoint"
+show set_remote_endpoint"
 
 function main () {
        message="Usage: $COMMAND <subcommand> ...