Introducing optional ability to secure the ONOS karaf shell and to use raw ssh client.
Change-Id: I48cfc922eaf980d1cb8b9182b26999ce3c26b667
diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index b91cbf8..8420528 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -16,6 +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}"/>
<parallel var="${OC#}">
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
@@ -25,8 +26,10 @@
<step name="Untar-And-Run-${#}" exec="onos-untar-and-run ${OC#}"
requires="Kill-${#},Push-Bits-${#},Push-Bits"/>
+ <dependency name="Secure-SSH" requires="Untar-And-Run-${#}"/>
+
<step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
- requires="Untar-And-Run-${#}"/>
+ requires="Untar-And-Run-${#},~Secure-SSH"/>
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>