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/InstructionJsonMatcher.java

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 d501522..51a9759 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
@@ -29,10 +29,10 @@
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModOchSignalInstruction;
 import org.onosproject.net.flow.instructions.L1ModificationInstruction.ModOduSignalIdInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsHeaderInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsLabelInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanPcpInstruction;
-import org.onosproject.net.flow.instructions.L2ModificationInstruction.PushHeaderInstructions;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction.ModIPInstruction;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction.ModIPv6FlowLabelInstruction;
 
@@ -54,10 +54,10 @@
      * @param description Description object used for recording errors
      * @return true if contents match, false otherwise
      */
-    private boolean matchPushHeaderInstruction(JsonNode instructionJson,
-                                               Description description) {
-        PushHeaderInstructions instructionToMatch =
-                (PushHeaderInstructions) instruction;
+    private boolean matchModMplsHeaderInstruction(JsonNode instructionJson,
+                                                  Description description) {
+        ModMplsHeaderInstruction instructionToMatch =
+                (ModMplsHeaderInstruction) instruction;
         final String jsonSubtype = instructionJson.get("subtype").textValue();
         if (!instructionToMatch.subtype().name().equals(jsonSubtype)) {
             description.appendText("subtype was " + jsonSubtype);
@@ -84,6 +84,8 @@
         return true;
     }
 
+    // TODO: need to add matchModVlanHeaderInstruction
+
     /**
      * Matches the contents of an output instruction.
      *
@@ -513,8 +515,8 @@
                 return false;
         }
 
-        if (instruction instanceof PushHeaderInstructions) {
-            return matchPushHeaderInstruction(jsonInstruction, description);
+        if (instruction instanceof ModMplsHeaderInstruction) {
+            return matchModMplsHeaderInstruction(jsonInstruction, description);
         } else if (instruction instanceof OutputInstruction) {
             return matchOutputInstruction(jsonInstruction, description);
         } else if (instruction instanceof GroupInstruction) {