fixes plus added optical and distributed
diff --git a/onos-setup-lxc.sh b/onos-setup-lxc.sh
index 14110f4..7e105e3 100644
--- a/onos-setup-lxc.sh
+++ b/onos-setup-lxc.sh
@@ -121,7 +121,7 @@
export OC1="10.0.3.11"
export OC2="10.0.3.12"
export OC3="10.0.3.13"
-export OCI="${OC1}"
+export OCI="10.0.3.11"
export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
export ONOS_USER="sdn"
EOF
@@ -129,7 +129,7 @@
cat << EOF >> onos/tools/test/cells/1node
export ONOS_NIC=10.0.3.*
export OC1="10.0.3.11"
-export OCI="${OC1}"
+export OCI="10.0.3.11"
export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
export ONOS_USER="sdn"
EOF
@@ -158,6 +158,8 @@
cat << EOF >> ${USER_HOME}/reset-to-1.sh
#!/bin/bash
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
. ${ONOS_ROOT}/tools/dev/bash_profile
. ${ONOS_ROOT}/tools/build/envDefaults
@@ -165,23 +167,29 @@
onos-service --cell stop
cell 1node
onos-package
-onos-install -f $OC1
+onos-install -f '$OC1'
EOF
+sudo chmod 777 ${USER_HOME}/reset-to-1.sh
+
cat << EOF >> ${USER_HOME}/reset-to-3.sh
#!/bin/bash
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
. ${ONOS_ROOT}/tools/dev/bash_profile
. ${ONOS_ROOT}/tools/build/envDefaults
cell 3node
onos-service --cell stop
onos-package
-onos-install -f $OC1
-onos-install -f $OC2
-onos-install -f $OC3
+onos-install -f '$OC1'
+onos-install -f '$OC2'
+onos-install -f '$OC3'
EOF
+sudo chmod 777 ${USER_HOME}/reset-to-3.sh
+
# ------------- Set up each tutorial -------------
create_user tutorial1 "Basic ONOS Tutorial"
@@ -194,11 +202,20 @@
SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=sdnip-setup-lxc.sh'
wget -O sdnip-setup-lxc.sh $SDNIP_URL
-sudo -u ${SDN_IP_USER} -H sh -c 'cp sdnip-setup-lxc.sh ~/ && cd ~/ && sh sdnip-setup-lxc.sh'
+sudo -u sdnip -H sh -c 'cp sdnip-setup-lxc.sh ~/ && cd ~/ && sh sdnip-setup-lxc.sh'
create_user distributed "Distributed Tutorial"
+
+DIST_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=dist-setup-lxc.sh'
+wget -O dist-setup-lxc.sh $DIST_URL
+sudo -u distributed -H sh -c 'cp dist-setup-lxc.sh ~/ && cd ~/ && sh dist-setup-lxc.sh'
+
create_user optical "Optical Tutorial"
+OPT_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=opt-setup-lxc.sh'
+wget -O opt-setup.sh $OPT_URL
+sudo -u optical -H sh -c 'cp opt-setup-lxc.sh ~/ && cd ~/ && sh opt-setup-lxc.sh'
+
# ------------- Zero Unused Blocks -------------
#TODO investigate zerofree
echo "Zeroing unused blocks"