Tutorial bug fixes
diff --git a/dist-setup-lxc.sh b/dist-setup-lxc.sh
index 95c7123..87666ba 100644
--- a/dist-setup-lxc.sh
+++ b/dist-setup-lxc.sh
@@ -11,8 +11,16 @@
git clone https://github.com/bocon13/onos-byon.git
+# Pull ONOS code into local repo to compile against
+mkdir -p .m2/repository/org
+cp -r /home/mininet/.m2/repository/org/onosproject .m2/repository/org
+
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 "cell 3node > /dev/null" >> ~/.bashrc
+
+
cat > ~/startmn.sh << EOF
#!/bin/bash
sudo python ~/onos/tools/test/topos/sol.py \$OC1 \$OC2 \$OC3
@@ -69,6 +77,17 @@
Categories=GTK;Utility;TerminalEmulator;
EOF
+cat > ${DESKTOP}/Reset << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Reset
+Name[en_US]=Reset
+Icon=konsole
+Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e '/bin/bash -c /home/mininet/reset-to-3.sh'
+Comment[en_US]=
+EOF
+
sudo apt-get install -y git-review
# Install IntelliJ
diff --git a/onos-setup-lxc.sh b/onos-setup-lxc.sh
index 6762261..9003a39 100644
--- a/onos-setup-lxc.sh
+++ b/onos-setup-lxc.sh
@@ -166,6 +166,10 @@
sudo mn -c
+if [ -n "\$1 ]; then
+ export ONOS_FEATURES=\$ONOS_FEATURES,\$1
+fi
+
cell 3node
onos-service --cell stop
cell 1node
@@ -186,6 +190,10 @@
sudo mn -c
+if [ -n "\$1 ]; then
+ export ONOS_FEATURES=\$ONOS_FEATURES,\$1
+fi
+
cell 3node
onos-service --cell stop
onos-package
diff --git a/opt-setup-lxc.sh b/opt-setup-lxc.sh
index 7887d15..d048652 100644
--- a/opt-setup-lxc.sh
+++ b/opt-setup-lxc.sh
@@ -96,29 +96,18 @@
Name=Reset ONOS
Name[en_US]=Reset ONOS
Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e '/bin/bash -c /home/mininet/reset-to-1.sh'
+Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e '/bin/bash -c "/home/mininet/reset-to-1.sh onos-app-proxyarp,onos-app-optical"'
Comment[en_US]=
EOF
-cat > ${DESKTOP}/Reset << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Reset
-Name[en_US]=Reset
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo mn -c'
-Comment[en_US]=
-EOF
-
ln -s /home/mininet/onos onos
ln -s /home/mininet/.m2 .m2
# -------------- Setup LINC & dependencies ---------------
git clone https://github.com/FlowForwarding/LINC-config-generator.git
cd ~/LINC-config-generator
-git checkout oe-0.4
+cp priv/* .
make
cd
@@ -126,5 +115,5 @@
cd linc-oe
sed -i s/3000/300000/ rel/files/vm.args
cp rel/files/sys.config.orig rel/files/sys.config
-make rel
+make
cd
\ No newline at end of file
diff --git a/sdnip-setup-lxc.sh b/sdnip-setup-lxc.sh
index fbcf901..729c1a9 100644
--- a/sdnip-setup-lxc.sh
+++ b/sdnip-setup-lxc.sh
@@ -14,7 +14,7 @@
#--------------- Add iptables rule for BGP-ONOS communication -----
-echo \"sudo iptables -A PREROUTING -t nat -i root-eth0 -p tcp --dport 2000 -j DNAT --to 10.0.3.11:2000 \" >> /home/sdnip/.bashrc"
+echo "sudo iptables -A PREROUTING -t nat -i root-eth0 -p tcp --dport 2000 -j DNAT --to 10.0.3.11:2000 " >> /home/sdnip/.xprofile
DESKTOP=/home/${USER}/Desktop