Remove flow objectives after test completes

Change-Id: I62ec858803b7767d98ac24e3693834aa13c6ee06

+# /bin/sh
+
+if [ "$#" -ne 6 ]
+then
+   echo usage: create-forward-objective.sh onos device src-mac dst-mac src-port dst-port
+   exit 1
+fi
+
+
+onos=$1
+device=$2
+srcMac=$3
+dstMac=$4
+srcPort=$5
+dstPort=$6
+
+curl -u onos:rocks -X POST --header "Content-Type: application/json" --header "Accept: application/json" -d "{
+  \"priority\": 100,
+  \"isPermanent\": \"false\",
+  \"timeout\": 100,
+  \"flag\": \"VERSATILE\",
+  \"operation\": \"REMOVE\",
+  \"selector\": {
+    \"criteria\": [
+        {\"type\": \"ETH_TYPE\", \"ethType\": 2048},
+        {\"type\": \"IN_PORT\", \"port\": \"$srcPort\"},
+        {\"type\": \"ETH_DST\", \"mac\": \"$dstMac\"},
+        {\"type\": \"ETH_SRC\", \"mac\": \"$srcMac\"}
+    ]
+  },
+  \"treatment\":
+  {
+    \"instructions\":
+    [
+      {\"type\":\"OUTPUT\",\"port\":$dstPort}
+    ],
+    \"deferred\":[]
+  }
+}" http://${onos}:8181/onos/v1/flowobjectives/$device/forward
+
+echo

@@ -78,5 +78,26 @@
         <step name="Net-Flow-Objectives.Ping-YX" requires="^"
         <step name="Net-Flow-Objectives.Ping-YX" requires="^"
               exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/>
               exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/>
 
 
+        <!-- Use REST API to remove flow objectives -->
+        <step name="Net-Flow-Objectives.Objective-R1F" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000001 00:00:00:00:00:01 00:00:00:00:00:04 1 2"/>
+        <step name="Net-Flow-Objectives.Objective-R1R" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000001 00:00:00:00:00:04 00:00:00:00:00:01 2 1"/>
+
+        <step name="Net-Flow-Objectives.Objective-R19F" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000019 00:00:00:00:00:01 00:00:00:00:00:04 2 8"/>
+        <step name="Net-Flow-Objectives.Objective-R19R" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000019 00:00:00:00:00:04 00:00:00:00:00:01 8 2"/>
+
+        <step name="Net-Flow-Objectives.Objective-R7F" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000007 00:00:00:00:00:01 00:00:00:00:00:04 2 3"/>
+        <step name="Net-Flow-Objectives.Objective-R7R" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000007 00:00:00:00:00:04 00:00:00:00:00:01 3 2"/>
+
+        <step name="Net-Flow-Objectives.Objective-R4F" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000004 00:00:00:00:00:01 00:00:00:00:00:04 3 1"/>
+        <step name="Net-Flow-Objectives.Objective-R4R" requires="Net-Flow-Objectives.Ping-YX, Net-Flow-Objectives.Ping-XY"
+              exec="remove-forward-objective.sh ${OC1} of:0000000000000004 00:00:00:00:00:04 00:00:00:00:00:01 1 3"/>
+
     </group>
     </group>
 </scenario>
 </scenario>