Cleaning up
Change-Id: Ifce5e878cc65d0b10407333ff2ed59167daef7ed
diff --git a/opt-setup.sh b/opt-setup.sh
index 4d08ce8..2be98c3 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -110,45 +110,21 @@
make rel
cd
-# -------------- Setup and instal ONOS ---------------
+# -------------- Setup and install ONOS ---------------
git clone https://gerrit.onosproject.org/onos -b onos-1.0
-cd 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 "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
-echo "sudo service onos stop > /dev/null 2>&1" >> ~/.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
+# Setup profile
+echo "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
+echo "sudo service onos stop > /dev/null 2>&1" >> ~/.profile