| リビジョン | 0ce332ae21a9fbe536b2648cca357d0d31c11c00 (tree) |
|---|---|
| 日時 | 2016-04-10 15:18:29 |
| 作者 | niwa-hideyuki <niwa.niwa@nift...> |
| コミッター | niwa-hideyuki |
Improvement of the network function of OpenvSwitch.
src/Makefile (diff) src/cmd/fulcond (diff) src/driver/LinuxBridge/br-del-all (diff) src/driver/OpenvSwitch/br-del-all (diff)| @@ -174,6 +174,7 @@ install-driver-docker : install-dockerfile | ||
| 174 | 174 | install -m 755 driver/LinuxBridge/br-check $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-check |
| 175 | 175 | install -m 755 driver/LinuxBridge/br-emptylist $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-emptylist |
| 176 | 176 | install -m 755 driver/LinuxBridge/br-if-list $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-if-list |
| 177 | + install -m 755 driver/LinuxBridge/br-del-all $(DESTDIR)$(libdir)/fulcon/driver/LinuxBridge/br-del-all | |
| 177 | 178 | mkdir -p $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch |
| 178 | 179 | install -m 755 driver/OpenvSwitch/br-addbr $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-addbr |
| 179 | 180 | install -m 755 driver/OpenvSwitch/br-delbr $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-delbr |
| @@ -185,6 +186,7 @@ install-driver-docker : install-dockerfile | ||
| 185 | 186 | install -m 755 driver/OpenvSwitch/br-check $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-check |
| 186 | 187 | install -m 755 driver/OpenvSwitch/br-emptylist $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-emptylist |
| 187 | 188 | install -m 755 driver/OpenvSwitch/br-if-list $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-if-list |
| 189 | + install -m 755 driver/OpenvSwitch/br-del-all $(DESTDIR)$(libdir)/fulcon/driver/OpenvSwitch/br-del-all | |
| 188 | 190 | |
| 189 | 191 | install-dockerfile : |
| 190 | 192 | mkdir -p $(DESTDIR)/$(localstatedir)/lib/fulcon/driver/dockerfile |
| @@ -3,20 +3,16 @@ | ||
| 3 | 3 | # Copyright (C) 2016 NIWA Hideyuki |
| 4 | 4 | |
| 5 | 5 | FULCONDRIVER=`fulcon driver-name` |
| 6 | -PATH=/usr/lib/fulcon/driver/$FULCONDRIVER:/usr/lib/fulcon/lib:$PATH | |
| 6 | +BRIDGEDRIVER=`fulcon bridge-name` | |
| 7 | +PATH=/usr/lib/fulcon/driver/$BRIDGEDRIVER:/usr/lib/fulcon/driver/$FULCONDRIVER:/usr/lib/fulcon/lib:$PATH | |
| 7 | 8 | FULCONDIR=/var/lib/fulcon |
| 8 | 9 | |
| 9 | 10 | lsdir() { |
| 10 | 11 | ls -f --ind=none $1 | sed '/^\.\{1,2\}$/d' |
| 11 | 12 | } |
| 12 | 13 | |
| 13 | -# auto start fulcon container | |
| 14 | -for i in `lsdir $FULCONDIR/container` | |
| 15 | -do | |
| 16 | - if [ -f $FULCONDIR/container/$i/autostart ]; then | |
| 17 | - fulcon start $i | |
| 18 | - fi | |
| 19 | -done | |
| 14 | +# delete all bridge | |
| 15 | +br-del-all | |
| 20 | 16 | |
| 21 | 17 | # auto setup fulcon bridge |
| 22 | 18 | mkdir -p $FULCONDIR/br |
| @@ -27,6 +23,14 @@ do | ||
| 27 | 23 | fi |
| 28 | 24 | done |
| 29 | 25 | |
| 26 | +# auto start fulcon container | |
| 27 | +for i in `lsdir $FULCONDIR/container` | |
| 28 | +do | |
| 29 | + if [ -f $FULCONDIR/container/$i/autostart ]; then | |
| 30 | + fulcon start $i | |
| 31 | + fi | |
| 32 | +done | |
| 33 | + | |
| 30 | 34 | while : |
| 31 | 35 | do |
| 32 | 36 | sleep 1 |
| @@ -0,0 +1,19 @@ | ||
| 1 | +#!/bin/bash | |
| 2 | + | |
| 3 | +# Copyright (C) 2016 NIWA Hideyuki | |
| 4 | + | |
| 5 | +BR=`brctl show | sed -e 's/"//g' | \ | |
| 6 | + awk '{ \ | |
| 7 | + if((NF==3 || NF==4)&&($1~/^fulcon/))print $1 \ | |
| 8 | + }'` | |
| 9 | + | |
| 10 | +if [ x"$BR" != x"" ]; then | |
| 11 | + for i in $BR | |
| 12 | + do | |
| 13 | + ip link set $i down | |
| 14 | + brctl delbr $i | |
| 15 | + done | |
| 16 | +fi | |
| 17 | + | |
| 18 | + | |
| 19 | + |
| @@ -0,0 +1,18 @@ | ||
| 1 | +#!/bin/bash | |
| 2 | + | |
| 3 | +# Copyright (C) 2016 NIWA Hideyuki | |
| 4 | + | |
| 5 | +BR=`ovs-vsctl show | sed -e 's/"//g' | \ | |
| 6 | + awk '{ \ | |
| 7 | + if($1=="Bridge" && $2~/^fulcon/)print $2 \ | |
| 8 | + }'` | |
| 9 | + | |
| 10 | +if [ x"$BR" != x"" ]; then | |
| 11 | + for i in $BR | |
| 12 | + do | |
| 13 | + ovs-vsctl del-br $i | |
| 14 | + done | |
| 15 | +fi | |
| 16 | + | |
| 17 | + | |
| 18 | + |
Fulcon-VirtualPlatform
Fork