[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: Ib76b09d992270d0659cf8010886679a145afb753

@@ -40,7 +40,6 @@ import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.criteria.Criteria;
 import org.onosproject.net.flow.criteria.Criteria;
 import org.onosproject.net.flow.criteria.Criterion.Type;
 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.FilteringObjective;
 import org.onosproject.net.flowobjective.FlowObjectiveStore;
 import org.onosproject.net.flowobjective.FlowObjectiveStore;
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.flowobjective.ForwardingObjective;
@@ -291,9 +290,8 @@ public class OpenVSwitchPipeline extends DefaultSingleTablePipeline
         Integer transition = null;
         Integer transition = null;
         Integer forTable = null;
         Integer forTable = null;
         // MAC table flow rules
         // 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;
             forTable = MAC_TABLE;
             return reassemblyFlowRule(ruleBuilder, tb, transition, forTable);
             return reassemblyFlowRule(ruleBuilder, tb, transition, forTable);
         }
         }