adding vm scripts
diff --git a/vm-setup.sh b/vm-setup.sh
index 0494f0c..da71353 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -3,46 +3,43 @@
#
# This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
-USER=mininet
+
+USER=tutorial1
USER_HOME=/home/${USER}
+/usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${USER} -U -m -p $(openssl passwd -1 ${USER}) -s /bin/bash ${USER}
+
+echo "${USER} ALL=NOPASSWD: ALL" >> /etc/sudoers
+
sudo apt-get update
-# -------------- Bufferbloat Install ----------
+sudo apt-get install -y git maven openjdk-8-jdk unzip
-cd ~
-git clone https://bitbucket.org/huangty/cs144_bufferbloat.git
-sudo apt-get -y install screen
-sudo apt-get -y install python-matplotlib
+#--------------- Setup Mininet ----------------
-# -------------- BGP-attack Install -----------
+git clone git://github.com/mininet/mininet
-git clone https://bitbucket.org/jvimal/bgp.git
-cd bgp
-./install.sh
-cd ~
+mininet/util/install.sh -a
-# ------------- DHCP demo Install ------------
+# -------------- Switch User ------------------
-git clone https://bitbucket.org/lantz/cs144-dhcp.git
+su - ${USER}
-# -------------- Offline content -------------
-sudo apt-get install -y python-pip
-sudo pip install grip
+# -------------- Setup keys -------------------
-git clone https://github.com/mininet/mininet.wiki.git
-cd mininet.wiki
-grip --gfm --export Bufferbloat.md
-grip --gfm --export Dhcp-masquerade-attack.md
-grip --gfm --export BGP-Path-Hijacking-Attack-Demo.md
+ssh-keygen -t dsa -P "" -f .ssh/id_dsa
+cp .ssh/id_dsa.pub .ssh/authorized_keys
+
+# -------------- Install Karaf ----------------
+
+mkdir Downloads
+cd Downloads
+wget http://mirror.nexcess.net/apache/karaf/3.0.2/apache-karaf-3.0.2.zip
+cd -
# -------------- Setup Desktop ----------------
-sudo apt-get install -y xorg lxde
-# DHCP dependencies
-cd cs144-dhcp
-sudo python -c "import dhcp; dhcp.checkRequired()"
-cd ~
+sudo apt-get install -y xorg lxde
#TODO: add backgrounds folder
sudo mkdir /usr/share/backgrounds
@@ -80,14 +77,14 @@
mkdir -p ${DESKTOP}
mkdir -p "${OFFLINE}"
-cat > ${DESKTOP}/Terminal << EOF
+cat > ${DESKTOP}/ONOS << EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Terminal
Name[en_US]=Terminal
Icon=konsole
-Exec=/usr/bin/x-terminal-emulator
+Exec=/usr/bin/xterm -e '/opt/onos/apache-karaf-3.0.2/bin/client -u karaf'
Comment[en_US]=
EOF
@@ -95,6 +92,19 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
+Name=Terminal
+Name[en_US]=Mininet
+Icon=konsole
+Exec=/usr/bin/xterm -e 'sudo python ~/onos-next/tools/test/topos/sol.py 127.0.0.1'
+Comment[en_US]=
+EOF
+
+
+
+cat > ${DESKTOP}/Tutorial << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
Name=Teaching with Mininet
Name[en_US]=Teaching with Mininet
Icon=internet-web-browser
@@ -113,39 +123,6 @@
Comment[en_US]=
EOF
-cat > "${OFFLINE}/Bufferbloat" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Bufferbloat
-Name[en_US]=Bufferbloat
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/Bufferbloat.html
-Comment[en_US]=
-EOF
-
-cat > "${OFFLINE}/DHCP Attack" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=DHCP Attack
-Name[en_US]=DHCP Attack
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/Dhcp-masquerade-attack.html
-Comment[en_US]=
-EOF
-
-cat > "${OFFLINE}/BGP Hijacking" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=BGP Hijacking
-Name[en_US]=BGP Hijacking
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/BGP-Path-Hijacking-Attack-Demo.html
-Comment[en_US]=
-EOF
-
# ------------- Install Other Tools -------------
sudo apt-get install -y wireshark
# Enable root-less wireshark and add mininet