Fixing a few tools to work with the new REST security stuff.
Change-Id: I1fcff24bf57e3198c16df5a6e42d721a004e9097
diff --git a/tools/test/bin/onos-form-cluster b/tools/test/bin/onos-form-cluster
index f1d3429..b6823b1 100755
--- a/tools/test/bin/onos-form-cluster
+++ b/tools/test/bin/onos-form-cluster
@@ -6,10 +6,22 @@
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/build/envDefaults
+# Scan arguments for user/password or other options...
+while getopts u:p: o; do
+ case "$o" in
+ u) user=$OPTARG;;
+ p) password=$OPTARG;;
+ esac
+done
+user=${user:-onos} # user defaults to 'onos'
+password=${password:-$user} # password defaults to user name if not specified
+let OPC=$OPTIND-1
+shift $OPC
+
node=${1:-$OCI}
if [ $node = "cell" ]; then
- nodes=$(env | grep "OC[0-9]*=" | cut -d= -f2)
+ nodes=${ONOS_INSTANCES}
node=${OCI}
else
nodes="$@"
@@ -17,4 +29,4 @@
set -x
-ssh $ONOS_USER@$node /tmp/$ONOS_BITS/bin/onos-form-cluster $nodes
\ No newline at end of file
+ssh $ONOS_USER@$node /tmp/$ONOS_BITS/bin/onos-form-cluster -u $user -p $password $nodes
\ No newline at end of file