[ONOS-4427] TunnelIn flowrule can not be applied to devices in ONOS 1.5
and 1.6 . In ONOS Version 1.5 and 1.6, Instructions.CreateDrop interface
is missed, which cased the pipiline judging condition can not be
matched, and the flowrule of tunnel in can not be applied to device.
Change-Id: Ibe892098b37f7f9f4d3b542ee31b1b6039f8b471
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
index ac3bd9f..dd27535 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenVSwitchPipeline.java
@@ -40,7 +40,6 @@
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.Criteria;
import org.onosproject.net.flow.criteria.Criterion.Type;
-import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flowobjective.FilteringObjective;
import org.onosproject.net.flowobjective.FlowObjectiveStore;
import org.onosproject.net.flowobjective.ForwardingObjective;
@@ -291,9 +290,8 @@
Integer transition = null;
Integer forTable = null;
// MAC table flow rules
- if ((selector.getCriterion(Type.TUNNEL_ID) != null && selector
- .getCriterion(Type.ETH_DST) != null)
- || tb.allInstructions().contains(Instructions.createNoAction())) {
+ if (selector.getCriterion(Type.TUNNEL_ID) != null && selector
+ .getCriterion(Type.ETH_DST) != null) {
forTable = MAC_TABLE;
return reassemblyFlowRule(ruleBuilder, tb, transition, forTable);
}