Reinstall onos completely for pkt/optical tutorial
Change-Id: I145d02f53ae571eb00dfcca97ee27f9c9c97c58e
diff --git a/dist-setup.sh b/dist-setup.sh
index 51426f3..0ff8055 100644
--- a/dist-setup.sh
+++ b/dist-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# vm-setup.sh
#
-# This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
+# This script installs ONOS dependencies and installs a desktop environment on a Mininet VM.
export CURRENT_USER=distributed
diff --git a/onos-setup.sh b/onos-setup.sh
index 2e29ba7..69c26ea 100644
--- a/onos-setup.sh
+++ b/onos-setup.sh
@@ -38,7 +38,6 @@
onos $OC1 "feature:install onos-app-fwd"
onos $OC1 "feature:install onos-app-ifwd"
onos $OC1 "feature:install onos-app-sdnip"
-onos $OC1 "feature:install onos-app-optical"
# Sleep a little to let the features load up
sleep 20
diff --git a/opt-setup.sh b/opt-setup.sh
index 96cf23d..47e1051 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -56,8 +56,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
-Name=Packet-Optical Tutorial
-Name[en_US]=Packet-Optical Tutorial
+Name=Tutorial
+Name[en_US]=Tutorial
Icon=internet-web-browser
Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Packet+Optical+Tutorial
Comment[en_US]=
@@ -110,7 +110,40 @@
make rel
cd
-# -------------- Setup and instal ONOS (needed for oecfg) ---------------
-git clone https://gerrit.onosproject.org/onos -b onos-1.0
-cd ~/onos
-mvn clean install
+# -------------- Setup and instal ONOS ---------------
+export ONOS_USER=$CURRENT_USER
+
+export ONOS_ROOT=~/onos
+export KARAF_ROOT=/opt/onos/apache-karaf-3.0.2
+source $ONOS_ROOT/tools/dev/bash_profile
+echo $JAVA_HOME
+export JAVA_HOME=""
+cd $ONOS_ROOT && mvn clean install && mvn dependency:go-offline && cd -
+
+sed -i -e s/sdn/$USER/ onos/tools/package/debian/onos.conf
+
+cat << EOF >> onos/tools/test/cells/optical
+export ONOS_NIC=127.0.0.*
+export OC1="127.0.0.1"
+export OCI="${OC1}"
+export ONOS_FEATURES="webconsole,onos-rest,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-gui,onos-app-optical"
+export ONOS_USER="optical"
+EOF
+
+cell optical
+
+onos-package
+onos-install -f $OC1
+onos-wait-for-start $OC1
+onos $OC1 "feature:install onos-app-fwd"
+onos $OC1 "feature:install onos-app-ifwd"
+onos $OC1 "feature:install onos-app-sdnip"
+onos $OC1 "feature:install onos-app-optical"
+
+# Sleep a little to let the features load up
+sleep 20
+
+sudo echo 'export ONOS_OPTS="clean debug"' > /opt/onos/options
+
+sudo su -c 'echo GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\" >> /etc/default/grub'
+sudo su -c update-grub