Update to ONOS 1.2.1 and Karaf 3.0.3
diff --git a/.gitignore b/.gitignore
index e4e5f6c..f233571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-*~
\ No newline at end of file
+*~
+.project
+.pydevproject
\ No newline at end of file
diff --git a/dist-setup.sh b/dist-setup.sh
index a64ff3d..747ceee 100644
--- a/dist-setup.sh
+++ b/dist-setup.sh
@@ -22,7 +22,7 @@
sed -i -e 's/open/xdg-open/' ~/onos/tools/test/bin/onos-gui
-echo "export KARAF_TAR=/home/mininet/apache-karaf-3.0.2.tar.gz" >> ~/.bashrc
+echo "export KARAF_TAR=/home/mininet/apache-karaf-3.0.3.tar.gz" >> ~/.bashrc
echo "cell 3node > /dev/null" >> ~/.bashrc
diff --git a/onos-build-vm.py b/onos-build-vm.py
index cca5bc7..043fb93 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -17,8 +17,6 @@
print 'Cannot find Mininet build script. Exiting...'
sys.exit( 1 )
-onos_version='1.0.0'
-
# Import required functions from the Mininet build script
from build import bootAndRun, Prompt, OVFOSNameID, generateOVF, log, build, run
diff --git a/onos-setup.sh b/onos-setup.sh
index 0e569b2..121faf8 100644
--- a/onos-setup.sh
+++ b/onos-setup.sh
@@ -24,7 +24,7 @@
sudo chown $name:$name /home/$name/.ssh/id_rsa
sudo -u $name sh -c "echo \"export ONOS_ROOT=/home/mininet/onos\" >> /home/$name/.bashrc"
- sudo -u $name sh -c "echo \"export KARAF_ROOT=/home/mininet/apache-karaf-3.0.2\" >> /home/$name/.bashrc"
+ sudo -u $name sh -c "echo \"export KARAF_ROOT=/home/mininet/apache-karaf-3.0.3\" >> /home/$name/.bashrc"
sudo -u $name sh -c "echo \"export M2_REPO=/home/mininet/.m2/repository\" >> /home/$name/.bashrc"
sudo -u $name sh -c "echo \". /home/mininet/onos/tools/dev/bash_profile\" >> /home/$name/.bashrc"
@@ -95,22 +95,22 @@
cd ~
# Download a local karaf so we can use the bin directory
-wget http://archive.apache.org/dist/karaf/3.0.2/apache-karaf-3.0.2.tar.gz
-tar -xzf apache-karaf-3.0.2.tar.gz
+wget http://archive.apache.org/dist/karaf/3.0.3/apache-karaf-3.0.3.tar.gz
+tar -xzf apache-karaf-3.0.3.tar.gz
git clone https://gerrit.onosproject.org/onos
-cd onos && git checkout onos-1.1 && cd -
+cd onos && git checkout onos-1.2 && cd -
mkdir -p ~/Downloads
echo "export ONOS_ROOT=${USER_HOME}/onos" >> ~/.bashrc
-echo "export KARAF_ROOT=${USER_HOME}/apache-karaf-3.0.2" >> ~/.bashrc
+echo "export KARAF_ROOT=${USER_HOME}/apache-karaf-3.0.3" >> ~/.bashrc
echo ". ~/onos/tools/dev/bash_profile" >> ~/.bashrc
export ONOS_ROOT=${USER_HOME}/onos
-export KARAF_ROOT=${USER_HOME}/apache-karaf-3.0.2
+export KARAF_ROOT=${USER_HOME}/apache-karaf-3.0.3
. ~/onos/tools/dev/bash_profile
@@ -164,7 +164,7 @@
sudo rm -rf /tmp/*
export ONOS_ROOT=/home/mininet/onos
export M2_REPO=/home/mininet/.m2/repository
-export KARAF_TAR=/home/mininet/apache-karaf-3.0.2.tar.gz
+export KARAF_TAR=/home/mininet/apache-karaf-3.0.3.tar.gz
. ${ONOS_ROOT}/tools/dev/bash_profile
. ${ONOS_ROOT}/tools/build/envDefaults
@@ -189,7 +189,7 @@
sudo rm -rf /tmp/*
export ONOS_ROOT=/home/mininet/onos
export M2_REPO=/home/mininet/.m2/repository
-export KARAF_TAR=/home/mininet/apache-karaf-3.0.2.tar.gz
+export KARAF_TAR=/home/mininet/apache-karaf-3.0.3.tar.gz
. ${ONOS_ROOT}/tools/dev/bash_profile
. ${ONOS_ROOT}/tools/build/envDefaults
diff --git a/opt-setup.sh b/opt-setup.sh
index 697b90b..a5cb9c2 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -21,7 +21,7 @@
Name=ONOS
Name[en_US]=ONOS
Icon=konsole
-Exec=/usr/bin/lxterminal -t 'ONOS' -e '/home/mininet/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
+Exec=/usr/bin/lxterminal -t 'ONOS' -e '/home/mininet/apache-karaf-3.0.3/bin/client -u karaf -h 10.0.3.11'
Comment[en_US]=
EOF
diff --git a/sdnip-setup.sh b/sdnip-setup.sh
index ed1052d..45ee049 100644
--- a/sdnip-setup.sh
+++ b/sdnip-setup.sh
@@ -32,7 +32,7 @@
Name=ONOS
Name[en_US]=ONOS
Icon=konsole
-Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
+Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.3/bin/client -u karaf -h 10.0.3.11'
Comment[en_US]=
EOF
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
index 59748e8..e113353 100644
--- a/tutorial1-setup.sh
+++ b/tutorial1-setup.sh
@@ -20,7 +20,7 @@
Name=ONOS
Name[en_US]=ONOS
Icon=konsole
-Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
+Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.3/bin/client -u karaf -h 10.0.3.11'
Comment[en_US]=
EOF