commit 1815c7f492d8ba9db380a79ed6307f4a84a31349
author Thomas Vachuska <tom@opennetworking.org> Tue Dec 12 10:17:54 2017 -0800
committer Ray Milkey <ray@opennetworking.org> Tue Dec 12 19:23:14 2017 +0000
tree 60c12e2edf787ba5d6900458856a1b85a8245176
parent 1cf233c1fea9b1979149981b7c63add2587d3384

Fixed the tar-setup scenario to secure ssh in parallel.

Change-Id: I3b70d9c56f0d3a65ab676a26cd2f56934650e544

tools/test/scenarios/tar-setup.xml

diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index f51a0e0..6611663 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -16,7 +16,6 @@
 <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 -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS}"/>
 
         <parallel var="${OC#}">
             <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
@@ -26,18 +25,19 @@
             <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="Secure-SSH-${#}"
+                  exec="onos-secure-ssh -u ${ONOS_WEB_USER} -p ${ONOS_WEB_PASS} ${OC#}"
+                  requires="Untar-And-Run-${#}"/>
 
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
-                  requires="Untar-And-Run-${#},~Secure-SSH"/>
+                  requires="~Secure-SSH-${#}"/>
 
             <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
             <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
-            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
+            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers includes"
                   requires="~Wait-for-Start-${#}"/>
-
             <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
                   requires="~Wait-for-Start-${#}"/>
         </parallel>
@@ -53,9 +53,8 @@
                   requires="~Wait-for-Start-Again-${#}"/>
             <step name="Check-Components-Again-${#}" exec="onos-check-components ${OC#}"
                   requires="~Wait-for-Start-Again-${#}"/>
-            <step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers"
+            <step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers includes"
                   requires="~Wait-for-Start-Again-${#}"/>
-
             <step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
                   requires="~Wait-for-Start-Again-${#}"/>
         </parallel>