commit 42feabd852058490b8c8d03d6d4193efa7ef5b04
author Jonathan Hart <jono@onlab.us> Wed Feb 03 17:56:21 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 04 23:40:14 2016 +0000
tree 0b6fcfb9928539910b11b7f0e30bfd8ecdf99b19
parent c5cb4a1441622a02f3334f2127577124b6875ba8

Use DELETE_STRICT when deleting flows to avoid collateral damage

Change-Id: Ibb35023b14296752073de44f1953013f0ca8a73a

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
index e262e0f..792e369 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
@@ -22,11 +22,11 @@
 import org.onlab.packet.VlanId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.OchSignal;
+import org.onosproject.net.OduSignalId;
 import org.onosproject.net.driver.DefaultDriverData;
 import org.onosproject.net.driver.DefaultDriverHandler;
 import org.onosproject.net.driver.Driver;
 import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.OduSignalId;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.criteria.ArpHaCriterion;
@@ -65,8 +65,6 @@
 import org.onosproject.net.flow.criteria.VlanPcpCriterion;
 import org.onosproject.openflow.controller.ExtensionSelectorInterpreter;
 import org.projectfloodlight.openflow.protocol.OFFactory;
-import org.projectfloodlight.openflow.protocol.OFFlowAdd;
-import org.projectfloodlight.openflow.protocol.OFFlowDelete;
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.match.Match;
 import org.projectfloodlight.openflow.protocol.match.MatchField;
@@ -88,6 +86,7 @@
 import org.projectfloodlight.openflow.types.OFMetadata;
 import org.projectfloodlight.openflow.types.OFPort;
 import org.projectfloodlight.openflow.types.OFVlanVidMatch;
+import org.projectfloodlight.openflow.types.OduSignalID;
 import org.projectfloodlight.openflow.types.TransportPort;
 import org.projectfloodlight.openflow.types.U16;
 import org.projectfloodlight.openflow.types.U32;
@@ -95,7 +94,6 @@
 import org.projectfloodlight.openflow.types.U8;
 import org.projectfloodlight.openflow.types.VlanPcp;
 import org.projectfloodlight.openflow.types.VlanVid;
-import org.projectfloodlight.openflow.types.OduSignalID;
 import org.slf4j.Logger;
 
 import java.util.Optional;
@@ -163,7 +161,7 @@
      *
      * @return the flow mod
      */
-    public abstract OFFlowAdd buildFlowAdd();
+    public abstract OFFlowMod buildFlowAdd();
 
     /**
      * Builds a MODIFY flow mod.
@@ -177,7 +175,7 @@
      *
      * @return the flow mod
      */
-    public abstract OFFlowDelete buildFlowDel();
+    public abstract OFFlowMod buildFlowDel();
 
     /**
      * Builds the match for the flow mod.