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-reactive-fwd.xml

diff --git a/tools/test/scenarios/net-reactive-fwd.xml b/tools/test/scenarios/net-reactive-fwd.xml
index 12831a4..5a7f926 100644
--- a/tools/test/scenarios/net-reactive-fwd.xml
+++ b/tools/test/scenarios/net-reactive-fwd.xml
@@ -14,18 +14,16 @@
   ~ limitations under the License.
   -->
 <scenario name="net-reactive-fwd" description="Network reactive forwarding test">
-    <!-- TODO: parametrize this via recipes -->
     <group name="Net-Reactive-Fwd">
         <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Net-Reactive-Fwd"/>
-        <dependency name="Net-Reactive-Fwd.Net-Activate-Fwd" requires="Net-Setup"/>
 
         <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Net-Reactive-Fwd"/>
         <dependency name="Net-Reactive-Fwd.Net-Pingall" requires="Net-Reactive-Fwd.Net-Activate-Fwd"/>
 
         <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Net-Reactive-Fwd"/>
-        <dependency name="Net-Reactive-Fwd.Net-Link-Down-Up" requires="Net-Setup,~Net-Reactive-Fwd.Net-Pingall"/>
+        <dependency name="Net-Reactive-Fwd.Net-Link-Down-Up" requires="~Net-Reactive-Fwd.Net-Pingall"/>
 
         <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Net-Reactive-Fwd"/>
-        <dependency name="Net-Reactive-Fwd.Net-Deactivate-Fwd" requires="Net-Reactive-Fwd.Net-Link-Down-Up"/>
+        <dependency name="Net-Reactive-Fwd.Net-Deactivate-Fwd" requires="~Net-Reactive-Fwd.Net-Link-Down-Up"/>
     </group>
 </scenario>