commit ce8c56024737c6e8a4a134acd6560b3ac315ceed
author Jian Li <pyguni@gmail.com> Thu Mar 03 21:43:24 2016 -0800
committer Ray Milkey <ray@onlab.us> Mon Mar 07 17:45:53 2016 +0000
tree be94914684586334406abe64803db766dc6eb6fd
parent 2196a92c5f8370a6cd45f58f0c32b0377f6cc84e

Support to encode and decode group id in InstructionCodec

Change-Id: Icd0947f494f572831e8b5c8d82d47c85eb074824

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 105924e..57e73ed 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
@@ -22,6 +22,8 @@
 import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
 import org.onlab.util.HexString;
+import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
 import org.onosproject.net.ChannelSpacing;
 import org.onosproject.net.GridType;
 import org.onosproject.net.Lambda;
@@ -261,6 +263,10 @@
         } else if (type.equals(Instruction.Type.TABLE.name())) {
             return Instructions.transition(nullIsIllegal(json.get(InstructionCodec.TABLE_ID)
                     .asInt(), InstructionCodec.TABLE_ID + InstructionCodec.MISSING_MEMBER_MESSAGE));
+        } else if (type.equals(Instruction.Type.GROUP.name())) {
+            GroupId groupId = new DefaultGroupId(nullIsIllegal(json.get(InstructionCodec.GROUP_ID)
+                    .asInt(), InstructionCodec.GROUP_ID + InstructionCodec.MISSING_MEMBER_MESSAGE));
+            return Instructions.createGroup(groupId);
         } else if (type.equals(Instruction.Type.L0MODIFICATION.name())) {
             return decodeL0();
         } else if (type.equals(Instruction.Type.L1MODIFICATION.name())) {