commit | 04b49fc898c6065dbd1d5481519a103de784b8d7 | [log] [tgz] |
---|---|---|
author | HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> | Fri Aug 28 09:58:58 2015 -0700 |
committer | Ray Milkey <ray@onlab.us> | Fri Aug 28 18:08:12 2015 +0000 |
tree | ce65c27f835f350fb10d8e9b220cdc55f2e9097c | |
parent | 8f2d6e062214eebca48f8bc4006d9c9f7c4d950b [diff] |
Deprecate ModMplsLabelInstruction#label() Change-Id: I1324747adaa8ccb28077aa14b208df1083f39a3f
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 2ae8cb5..6c88ac1 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
@@ -246,8 +246,8 @@ L2ModificationInstruction.L2SubType.MPLS_LABEL.name()); assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION)); assertThat(((L2ModificationInstruction.ModMplsLabelInstruction) instruction) - .label().shortValue(), - is((short) 777)); + .mplsLabel().toInt(), + is(MplsLabel.MAX_MPLS)); instruction = getInstruction(Instruction.Type.L2MODIFICATION, L2ModificationInstruction.L2SubType.MPLS_PUSH.name());
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 dbb3bd0..72081e6 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
@@ -372,7 +372,7 @@ } final int jsonLabel = instructionJson.get("label").intValue(); - final int label = instructionToMatch.label(); + final int label = instructionToMatch.mplsLabel().toInt(); if (label != jsonLabel) { description.appendText("MPLS label was " + jsonLabel); return false;