| commit | 125572b666c80aebe515307618a0b5e3c0b9a8ac | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@onlab.us> | Mon Feb 22 16:48:17 2016 -0800 |
| committer | Ray Milkey <ray@onlab.us> | Tue Feb 23 08:51:36 2016 -0800 |
| tree | c5033d54030dff13373cc5027e82fe3652b9ded2 | |
| parent | b0f09be1a4477db10dc74828a3907c6bac9eeea3 [diff] |
Remove methods deprecated in Drake from L2ModificationInstruction API Change-Id: I30dbc2e9c590d4bc2bc672e13581dbd1c3b3561b
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/FlowRuleCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/FlowRuleCodecTest.java index c2f4ccf..2a5ba24 100644 --- a/core/common/src/test/java/org/onosproject/codec/impl/FlowRuleCodecTest.java +++ b/core/common/src/test/java/org/onosproject/codec/impl/FlowRuleCodecTest.java
@@ -251,7 +251,7 @@ L2ModificationInstruction.L2SubType.MPLS_LABEL.name()); assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION)); assertThat(((L2ModificationInstruction.ModMplsLabelInstruction) instruction) - .mplsLabel().toInt(), + .label().toInt(), is(MplsLabel.MAX_MPLS)); instruction = getInstruction(Instruction.Type.L2MODIFICATION,
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java b/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java index 9c0a318..a6871c8 100644 --- a/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java +++ b/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
@@ -428,7 +428,7 @@ } final int jsonLabel = instructionJson.get("label").intValue(); - final int label = instructionToMatch.mplsLabel().toInt(); + final int label = instructionToMatch.label().toInt(); if (label != jsonLabel) { description.appendText("MPLS label was " + jsonLabel); return false;