commit 35349334f3510e687a946be89e950fdff4e24fb3
author Thomas Vachuska <tom@onlab.us> Mon Apr 04 14:06:46 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 04 21:57:31 2016 +0000
tree a043618cb074158c84bd8642255a1bec6807fabc
parent 4499f163a9f8c16316403eb6b5984b6f17b82469

Changing onos-secure-ssh test tool and scenario to allow parallel execution of the onos-secure-ssh tool.

Change-Id: I83b6649f721da4e25c741c0d1fbd90a6ba015135

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 10f6ba6..9e992f5 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -16,7 +16,6 @@
 <scenario name="setup" description="ONOS cluster setup">
     <group name="Setup">
         <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
-        <step name="Secure-SSH" exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS}" if="${ONOS_USE_SSH}"/>
         <step name="Enable-Flow-Objective-Intents" if="${ONOS_USE_FOI}"
               exec="onos ${OC1} cfg set org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator useFlowObjectives true"/>
 
@@ -30,10 +29,12 @@
             <step name="Install-${#}" exec="onos-install ${OC#}"
                   requires="Kill-${#},Push-Bits-${#},Push-Bits"/>
 
-            <dependency name="Secure-SSH" requires="Install-${#}"/>
+            <step name="Secure-SSH-${#}" requires="Install-${#}"
+                  exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS} ${OC#}"
+                  if="${ONOS_USE_SSH}"/>
 
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
-                  requires="Install-${#},~Secure-SSH"/>
+                  requires="Install-${#},~Secure-SSH-${#}"/>
 
             <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#}" delay="3"
                   requires="~Wait-for-Start-${#}"/>