commit 11260a019260051969309e554bfb9b0d5731073b
author Jian Li <pyguni@gmail.com> Thu May 19 13:07:22 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 13 15:46:14 2016 +0000
tree 0329623f6ed1bbb1861ae7c8a9693106bbff2659
parent 14dc5136c293e3ab5a87155db8a027061bfe2500

Try to use ModMplsHeaderInstruction and ModVlanHeaderInstruction

Change-Id: I0b486907ef718a6dfa3e92696397fe5a7e851aed

core/common/src/test/java/org/onosproject/codec/impl/FlowRuleCodecTest.java

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 2625db2..6b507e1 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
@@ -425,14 +425,14 @@
         instruction = getInstruction(Instruction.Type.L2MODIFICATION,
                 L2ModificationInstruction.L2SubType.MPLS_PUSH.name());
         assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION));
-        assertThat(((L2ModificationInstruction.PushHeaderInstructions) instruction)
+        assertThat(((L2ModificationInstruction.ModMplsHeaderInstruction) instruction)
                         .ethernetType().toShort(),
                 is(Ethernet.MPLS_UNICAST));
 
         instruction = getInstruction(Instruction.Type.L2MODIFICATION,
                 L2ModificationInstruction.L2SubType.MPLS_POP.name());
         assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION));
-        assertThat(((L2ModificationInstruction.PushHeaderInstructions) instruction)
+        assertThat(((L2ModificationInstruction.ModMplsHeaderInstruction) instruction)
                         .ethernetType().toShort(),
                 is(Ethernet.MPLS_UNICAST));
 
@@ -444,12 +444,12 @@
         instruction = getInstruction(Instruction.Type.L2MODIFICATION,
                 L2ModificationInstruction.L2SubType.VLAN_POP.name());
         assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION));
-        assertThat(instruction, instanceOf(L2ModificationInstruction.PopVlanInstruction.class));
+        assertThat(instruction, instanceOf(L2ModificationInstruction.ModVlanHeaderInstruction.class));
 
         instruction = getInstruction(Instruction.Type.L2MODIFICATION,
                 L2ModificationInstruction.L2SubType.VLAN_PUSH.name());
         assertThat(instruction.type(), is(Instruction.Type.L2MODIFICATION));
-        assertThat(instruction, instanceOf(L2ModificationInstruction.PushHeaderInstructions.class));
+        assertThat(instruction, instanceOf(L2ModificationInstruction.ModVlanHeaderInstruction.class));
 
         instruction = getInstruction(Instruction.Type.L2MODIFICATION,
                 L2ModificationInstruction.L2SubType.TUNNEL_ID.name());