홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
2495b98b 1 parent 0ecdb323

Make REST test run on multi node cell 

Change-Id: Iea40da50c58fd0236b76ccd1c838344d64ac0131
Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 requires="Net-REST.Create-Intent-YX" 103 requires="Net-REST.Create-Intent-YX"
104 exec="curl -f -uonos:rocks ${xyLocation}"/> 104 exec="curl -f -uonos:rocks ${xyLocation}"/>
105 <step name="Net-REST.Validate-Intent-YX-Installed" 105 <step name="Net-REST.Validate-Intent-YX-Installed"
106 - requires="Net-REST.Create-Intent-YX" 106 + requires="^"
107 exec="curl -f -uonos:rocks ${yxLocation}"/> 107 exec="curl -f -uonos:rocks ${yxLocation}"/>
108 108
109 <!-- Use REST API to query flows created by the intents --> 109 <!-- Use REST API to query flows created by the intents -->
...@@ -149,9 +149,11 @@ ...@@ -149,9 +149,11 @@
149 env="!"/> 149 env="!"/>
150 150
151 <!-- Check that the deleted intents no longer appear in the REST API --> 151 <!-- Check that the deleted intents no longer appear in the REST API -->
152 - <step name="Net-REST.Validate-Intent-XY-Removed" requires="Net-REST.Delete-Intent-XY" 152 + <step name="Net-REST.Allow-Intents-To-Purge" requires="Net-REST.Delete-Intent-XY"
153 + exec="sleep 1"/>
154 + <step name="Net-REST.Validate-Intent-XY-Removed" requires="Net-REST.Allow-Intents-To-Purge"
153 exec="curl -f -uonos:rocks ${xyLocation}" env="!"/> 155 exec="curl -f -uonos:rocks ${xyLocation}" env="!"/>
154 - <step name="Net-REST.Validate-Intent-YX-Removed" requires="Net-REST.Delete-Intent-YX" 156 + <step name="Net-REST.Validate-Intent-YX-Removed" requires="Net-REST.Allow-Intents-To-Purge"
155 exec="curl -f -uonos:rocks ${yxLocation}" env="!"/> 157 exec="curl -f -uonos:rocks ${yxLocation}" env="!"/>
156 158
157 </group> 159 </group>
......