commit | 2be39edc6d145f7243a53513b2f9c66a72425ce7 | [log] [tgz] |
---|---|---|
author | Ray Milkey <ray@onlab.us> | Mon Feb 22 15:54:19 2016 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Tue Feb 23 00:33:35 2016 +0000 |
tree | 4b877fdc989850685c20a79c00493ba8207fa785 | |
parent | 27077eb5a79ebf4e3d9c16884f658df980bb0b81 [diff] |
Remove methods deprecated in Drake from Instructions API Change-Id: I87a20cb9e8abbf4b27bbb4760a62947169866ea6
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java index baa08b8..2792791 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/DefaultSingleTablePipeline.java
@@ -118,7 +118,7 @@ (fwd.treatment().tableTransition() == null) && (!fwd.treatment().clearedDeferred())) { TrafficTreatment.Builder flowTreatment = DefaultTrafficTreatment.builder(); - flowTreatment.add(Instructions.createDrop()); + flowTreatment.add(Instructions.createNoAction()); treatment = flowTreatment.build(); }
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 1a7f576..df910dd 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
@@ -293,7 +293,7 @@ // MAC table flow rules if ((selector.getCriterion(Type.TUNNEL_ID) != null && selector .getCriterion(Type.ETH_DST) != null) - || tb.allInstructions().contains(Instructions.createDrop())) { + || tb.allInstructions().contains(Instructions.createNoAction())) { forTable = MAC_TABLE; return reassemblyFlowRule(ruleBuilder, tb, transition, forTable); }