Change onos-wait-for-start and onos-service to allow addressing nodes by integer

(e.g. you can use 1 instead of $OC1)

Change-Id: I2bbf18c55da713bf0947d3597710d59ed6f41dc1

@@ -5,6 +5,7 @@
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
+. $ONOS_ROOT/tools/test/bin/find-node.sh
 
 function print_usage {
     command_name=`basename $0`
@@ -38,7 +39,7 @@ case $2 in
         if [ "${1}" = "--cell" ]; then
             nodes=$(env | sort | egrep "OC[0-9]+" | cut -d= -f2)
         else
-            nodes=${1:-$OCI}
+            nodes=$(find_node ${1:-$OCI})
         fi
 
         # Execute the remote commands

@@ -5,8 +5,11 @@
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
+. $ONOS_ROOT/tools/test/bin/find-node.sh
 
-remote=$ONOS_USER@${1:-$OCI}
+node=$(find_node ${1:-$OCI})
+
+remote=$ONOS_USER@$node
 
 ssh -t $remote "
     # Wait until we reach the run-level 100