commit dab7f4bc13a12cdea9d72a2f4939cee521a0be71
author Sivachidambaram Subramanian <sisubram@partner.ciena.com> Mon May 15 12:28:12 2017 +0530
committer Jonathan Hart <jono@onlab.us> Mon May 22 18:35:20 2017 +0000
tree aab07914cb18a9b14f855f4b902fd3637175fb79
parent a5f0c580ec1aca9d80bc02ba82eb5b0f73339f66

ONOS-6452 - Supplied Eth Type value was not getting reflected for MPLS_POP instructions. Now this has been corrected.

Change-Id: I029d250a9ad139435554eba26ea2ec18508b0ab5

core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
index bd9d535..a6268bb 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
@@ -107,6 +107,9 @@
         } else if (subType.equals(L2ModificationInstruction.L2SubType.MPLS_PUSH.name())) {
             return Instructions.pushMpls();
         } else if (subType.equals(L2ModificationInstruction.L2SubType.MPLS_POP.name())) {
+            if (json.has(InstructionCodec.ETHERNET_TYPE)) {
+                return Instructions.popMpls(getEthType());
+            }
             return Instructions.popMpls();
         } else if (subType.equals(L2ModificationInstruction.L2SubType.DEC_MPLS_TTL.name())) {
             return Instructions.decMplsTtl();