Fixed bug where ONOS sends actions in DELETE flow mods in OF1.0.

Fixes ONOS-787.

Change-Id: Ide8817927fc7a64da79df7998e3baebefb09de40
(cherry picked from commit 18679365)

@@ -102,7 +102,6 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
 
 
         long cookie = flowRule().id().value();
         long cookie = flowRule().id().value();
 
 
-
         OFFlowMod fm = factory().buildFlowModify()
         OFFlowMod fm = factory().buildFlowModify()
                 .setXid(xid)
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
                 .setCookie(U64.of(cookie))
@@ -119,7 +118,6 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
     @Override
     @Override
     public OFFlowDelete buildFlowDel() {
     public OFFlowDelete buildFlowDel() {
         Match match = buildMatch();
         Match match = buildMatch();
-        List<OFAction> actions = buildActions();
 
 
         long cookie = flowRule().id().value();
         long cookie = flowRule().id().value();
 
 
@@ -127,7 +125,6 @@ public class FlowModBuilderVer10 extends FlowModBuilder {
                 .setXid(xid)
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
                 .setCookie(U64.of(cookie))
                 .setBufferId(OFBufferId.NO_BUFFER)
                 .setBufferId(OFBufferId.NO_BUFFER)
-                .setActions(actions)
                 .setMatch(match)
                 .setMatch(match)
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setPriority(flowRule().priority())
                 .setPriority(flowRule().priority())

@@ -15,11 +15,7 @@
  */
  */
 package org.onosproject.provider.of.flow.impl;
 package org.onosproject.provider.of.flow.impl;
 
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
+import org.onlab.packet.Ip4Address;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.TrafficTreatment;
@@ -29,13 +25,12 @@ import org.onosproject.net.flow.instructions.L0ModificationInstruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsLabelInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanPcpInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanPcpInstruction;
-import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsLabelInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.PushHeaderInstructions;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.PushHeaderInstructions;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction.ModIPInstruction;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction.ModIPInstruction;
-import org.onlab.packet.Ip4Address;
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.protocol.OFFactory;
 import org.projectfloodlight.openflow.protocol.OFFlowAdd;
 import org.projectfloodlight.openflow.protocol.OFFlowAdd;
 import org.projectfloodlight.openflow.protocol.OFFlowDelete;
 import org.projectfloodlight.openflow.protocol.OFFlowDelete;
@@ -58,6 +53,11 @@ import org.projectfloodlight.openflow.types.VlanPcp;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
 /**
 /**
  * Flow mod builder for OpenFlow 1.3+.
  * Flow mod builder for OpenFlow 1.3+.
  */
  */
@@ -139,8 +139,6 @@ public class FlowModBuilderVer13 extends FlowModBuilder {
     public OFFlowDelete buildFlowDel() {
     public OFFlowDelete buildFlowDel() {
         Match match = buildMatch();
         Match match = buildMatch();
         List<OFAction> actions = buildActions();
         List<OFAction> actions = buildActions();
-        //OFInstruction writeActions =
-                //factory().instructions().writeActions(actions);
 
 
         long cookie = flowRule().id().value();
         long cookie = flowRule().id().value();