commit 955c4b8256930992124d2f7a28a6aa53124a961f
author Ray Milkey <ray@onlab.us> Mon Jul 11 09:48:53 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 11 23:23:15 2016 +0000
tree 8bf44f720d6bb502e31f285c26fd87e74412c017
parent deac28bfbbaf0d8a1452272ac31c20c52db38416

Refactor activate/deactivate of forwarding app

Change-Id: Iae71b3334fba08dceac7adb47a457ae0af0dcabc

tools/test/scenarios/net-smoke.xml

diff --git a/tools/test/scenarios/net-smoke.xml b/tools/test/scenarios/net-smoke.xml
index 980a011..4804927 100644
--- a/tools/test/scenarios/net-smoke.xml
+++ b/tools/test/scenarios/net-smoke.xml
@@ -17,12 +17,18 @@
     <group name="Net-Smoke">
         <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
 
+        <import file="${ONOS_SCENARIOS}/net-activate-fwd.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Activate-Fwd" requires="Net-Setup"/>
+
         <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
-        <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/>
+        <dependency name="Reactive-Forwarding.Net-Pingall" requires="Reactive-Forwarding.Net-Activate-Fwd"/>
 
         <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
         <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="Net-Setup,~Reactive-Forwarding.Net-Pingall"/>
 
+        <import file="${ONOS_SCENARIOS}/net-deactivate-fwd.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Deactivate-Fwd" requires="Reactive-Forwarding.Net-Link-Down-Up"/>
+
         <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
         <dependency name="Host-Intent-Connectivity" requires="Net-Setup,~Reactive-Forwarding.Net-Link-Down-Up"/>
 
@@ -36,7 +42,7 @@
         <import file="${ONOS_SCENARIOS}/net-multi-to-single-intent.xml"/>
         <dependency name="M2S-Intent-Connectivity"
                     requires="S2M-Intent-Connectivity"/>
-        
+
         <import file="${ONOS_SCENARIOS}/net-rest.xml"/>
         <dependency name="Net-REST" requires="Net-Setup,P2P-Intent-Connectivity,M2S-Intent-Connectivity"/>