| commit | 42507350182d47e08057fd9d9646e412904425e8 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@onlab.us> | Fri Mar 20 15:16:10 2015 -0700 |
| committer | Ray Milkey <ray@onlab.us> | Tue Mar 24 18:18:28 2015 +0000 |
| tree | 2d3c5c48eba06504d90c71f14ad129a3dce43fb3 | |
| parent | f845cf6cfdadb36071c219b0cbda38d12dcfdc1c [diff] |
Remove deprecated instructions() method in the traffic treatment class Change-Id: I739b35bdcbf9867c639c7b6ca4006f3eeafbb055
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java index e308299..d6ff82c 100644 --- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java +++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
@@ -138,7 +138,7 @@ if (treatment == null) { return acts; } - for (Instruction i : treatment.instructions()) { + for (Instruction i : treatment.immediate()) { switch (i.type()) { case DROP: log.warn("Saw drop action; assigning drop action");
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java index 1554fa3..61757bd 100644 --- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java +++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -186,24 +186,6 @@ return fm; } - - private List<OFInstruction> buildInstructions() { - List<OFInstruction> instructions = new LinkedList<>(); - if (treatment == null) { - return instructions; - } - for (Instruction i : treatment.instructions()) { - switch (i.type()) { - case TABLE: - instructions.add(buildTableGoto(((Instructions.TableTypeTransition) i))); - break; - default: - break; - } - } - return instructions; - } - private List<OFAction> buildActions(List<Instruction> treatments) { List<OFAction> actions = new LinkedList<>(); boolean tableFound = false;