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-create-flows.xml

diff --git a/tools/test/scenarios/net-create-flows.xml b/tools/test/scenarios/net-create-flows.xml
index f16501e..b0e2782 100644
--- a/tools/test/scenarios/net-create-flows.xml
+++ b/tools/test/scenarios/net-create-flows.xml
@@ -18,22 +18,13 @@
     <!-- TODO: parametrize this via recipes -->
     <group name="Net-Create-Flows">
 
-        <!-- Make sure that reactive forwarding is off -->
-        <step name="Net-Create-Flows.Uninstall-Reactive-Forwarding"
-              exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
-        <step name="Net-Create-Flows.Check-Apps" requires="^"
-              exec="onos-check-apps ${OC1} fwd,ifwd excludes"/>
-
         <!-- Force discovery of hosts -->
-        <step name="Net-Create-Flows.Find-Host-1" requires="^"
+        <step name="Net-Create-Flows.Find-Host-1"
               exec="onos-mininet sendAndExpect h1 ping -c1 -w1 h4 --expect 100% packet loss"/>
         <step name="Net-Create-Flows.Find-Host-2" requires="^"
               exec="onos-mininet sendAndExpect h4 ping -c1 -w1 h1 --expect 100% packet loss"/>
 
-
         <!-- Use REST API to create a point to point intent in each direction -->
-        <step name="Net-Create-Flows.1-to-Host" requires="Net-Create-Flows.Find-Host-2"
-              exec="create-flow.py ${OC1} f1 of:0000000000000001 5 1"/>
         <step name="Net-Create-Flows.1-to-19" requires="^"
               exec="create-flow.py ${OC1} f2 of:0000000000000001 1 2"/>
         <step name="Net-Create-Flows.19-to-7" requires="^"
@@ -43,8 +34,6 @@
         <step name="Net-Create-Flows.4-to-Host" requires="^"
               exec="create-flow.py ${OC1} f5 of:0000000000000004 1 3"/>
 
-        <step name="Net-Create-Flows.Host-to-1" requires="^"
-              exec="create-flow.py ${OC1} f6 of:0000000000000001 1 5"/>
         <step name="Net-Create-Flows.19-to-1" requires="^"
               exec="create-flow.py ${OC1} f7 of:0000000000000001 2 1"/>
         <step name="Net-Create-Flows.7-to-19" requires="^"
@@ -65,8 +54,6 @@
               exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/>
 
         <!-- Use REST API to remove the flows. -->
-        <step name="Net-Create-Flows.Delete-f1" requires="^"
-              exec="curl -f -X DELETE -uonos:rocks ${f1Location}"/>
         <step name="Net-Create-Flows.Delete-f2" requires="^"
               exec="curl -f -X DELETE -uonos:rocks ${f2Location}"/>
         <step name="Net-Create-Flows.Delete-f3" requires="^"
@@ -75,8 +62,6 @@
               exec="curl -f -X DELETE -uonos:rocks ${f4Location}"/>
         <step name="Net-Create-Flows.Delete-f5" requires="^"
               exec="curl -f -X DELETE -uonos:rocks ${f5Location}"/>
-        <step name="Net-Create-Flows.Delete-f6" requires="^"
-              exec="curl -f -X DELETE -uonos:rocks ${f6Location}"/>
         <step name="Net-Create-Flows.Delete-f7" requires="^"
               exec="curl -f -X DELETE -uonos:rocks ${f7Location}"/>
         <step name="Net-Create-Flows.Delete-f8" requires="^"