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-flow-objectives.xml

diff --git a/tools/test/scenarios/net-flow-objectives.xml b/tools/test/scenarios/net-flow-objectives.xml
index aadfe94..be7fa45 100644
--- a/tools/test/scenarios/net-flow-objectives.xml
+++ b/tools/test/scenarios/net-flow-objectives.xml
@@ -18,14 +18,8 @@
     <!-- TODO: parametrize this via recipes -->
     <group name="Net-Flow-Objectives">
 
-        <!-- Make sure that reactive forwarding is off -->
-        <step name="Net-Flow-Objectives.Uninstall-Reactive-Forwarding"
-              exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
-        <step name="Net-Flow-Objectives.Check-Apps" requires="^"
-              exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
-
         <!-- Force discovery of hosts -->
-        <step name="Net-Flow-Objectives.Find-Host-1" requires="^"
+        <step name="Net-Flow-Objectives.Find-Host-1"
               exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect ."/>
         <step name="Net-Flow-Objectives.Find-Host-2" requires="^"
               exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect ."/>