commit 1c15287d06a04b1aadfa2d3b80f658eef9b94486
author Thomas Vachuska <tom@onlab.us> Wed Aug 26 18:41:10 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Aug 26 19:37:10 2015 -0700
tree e93918f686735931b671a249113942213856fab4
parent e4ed1a215b3ea9fd1dd4d67b08a43a4d3ea89e50

Added check for cyclic dependencies.

Changes intent test scenarios to use the key and added dependencies to make them more robust; h2h still fails intermittently due to a bug.

Increased parallelism of the smoke test scenario.

Change-Id: Ib7fed38d17d1b25c5dd854ef1cd4dc777002c5fc

tools/test/scenarios/net-link-down-up.xml

diff --git a/tools/test/scenarios/net-link-down-up.xml b/tools/test/scenarios/net-link-down-up.xml
index 70a8fee..8bcbfa7 100644
--- a/tools/test/scenarios/net-link-down-up.xml
+++ b/tools/test/scenarios/net-link-down-up.xml
@@ -18,21 +18,21 @@
     <group name="Net-Link-Down-Up">
         <step name="Ping-1"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
-        <step name="Link-1-Down" requires="Ping-1"
+        <step name="Link-1-Down" requires="~Ping-1"
               exec="onos-mininet sendAndExpect link s4 s7 down --expect ."/>
-        <step name="Ping-2" requires="Link-1-Down"
+        <step name="Ping-2" requires="~Link-1-Down"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
-        <step name="Link-2-Down" requires="Ping-2"
+        <step name="Link-2-Down" requires="~Ping-2"
               exec="onos-mininet sendAndExpect link s4 s5 down --expect ."/>
-        <step name="Ping-3" requires="Link-2-Down"
-              exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect 100% packet loss"/>
-        <step name="Link-1-Up" requires="Ping-3"
+        <step name="Ping-3" requires="~Link-2-Down"
+              exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect 100% packet loss"/>
+        <step name="Link-1-Up" requires="~Ping-3"
               exec="onos-mininet sendAndExpect link s4 s7 up --expect ."/>
-        <step name="Ping-4" requires="Link-1-Up"
+        <step name="Ping-4" requires="~Link-1-Up"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
-        <step name="Link-2-Up" requires="Ping-4"
+        <step name="Link-2-Up" requires="~Ping-4"
               exec="onos-mininet sendAndExpect link s4 s5 up --expect ."/>
-        <step name="Ping-5" requires="Link-2-Up"
+        <step name="Ping-5" requires="~Link-2-Up"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
     </group>
 </scenario>
\ No newline at end of file