tutorial1 and sdnip tutorial
diff --git a/onos-setup-lxc.sh b/onos-setup-lxc.sh
index e5471a0..14110f4 100644
--- a/onos-setup-lxc.sh
+++ b/onos-setup-lxc.sh
@@ -27,6 +27,10 @@
sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.11 ls
sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.12 ls
sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.13 ls
+
+ sudo mkdir -p /home/$name/.wireshark/plugins
+ sudo cp /home/mininet/openflow.lua /home/$name/.wireshark/plugins
+ sudo chown -R $name:$name /home/$name/.wireshark
}
# ------------- Set up desktop environment -------------
@@ -74,6 +78,9 @@
echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections
sudo dpkg-reconfigure -f noninteractive wireshark-common
+# Get the wireshark dissector handy
+wget -O /home/mininet/openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=openflow.lua"
+
# -------------- Install ONOS ----------------
echo "Installing ONOS"
@@ -146,6 +153,35 @@
sudo sh -c "echo manual >> /var/lib/lxc/onos2/rootfs/etc/init/onos.override"
sudo sh -c "echo manual >> /var/lib/lxc/onos3/rootfs/etc/init/onos.override"
+# ------------- Create reset scripts -------------
+
+cat << EOF >> ${USER_HOME}/reset-to-1.sh
+#!/bin/bash
+export ONOS_ROOT=/home/mininet/onos
+. ${ONOS_ROOT}/tools/dev/bash_profile
+. ${ONOS_ROOT}/tools/build/envDefaults
+
+cell 3node
+onos-service --cell stop
+cell 1node
+onos-package
+onos-install -f $OC1
+EOF
+
+cat << EOF >> ${USER_HOME}/reset-to-3.sh
+#!/bin/bash
+export ONOS_ROOT=/home/mininet/onos
+. ${ONOS_ROOT}/tools/dev/bash_profile
+. ${ONOS_ROOT}/tools/build/envDefaults
+
+cell 3node
+onos-service --cell stop
+onos-package
+onos-install -f $OC1
+onos-install -f $OC2
+onos-install -f $OC3
+EOF
+
# ------------- Set up each tutorial -------------
create_user tutorial1 "Basic ONOS Tutorial"
@@ -155,14 +191,19 @@
sudo -u tutorial1 -H sh -c 'cp tutorial1-setup-lxc.sh ~/ && cd ~/ && sh tutorial1-setup-lxc.sh'
create_user sdnip "SDN-IP Tutorial"
+
+SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=sdnip-setup-lxc.sh'
+wget -O sdnip-setup-lxc.sh $SDNIP_URL
+sudo -u ${SDN_IP_USER} -H sh -c 'cp sdnip-setup-lxc.sh ~/ && cd ~/ && sh sdnip-setup-lxc.sh'
+
create_user distributed "Distributed Tutorial"
create_user optical "Optical Tutorial"
# ------------- Zero Unused Blocks -------------
#TODO investigate zerofree
-#echo "Zeroing unused blocks"
-#sync
-#dd if=/dev/zero of=tmp-zeros
-#sync
-#rm tmp-zeros
-#sync
+echo "Zeroing unused blocks"
+sync
+dd if=/dev/zero of=tmp-zeros
+sync
+rm tmp-zeros
+sync