commit 47b2623316e825d655fdb1104c758fb91eb65f65
author Jian Li <pyguni@gmail.com> Mon Mar 07 09:59:59 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 07 21:27:30 2016 +0000
tree 86c29063e5aff1de8799c08a0895c795870610c0
parent c1b6c5090ddd2ecc2103c01a26a1c2870f164907

Support to encode and decode meter id in InstructionCodec

Change-Id: Icdac264b81a9f6edf93198cc5e729521601cbe49

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

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
index eccbddb..409a2f6 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
@@ -42,7 +42,7 @@
      * Creates an instruction object encoder.
      *
      * @param instruction instruction to encode
-     * @param context codec context for the encoding
+     * @param context     codec context for the encoding
      */
     public EncodeInstructionCodecHelper(Instruction instruction, CodecContext context) {
         this.instruction = instruction;
@@ -93,20 +93,21 @@
         result.put(InstructionCodec.SUBTYPE, instruction.subtype().name());
 
         switch (instruction.subtype()) {
-        case ODU_SIGID:
-            final L1ModificationInstruction.ModOduSignalIdInstruction oduSignalIdInstruction =
-                    (L1ModificationInstruction.ModOduSignalIdInstruction) instruction;
-            OduSignalId oduSignalId = oduSignalIdInstruction.oduSignalId();
+            case ODU_SIGID:
+                final L1ModificationInstruction.ModOduSignalIdInstruction oduSignalIdInstruction =
+                        (L1ModificationInstruction.ModOduSignalIdInstruction) instruction;
+                OduSignalId oduSignalId = oduSignalIdInstruction.oduSignalId();
 
-            ObjectNode child = result.putObject("oduSignalId");
+                ObjectNode child = result.putObject("oduSignalId");
 
-            child.put(InstructionCodec.TRIBUTARY_PORT_NUMBER, oduSignalId.tributaryPortNumber());
-            child.put(InstructionCodec.TRIBUTARY_SLOT_LEN, oduSignalId.tributarySlotLength());
-            child.put(InstructionCodec.TRIBUTARY_SLOT_BITMAP, HexString.toHexString(oduSignalId.tributarySlotBitmap()));
-            break;
-        default:
-            log.info("Cannot convert L1 subtype of {}", instruction.subtype());
-            break;
+                child.put(InstructionCodec.TRIBUTARY_PORT_NUMBER, oduSignalId.tributaryPortNumber());
+                child.put(InstructionCodec.TRIBUTARY_SLOT_LEN, oduSignalId.tributarySlotLength());
+                child.put(InstructionCodec.TRIBUTARY_SLOT_BITMAP,
+                        HexString.toHexString(oduSignalId.tributarySlotBitmap()));
+                break;
+            default:
+                log.info("Cannot convert L1 subtype of {}", instruction.subtype());
+                break;
         }
     }
 
@@ -151,7 +152,7 @@
                         (L2ModificationInstruction.PushHeaderInstructions) instruction;
 
                 result.put(InstructionCodec.ETHERNET_TYPE,
-                           pushHeaderInstructions.ethernetType().toShort());
+                        pushHeaderInstructions.ethernetType().toShort());
                 break;
 
             case TUNNEL_ID:
@@ -254,6 +255,12 @@
                 result.put(InstructionCodec.GROUP_ID, groupInstruction.groupId().toString());
                 break;
 
+            case METER:
+                final Instructions.MeterInstruction meterInstruction =
+                        (Instructions.MeterInstruction) instruction;
+                result.put(InstructionCodec.METER_ID, meterInstruction.meterId().toString());
+                break;
+
             case L0MODIFICATION:
                 encodeL0(result);
                 break;