Instruction related fixes
- Fixed PushHeaderInstructions bug, where half-baked Ethernet instace was used
only to hold ethernetType. (ONOS-987)
Change-Id: I330a862c8a18206250befbd4e22ee6d189beed83
diff --git a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
index fc28624..a02690f 100644
--- a/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/FlowsResourceTest.java
@@ -45,8 +45,7 @@
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.instructions.Instruction;
-import org.onosproject.net.flow.instructions.L0ModificationInstruction;
-
+import org.onosproject.net.flow.instructions.Instructions;
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
import com.google.common.collect.ImmutableSet;
@@ -187,6 +186,7 @@
return false;
}
+ @Override
public Type type() {
return Type.DEFAULT;
}
@@ -197,10 +197,8 @@
*/
private void setupMockFlows() {
flow2.treatment = DefaultTrafficTreatment.builder()
- .add(new L0ModificationInstruction.ModLambdaInstruction(
- L0ModificationInstruction.L0SubType.LAMBDA, (short) 4))
- .add(new L0ModificationInstruction.ModLambdaInstruction(
- L0ModificationInstruction.L0SubType.LAMBDA, (short) 5))
+ .add(Instructions.modL0Lambda((short) 4))
+ .add(Instructions.modL0Lambda((short) 5))
.setEthDst(MacAddress.BROADCAST)
.build();
flow2.selector = DefaultTrafficSelector.builder()
@@ -208,8 +206,7 @@
.matchIPProtocol((byte) 9)
.build();
flow4.treatment = DefaultTrafficTreatment.builder()
- .add(new L0ModificationInstruction.ModLambdaInstruction(
- L0ModificationInstruction.L0SubType.LAMBDA, (short) 6))
+ .add(Instructions.modL0Lambda((short) 6))
.build();
final Set<FlowEntry> flows1 = new HashSet<>();
flows1.add(flow1);