Try to make format mostly consistent. No tabs for the moment, although

we could switch to smart tabs (i.e. tab for indent, space for align.)
This commit is contained in:
Bob Lantz
2012-02-01 15:29:53 -08:00
parent d990eb0717
commit c120e37897
+155 -149
View File
@@ -40,48 +40,50 @@ OVS_DIR=~/openvswitch
OVS_KMOD=openvswitch_mod.ko
function kernel {
echo "Install Mininet-compatible kernel"
sudo apt-get update
echo "Install Mininet-compatible kernel"
sudo apt-get update
if [ "$DIST" = "Debian" ]; then
# The easy approach: download pre-built linux-image and linux-headers packages:
wget -c $KERNEL_LOC/$KERNEL_HEADERS
wget -c $KERNEL_LOC/$KERNEL_IMAGE
# The easy approach: download pre-built linux-image and linux-headers packages:
wget -c $KERNEL_LOC/$KERNEL_HEADERS
wget -c $KERNEL_LOC/$KERNEL_IMAGE
#Install custom linux headers and image:
sudo dpkg -i $KERNEL_IMAGE $KERNEL_HEADERS
# Install custom linux headers and image:
sudo dpkg -i $KERNEL_IMAGE $KERNEL_HEADERS
# The next two steps are to work around a bug in newer versions of
# kernel-package, which fails to add initrd images with the latest kernels.
# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525032
# Generate initrd image if the .deb didn't install it:
if ! test -e /boot/initrd.img-${KERNEL_NAME}; then
sudo update-initramfs -c -k ${KERNEL_NAME}
fi
# Ensure /boot/grub/menu.lst boots with initrd image:
sudo update-grub
# The next two steps are to work around a bug in newer versions of
# kernel-package, which fails to add initrd images with the latest kernels.
# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525032
# Generate initrd image if the .deb didn't install it:
if ! test -e /boot/initrd.img-${KERNEL_NAME}; then
sudo update-initramfs -c -k ${KERNEL_NAME}
fi
# Ensure /boot/grub/menu.lst boots with initrd image:
sudo update-grub
# The default should be the new kernel. Otherwise, you may need to modify /boot/grub/menu.lst to set the default to the entry corresponding to the kernel you just installed.
# The default should be the new kernel. Otherwise, you may need to modify
# /boot/grub/menu.lst to set the default to the entry corresponding to the
# kernel you just installed.
fi
}
function kernel_clean {
echo "Cleaning kernel..."
echo "Cleaning kernel..."
# To save disk space, remove previous kernel
sudo apt-get -y remove $KERNEL_IMAGE_OLD
# To save disk space, remove previous kernel
sudo apt-get -y remove $KERNEL_IMAGE_OLD
#Also remove downloaded packages:
rm -f ~/linux-headers-* ~/linux-image-*
# Also remove downloaded packages:
rm -f ~/linux-headers-* ~/linux-image-*
}
# Install Mininet deps
function mn_deps {
echo "Installing Mininet dependencies"
sudo aptitude install -y gcc make screen psmisc xterm ssh iperf iproute \
echo "Installing Mininet dependencies"
sudo aptitude install -y gcc make screen psmisc xterm ssh iperf iproute \
python-setuptools python-networkx
if [ "$DIST" = "Ubuntu" ] && [ "`lsb_release -sr`" = "10.04" ]; then
@@ -89,11 +91,12 @@ function mn_deps {
sudo easy_install --upgrade networkx
fi
#Add sysctl parameters as noted in the INSTALL file to increase kernel limits to support larger setups:
sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf"
# Add sysctl parameters as noted in the INSTALL file to increase kernel
# limits to support larger setups:
sudo su -c "cat $HOME/mininet/util/sysctl_addon >> /etc/sysctl.conf"
#Load new sysctl settings:
sudo sysctl -p
# Load new sysctl settings:
sudo sysctl -p
echo "Installing Mininet core"
pushd ~/mininet
@@ -108,53 +111,55 @@ function mn_deps {
# http://www.openflowswitch.org/wk/index.php/Debian_Install
# ... modified to use Debian Lenny rather than unstable.
function of {
echo "Installing OpenFlow and its tools..."
echo "Installing OpenFlow and its tools..."
cd ~/
sudo apt-get install -y git-core automake m4 pkg-config libtool make libc6-dev autoconf autotools-dev gcc
git clone git://openflowswitch.org/openflow.git
cd ~/openflow
cd ~/
sudo apt-get install -y git-core automake m4 pkg-config libtool \
make libc6-dev autoconf autotools-dev gcc
git clone git://openflowswitch.org/openflow.git
cd ~/openflow
# Patch controller to handle more than 16 switches
patch -p1 < ~/mininet/util/openflow-patches/controller.patch
# Resume the install:
./boot.sh
./configure
make
sudo make install
# Resume the install:
./boot.sh
./configure
make
sudo make install
# Install dissector:
sudo apt-get install -y wireshark libgtk2.0-dev
cd ~/openflow/utilities/wireshark_dissectors/openflow
make
sudo make install
# Install dissector:
sudo apt-get install -y wireshark libgtk2.0-dev
cd ~/openflow/utilities/wireshark_dissectors/openflow
make
sudo make install
# Copy coloring rules: OF is white-on-blue:
mkdir -p ~/.wireshark
cp ~/mininet/util/colorfilters ~/.wireshark
# Copy coloring rules: OF is white-on-blue:
mkdir -p ~/.wireshark
cp ~/mininet/util/colorfilters ~/.wireshark
# Remove avahi-daemon, which may cause unwanted discovery packets to be sent during tests, near link status changes:
sudo apt-get remove -y avahi-daemon
# Remove avahi-daemon, which may cause unwanted discovery packets to be
# sent during tests, near link status changes:
sudo apt-get remove -y avahi-daemon
# Disable IPv6. Add to /etc/modprobe.d/blacklist:
# Disable IPv6. Add to /etc/modprobe.d/blacklist:
if [ "$DIST" = "Ubuntu" ]; then
BLACKLIST=/etc/modprobe.d/blacklist.conf
else
BLACKLIST=/etc/modprobe.d/blacklist
fi
sudo sh -c "echo 'blacklist net-pf-10\nblacklist ipv6' >> $BLACKLIST"
sudo sh -c "echo 'blacklist net-pf-10\nblacklist ipv6' >> $BLACKLIST"
}
# Install OpenVSwitch
# Instructions derived from OVS INSTALL, INSTALL.OpenFlow and README files.
function ovs {
echo "Installing OpenVSwitch..."
echo "Installing OpenVSwitch..."
if [ "$DIST" = "Debian" ]; then
sudo aptitude -y install pkg-config gcc make git-core python-dev libssl-dev
#Install Autoconf 2.63+ backport from Debian Backports repo:
#Instructions from http://backports.org/dokuwiki/doku.php?id=instructions
# Install Autoconf 2.63+ backport from Debian Backports repo:
# Instructions from http://backports.org/dokuwiki/doku.php?id=instructions
sudo su -c "echo 'deb http://www.backports.org/debian lenny-backports main contrib non-free' >> /etc/apt/sources.list"
sudo apt-get update
sudo apt-get -y --force-yes install debian-backports-keyring
@@ -165,29 +170,30 @@ function ovs {
sudo apt-get -y install $KERNEL_HEADERS
fi
#Install OVS from release
cd ~/
git clone git://openvswitch.org/openvswitch
cd $OVS_DIR
# Install OVS from release
cd ~/
git clone git://openvswitch.org/openvswitch
cd $OVS_DIR
git checkout $OVS_RELEASE
./boot.sh
./boot.sh
BUILDDIR=/lib/modules/${KERNEL_NAME}/build
if [ ! -e $BUILDDIR ]; then
echo "Creating build sdirectory $BUILDDIR"
sudo mkdir -p $BUILDDIR
fi
opts="--with-l26=$BUILDDIR"
./configure $opts
make
sudo make install
./configure $opts
make
sudo make install
}
# Install NOX with tutorial files
function nox {
echo "Installing NOX w/tutorial files..."
echo "Installing NOX w/tutorial files..."
#Install NOX deps:
sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libxerces-c2-dev libssl-dev make
# Install NOX deps:
sudo apt-get -y install autoconf automake g++ libtool python python-twisted \
swig libxerces-c2-dev libssl-dev make
if [ "$DIST" = "Debian" ]; then
sudo apt-get -y install libboost1.35-dev
elif [ "$DIST" = "Ubuntu" ]; then
@@ -195,31 +201,31 @@ function nox {
sudo apt-get -y install libboost-filesystem-dev
sudo apt-get -y install libboost-test-dev
fi
#Install NOX optional deps:
sudo apt-get install -y libsqlite3-dev python-simplejson
# Install NOX optional deps:
sudo apt-get install -y libsqlite3-dev python-simplejson
#Install NOX:
cd ~/
git clone git://openflowswitch.org/nox-tutorial noxcore
cd noxcore
# Install NOX:
cd ~/
git clone git://openflowswitch.org/nox-tutorial noxcore
cd noxcore
# With later autoconf versions this doesn't quite work:
./boot.sh --apps-core || true
# With later autoconf versions this doesn't quite work:
./boot.sh --apps-core || true
if [ "$DIST" = "Debian" ]; then
# So use this instead:
autoreconf --install --force
fi
mkdir build
cd build
../configure --with-python=yes
mkdir build
cd build
../configure --with-python=yes
make
#make check
#make check
# Add NOX_CORE_DIR env var:
sed -i -e 's|# for examples$|&\nexport NOX_CORE_DIR=~/noxcore/build/src|' ~/.bashrc
# Add NOX_CORE_DIR env var:
sed -i -e 's|# for examples$|&\nexport NOX_CORE_DIR=~/noxcore/build/src|' ~/.bashrc
# To verify this install:
#cd ~/noxcore/build/src
# To verify this install:
#cd ~/noxcore/build/src
#./nox_core -v -i ptcp:
}
@@ -227,10 +233,10 @@ function nox {
function oftest {
echo "Installing oftest..."
#Install deps:
# Install deps:
sudo apt-get install -y tcpdump python-scapy
#Install oftest:
# Install oftest:
cd ~/
git clone git://openflow.org/oftest
cd oftest
@@ -254,27 +260,27 @@ function cbench {
}
function other {
echo "Doing other setup tasks..."
echo "Doing other setup tasks..."
#Enable command auto completion using sudo; modify ~/.bashrc:
sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc
# Enable command auto completion using sudo; modify ~/.bashrc:
sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc
#Install tcpdump and tshark, cmd-line packet dump tools. Also install gitk,
#a graphical git history viewer.
sudo apt-get install -y tcpdump tshark gitk
# Install tcpdump and tshark, cmd-line packet dump tools. Also install gitk,
# a graphical git history viewer.
sudo apt-get install -y tcpdump tshark gitk
#Install common text editors
# Install common text editors
sudo apt-get install -y vim nano emacs
#Install NTP
# Install NTP
sudo apt-get install -y ntp
#Set git to colorize everything.
git config --global color.diff auto
git config --global color.status auto
git config --global color.branch auto
# Set git to colorize everything.
git config --global color.diff auto
git config --global color.status auto
git config --global color.branch auto
#Reduce boot screen opt-out delay. Modify timeout in /boot/grub/menu.lst to 1:
# Reduce boot screen opt-out delay. Modify timeout in /boot/grub/menu.lst to 1:
if [ "$DIST" = "Debian" ]; then
sudo sed -i -e 's/^timeout.*$/timeout 1/' /boot/grub/menu.lst
fi
@@ -291,56 +297,56 @@ function other {
# re-run this script. If you're using only one kernel version, then it may be
# a good idea to use a symbolic link in place of the copy below.
function modprobe {
echo "Setting up modprobe for OVS kmod..."
echo "Setting up modprobe for OVS kmod..."
sudo cp $OVS_DIR/datapath/linux-2.6/$OVS_KMOD $DRIVERS_DIR
sudo depmod -a ${KERNEL_NAME}
sudo cp $OVS_DIR/datapath/linux-2.6/$OVS_KMOD $DRIVERS_DIR
sudo depmod -a ${KERNEL_NAME}
}
function all {
echo "Running all commands..."
echo "Running all commands..."
if [ "$DIST" != "Ubuntu" ]; then
# Ubuntu ships with Mininet-compatible kernel
kernel
fi
mn_deps
of
ovs
mn_deps
of
ovs
modprobe
nox
oftest
cbench
other
echo "Please reboot, then run ./mininet/util/install.sh -c to remove unneeded packages."
echo "Enjoy Mininet!"
nox
oftest
cbench
other
echo "Please reboot, then run ./mininet/util/install.sh -c to remove unneeded packages."
echo "Enjoy Mininet!"
}
# Restore disk space and remove sensitive files before shipping a VM.
function vm_clean {
echo "Cleaning VM..."
sudo apt-get clean
sudo rm -rf /tmp/*
sudo rm -rf openvswitch*.tar.gz
echo "Cleaning VM..."
sudo apt-get clean
sudo rm -rf /tmp/*
sudo rm -rf openvswitch*.tar.gz
# Remove sensistive files
history -c # note this won't work if you have multiple bash sessions
rm -f ~/.bash_history # need to clear in memory and remove on disk
rm -f ~/.ssh/id_rsa* ~/.ssh/known_hosts
sudo rm -f ~/.ssh/authorized_keys2
# Remove sensistive files
history -c # note this won't work if you have multiple bash sessions
rm -f ~/.bash_history # need to clear in memory and remove on disk
rm -f ~/.ssh/id_rsa* ~/.ssh/known_hosts
sudo rm -f ~/.ssh/authorized_keys*
# Remove Mininet files
#sudo rm -f /lib/modules/python2.5/site-packages/mininet*
#sudo rm -f /usr/bin/mnexec
# Remove Mininet files
#sudo rm -f /lib/modules/python2.5/site-packages/mininet*
#sudo rm -f /usr/bin/mnexec
# Clear optional dev script for SSH keychain load on boot
rm -f ~/.bash_profile
# Clear optional dev script for SSH keychain load on boot
rm -f ~/.bash_profile
# Clear git changes
git config --global user.name "None"
git config --global user.email "None"
# Clear git changes
git config --global user.name "None"
git config --global user.email "None"
# Remove mininet install script
rm -f install-mininet.sh
# Remove mininet install script
rm -f install-mininet.sh
}
function usage {
@@ -372,25 +378,25 @@ function usage {
if [ $# -eq 0 ]
then
all
all
else
while getopts 'abcdfhkmntvx' OPTION
do
case $OPTION in
a) all;;
b) cbench;;
c) kernel_clean;;
d) vm_clean;;
f) of;;
h) usage;;
k) kernel;;
m) modprobe;;
n) mn_deps;;
t) other;;
v) ovs;;
x) nox;;
?) usage;;
esac
done
shift $(($OPTIND - 1))
while getopts 'abcdfhkmntvx' OPTION
do
case $OPTION in
a) all;;
b) cbench;;
c) kernel_clean;;
d) vm_clean;;
f) of;;
h) usage;;
k) kernel;;
m) modprobe;;
n) mn_deps;;
t) other;;
v) ovs;;
x) nox;;
?) usage;;
esac
done
shift $(($OPTIND - 1))
fi