Fixing a few tools to work with the new REST security stuff.
Change-Id: I1fcff24bf57e3198c16df5a6e42d721a004e9097
diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index 8420528..e330b2d 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -16,7 +16,7 @@
<scenario name="tar-setup" description="ONOS cluster setup via onos.tar.gz">
<group name="Setup-Instances">
<step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
- <step name="Secure-SSH" exec="onos-secure-ssh" if="${ONOS_USE_SSH}"/>
+ <step name="Secure-SSH" exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS}" if="${ONOS_USE_SSH}"/>
<parallel var="${OC#}">
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
@@ -44,7 +44,7 @@
</group>
<group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}">
- <step name="Form-Cluster" exec="onos-form-cluster cell"/>
+ <step name="Form-Cluster" exec="onos-form-cluster -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS} cell"/>
<parallel var="${OC#}">
<step name="Wait-for-Start-Again-${#}" exec="onos-wait-for-start ${OC#}"
requires="Form-Cluster"/>