addition of br-del-all of bridge driver

diff --git a/src/Makefile b/src/Makefile
index 0aca9aa..e686910 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -174,6 +174,7 @@ install-driver-docker : install-dockerfile
        install -m 755 driver/LinuxBridge/br-check $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-check
        install -m 755 driver/LinuxBridge/br-emptylist $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-emptylist
        install -m 755 driver/LinuxBridge/br-if-list $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-if-list
+       install -m 755 driver/LinuxBridge/br-del-all $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-del-all
        mkdir -p $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch
        install -m 755 driver/OpenvSwitch/br-addbr $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-addbr
        install -m 755 driver/OpenvSwitch/br-delbr $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-delbr
@@ -185,6 +186,7 @@ install-driver-docker : install-dockerfile
        install -m 755 driver/OpenvSwitch/br-check $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-check
        install -m 755 driver/OpenvSwitch/br-emptylist $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-emptylist
        install -m 755 driver/OpenvSwitch/br-if-list $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-if-list
+       install -m 755 driver/OpenvSwitch/br-del-all $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-del-all
 
 install-dockerfile :
        mkdir -p $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile

diff --git a/src/cmd/fulcond b/src/cmd/fulcond
index 76132d6..e7cc7de 100755 (executable)
--- a/src/cmd/fulcond
+++ b/src/cmd/fulcond
@@ -3,7 +3,8 @@
 # Copyright (C) 2016 NIWA Hideyuki
 
 FULCONDRIVER=`fulcon driver-name`
-PATH=/usr/lib/fulcon/driver/$FULCONDRIVER:/usr/lib/fulcon/lib:$PATH
+BRIDGEDRIVER=`fulcon bridge-name`
+PATH=/usr/lib/fulcon/driver/$BRIDGEDRIVER:/usr/lib/fulcon/driver/$FULCONDRIVER:/usr/lib/fulcon/lib:$PATH
 FULCONDIR=/var/lib/fulcon
 
 lsdir() {
@@ -19,6 +20,7 @@ do
 done
 
 # auto setup fulcon bridge
+br-del-all
 mkdir -p $FULCONDIR/br
 for i in `lsdir $FULCONDIR/br`
 do

diff --git a/src/driver/LinuxBridge/br-del-all b/src/driver/LinuxBridge/br-del-all
new file mode 100755 (executable)
index 0000000..fb3dfbe
--- /dev/null
+++ b/src/driver/LinuxBridge/br-del-all
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright (C) 2016 NIWA Hideyuki
+
+BR=`brctl show | sed -e 's/"//g' | \
+       awk '{ \
+               if((NF==3 || NF==4)&&($1~/^fulcon/))print $1 \
+       }'`
+
+if [ x"$BR" != x"" ]; then
+       for i in $BR
+       do
+               ip link set $i down
+               brctl delbr $i
+       done
+fi
+
+
+

diff --git a/src/driver/OpenvSwitch/br-del-all b/src/driver/OpenvSwitch/br-del-all
new file mode 100755 (executable)
index 0000000..e155c20
--- /dev/null
+++ b/src/driver/OpenvSwitch/br-del-all
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Copyright (C) 2016 NIWA Hideyuki
+
+BR=`ovs-vsctl show | sed -e 's/"//g' | \
+       awk '{ \
+               if($1=="Bridge" && $2~/^fulcon/)print $2 \
+       }'`
+
+if [ x"$BR" != x"" ]; then
+       for i in $BR
+       do
+               ovs-vsctl del-br $i
+       done
+fi
+
+
+