commit 2495b98ba9fc40ae9eff874249143facfa92637f
author Ray Milkey <ray@onlab.us> Thu Sep 03 18:00:09 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Sep 04 01:04:13 2015 +0000
tree 1edce4af6151464a0265ae27ee1b6960c811db81
parent 0ecdb3235423ff3bc93b6fbcec50750d0729a81a

Make REST test run on multi node cell

Change-Id: Iea40da50c58fd0236b76ccd1c838344d64ac0131

tools/test/scenarios/net-rest.xml

diff --git a/tools/test/scenarios/net-rest.xml b/tools/test/scenarios/net-rest.xml
index ec212fe..fc7b1d0 100644
--- a/tools/test/scenarios/net-rest.xml
+++ b/tools/test/scenarios/net-rest.xml
@@ -103,7 +103,7 @@
               requires="Net-REST.Create-Intent-YX"
               exec="curl -f -uonos:rocks ${xyLocation}"/>
         <step name="Net-REST.Validate-Intent-YX-Installed"
-              requires="Net-REST.Create-Intent-YX"
+              requires="^"
               exec="curl -f -uonos:rocks ${yxLocation}"/>
 
         <!-- Use REST API to query flows created by the intents -->
@@ -149,9 +149,11 @@
               env="!"/>
 
         <!-- Check that the deleted intents no longer appear in the REST API -->
-        <step name="Net-REST.Validate-Intent-XY-Removed" requires="Net-REST.Delete-Intent-XY"
+        <step name="Net-REST.Allow-Intents-To-Purge" requires="Net-REST.Delete-Intent-XY"
+              exec="sleep 1"/>
+        <step name="Net-REST.Validate-Intent-XY-Removed" requires="Net-REST.Allow-Intents-To-Purge"
               exec="curl -f -uonos:rocks ${xyLocation}" env="!"/>
-        <step name="Net-REST.Validate-Intent-YX-Removed" requires="Net-REST.Delete-Intent-YX"
+        <step name="Net-REST.Validate-Intent-YX-Removed" requires="Net-REST.Allow-Intents-To-Purge"
               exec="curl -f -uonos:rocks ${yxLocation}" env="!"/>
 
     </group>