commit 0872a1743c9563951722596b0fd24f7a921f9e5b
author tom <tom@onlab.us> Tue Sep 23 11:24:26 2014 -0700
committer tom <tom@onlab.us> Tue Sep 23 11:24:26 2014 -0700
tree 6e221b6499b577d6776d64d723cb1662ca792023
parent ac60c089d24472f2b0fadfb2e7b94cc6e3b80a16

Fixed a number of CLI commands.
Refactored the StoreService/Manager stuff for common serializer pool.

tools/dev/bash_profile

diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 8304bb2..94bb578 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -46,7 +46,8 @@
 # Test related conveniences
 
 # SSH to a specified ONOS instance
-alias sshctl=onos-ssh
+alias sshctl='onos-ssh'
+alias sshnet='onos-ssh $OCN'
 
 # Applies the settings in the specified cell file or lists current cell definition
 # if no cell file is given.
@@ -62,6 +63,7 @@
         env | egrep "ONOS_CELL"
         env | egrep "OCI"
         env | egrep "OC[0-9]+" | sort
+        env | egrep "OCN"
     fi
 }
 

tools/test/bin/onos-verify-cell

diff --git a/tools/test/bin/onos-verify-cell b/tools/test/bin/onos-verify-cell
index 8e7fe99..9a5f5a9 100755
--- a/tools/test/bin/onos-verify-cell
+++ b/tools/test/bin/onos-verify-cell
@@ -6,6 +6,6 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-for node in $(env | sort | egrep "OC[0-9]+" | cut -d= -f2); do
+for node in $(env | sort | egrep "OC[0-9N]+" | cut -d= -f2); do
     printf "%s: " $node; ssh -n -o PasswordAuthentication=no $ONOS_USER@$node date
 done
\ No newline at end of file

tools/test/cells/local

diff --git a/tools/test/cells/local b/tools/test/cells/local
index 37911dd..3d71a1e 100644
--- a/tools/test/cells/local
+++ b/tools/test/cells/local
@@ -1,7 +1,8 @@
-# Default virtual box ONOS instances 1,2 & 3
+# Default virtual box ONOS instances 1,2 & ONOS mininet box
 
 export OC1="192.168.56.101"
 export OC2="192.168.56.102"
-export OC3="192.168.56.103"
+
+export OCN="192.168.56.103"