commit 85314296e1c08a79f3015c53315c6dcc0b943a3c
author Thomas Vachuska <tom@onlab.us> Fri Nov 14 17:52:12 2014 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Sat Nov 15 11:40:46 2014 -0800
tree 2c6df744a475f8f52ab11486e8626561b3e72380
parent 57126feac109178639e5ea95250d8a8b28b08bcc

Added a short-hand for setting the OCI variable.
Added export.

Change-Id: I1e9b5366ce460995d494f7df81659fea0b6c8584

tools/dev/bash_profile

diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index c383c54..586c8a6 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -46,6 +46,7 @@
 alias ot='onos-test'
 alias ol='onos-log'
 alias ow='onos-watch'
+alias oi='setPrimaryInstance'
 alias go='ob && ot && onos -w'
 alias pub='onos-push-update-bundle'
 
@@ -99,6 +100,12 @@
     done
 }
 
+# Sets the primary instance to the specified instance number.
+function setPrimaryInstance {
+    export OCI=$(env | egrep "OC[0-9]+" | sort | egrep OC${1:-1} | cut -d= -f2)
+    echo $OCI
+}
+
 # Miscellaneous
 function spy {
     ps -ef | egrep "$@" | grep -v egrep

tools/test/bin/onos-show-cell

diff --git a/tools/test/bin/onos-show-cell b/tools/test/bin/onos-show-cell
index 5aee338..559ecaf 100755
--- a/tools/test/bin/onos-show-cell
+++ b/tools/test/bin/onos-show-cell
@@ -25,7 +25,7 @@
     cell="${1}"
 else
     if [ -z "${ONOS_CELL}" ]; then
-        echo "Environmental variable 'ONOS_CELL' is not defiled"
+        echo "Environmental variable 'ONOS_CELL' is not defined"
         exit 1
     else
         cell="${ONOS_CELL}"

tools/test/bin/onos-topo-cfg

diff --git a/tools/test/bin/onos-topo-cfg b/tools/test/bin/onos-topo-cfg
index d3a4f0d..258bfe7 100755
--- a/tools/test/bin/onos-topo-cfg
+++ b/tools/test/bin/onos-topo-cfg
@@ -6,7 +6,7 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-node="${1:-$OC1}"
+node="${1:-$OCI}"
 file="${2:-$ONOS_ROOT/tools/test/topos/oe-linear-3.json}"
 
 curl -sS --fail -L -X POST -H 'Content-Type:application/json' \