홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
lishuai
Committed by Gerrit Code Review
90b3b6cd 1 parent 7762179a

[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
Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
...@@ -40,7 +40,6 @@ import org.onosproject.net.flow.TrafficSelector; ...@@ -40,7 +40,6 @@ import org.onosproject.net.flow.TrafficSelector;
40 import org.onosproject.net.flow.TrafficTreatment; 40 import org.onosproject.net.flow.TrafficTreatment;
41 import org.onosproject.net.flow.criteria.Criteria; 41 import org.onosproject.net.flow.criteria.Criteria;
42 import org.onosproject.net.flow.criteria.Criterion.Type; 42 import org.onosproject.net.flow.criteria.Criterion.Type;
43 -import org.onosproject.net.flow.instructions.Instructions;
44 import org.onosproject.net.flowobjective.FilteringObjective; 43 import org.onosproject.net.flowobjective.FilteringObjective;
45 import org.onosproject.net.flowobjective.FlowObjectiveStore; 44 import org.onosproject.net.flowobjective.FlowObjectiveStore;
46 import org.onosproject.net.flowobjective.ForwardingObjective; 45 import org.onosproject.net.flowobjective.ForwardingObjective;
...@@ -291,9 +290,8 @@ public class OpenVSwitchPipeline extends DefaultSingleTablePipeline ...@@ -291,9 +290,8 @@ public class OpenVSwitchPipeline extends DefaultSingleTablePipeline
291 Integer transition = null; 290 Integer transition = null;
292 Integer forTable = null; 291 Integer forTable = null;
293 // MAC table flow rules 292 // MAC table flow rules
294 - if ((selector.getCriterion(Type.TUNNEL_ID) != null && selector 293 + if (selector.getCriterion(Type.TUNNEL_ID) != null && selector
295 - .getCriterion(Type.ETH_DST) != null) 294 + .getCriterion(Type.ETH_DST) != null) {
296 - || tb.allInstructions().contains(Instructions.createNoAction())) {
297 forTable = MAC_TABLE; 295 forTable = MAC_TABLE;
298 return reassemblyFlowRule(ruleBuilder, tb, transition, forTable); 296 return reassemblyFlowRule(ruleBuilder, tb, transition, forTable);
299 } 297 }
......