commit cc0b7d660585d5f057f17416928b14440e2a1e9a
author Thomas Vachuska <tom@onlab.us> Tue Jul 12 14:03:11 2016 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Jul 13 13:16:06 2016 -0700
tree 501d0ae184bc1d2ff68273bc293957273e118f80
parent df352c6ddadcbc7657f54e23376ceed9033e6db6

Adding support for topology recipes and cleaning up topologies.

Cleaned-up a few STC scenarios.

Change-Id: I4ffa61953d8cf289406fa572ab7603d996e26a85

tools/test/scenarios/net-pingall.xml

diff --git a/tools/test/scenarios/net-pingall.xml b/tools/test/scenarios/net-pingall.xml
index 2eab5a7..863224a 100644
--- a/tools/test/scenarios/net-pingall.xml
+++ b/tools/test/scenarios/net-pingall.xml
@@ -14,14 +14,13 @@
   ~ limitations under the License.
   -->
 <scenario name="net-pingall" description="Network pingall test">
-    <!-- TODO: parametrize this via recipes -->
+    <!-- Note: This scenario is tailored using 'topo' recipe mechanism; see topos/*.recipe files -->
     <group name="Net-Pingall">
 
         <step name="Ping-All" requires="Check-Apps"
-              exec="onos-mininet sendAndExpect pingall --expect 600/600 received"/>
+              exec="onos-mininet sendAndExpect pingall --expect ${OPALL}/${OPALL} received"/>
 
         <step name="Check-Summary-For-Hosts" requires="~Ping-All"
-              exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
-
+              exec="onos-check-summary ${OC1} [0-9]* ${OTD} ${OTL} ${OTH}"/>
     </group>
 </scenario>