Madan Jampani

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

...@@ -31,5 +31,5 @@ if [ -n "${ONOS_CELL}" -a -f $ONOS_ROOT/tools/test/cells/${ONOS_CELL} ]; then ...@@ -31,5 +31,5 @@ if [ -n "${ONOS_CELL}" -a -f $ONOS_ROOT/tools/test/cells/${ONOS_CELL} ]; then
31 fi 31 fi
32 export ONOS_INSTALL_DIR="/opt/onos" # Installation directory on remote 32 export ONOS_INSTALL_DIR="/opt/onos" # Installation directory on remote
33 export OCI="${OCI:-192.168.56.101}" # ONOS Controller Instance 33 export OCI="${OCI:-192.168.56.101}" # ONOS Controller Instance
34 -export ONOS_USER="sdn" # ONOS user on remote system 34 +export ONOS_USER="${ONOS_USER:-sdn}" # ONOS user on remote system
35 export ONOS_PWD="rocks" # ONOS user password on remote system 35 export ONOS_PWD="rocks" # ONOS user password on remote system
......