Support to encode and decode meter id in InstructionCodec

Change-Id: Icdac264b81a9f6edf93198cc5e729521601cbe49

@@ -37,6 +37,7 @@ import org.onosproject.net.flow.instructions.L1ModificationInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
 import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.flow.instructions.L4ModificationInstruction;
+import org.onosproject.net.meter.MeterId;
 
 import static org.onlab.util.Tools.nullIsIllegal;
 
@@ -267,6 +268,10 @@ public final class DecodeInstructionCodecHelper {
             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.METER.name())) {
+            MeterId meterId = MeterId.meterId(nullIsIllegal(json.get(InstructionCodec.METER_ID)
+                    .asLong(), InstructionCodec.METER_ID + InstructionCodec.MISSING_MEMBER_MESSAGE));
+            return Instructions.meterTraffic(meterId);
         } else if (type.equals(Instruction.Type.L0MODIFICATION.name())) {
             return decodeL0();
         } else if (type.equals(Instruction.Type.L1MODIFICATION.name())) {

@@ -102,7 +102,8 @@ public final class EncodeInstructionCodecHelper {
 
                 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()));
+                child.put(InstructionCodec.TRIBUTARY_SLOT_BITMAP,
+                        HexString.toHexString(oduSignalId.tributarySlotBitmap()));
                 break;
             default:
                 log.info("Cannot convert L1 subtype of {}", instruction.subtype());
@@ -254,6 +255,12 @@ public final class EncodeInstructionCodecHelper {
                 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;

@@ -51,6 +51,7 @@ public final class InstructionCodec extends JsonCodec<Instruction> {
     protected static final String UDP_PORT = "udpPort";
     protected static final String TABLE_ID = "tableId";
     protected static final String GROUP_ID = "groupId";
+    protected static final String METER_ID = "meterId";
     protected static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
     protected static final String TRIBUTARY_SLOT_LEN = "tributarySlotLength";
     protected static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";

@@ -22,6 +22,7 @@ import org.onlab.util.HexString;
 import org.onosproject.net.OduSignalId;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions.GroupInstruction;
+import org.onosproject.net.flow.instructions.Instructions.MeterInstruction;
 import org.onosproject.net.flow.instructions.Instructions.NoActionInstruction;
 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
@@ -138,12 +139,35 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
             return false;
         }
 
-        if (instructionJson.get("groupId").isInt()) {
-            final int jsonGroupId = instructionJson.get("groupId").asInt();
+        final int jsonGroupId = instructionJson.get("groupId").intValue();
         if (instructionToMatch.groupId().id() != jsonGroupId) {
             description.appendText("groupId was " + jsonGroupId);
             return false;
         }
+
+        return true;
+    }
+
+    /**
+     * Matches the contents of a meter instruction.
+     *
+     * @param instructionJson JSON instruction to match
+     * @param description Description object used for recording errors
+     * @return true if contents match, false otherwise
+     */
+    private boolean matchMeterInstruction(JsonNode instructionJson,
+                                          Description description) {
+        final String jsonType = instructionJson.get("type").textValue();
+        MeterInstruction instructionToMatch = (MeterInstruction) instruction;
+        if (!instructionToMatch.type().name().equals(jsonType)) {
+            description.appendText("type was " + jsonType);
+            return false;
+        }
+
+        final long jsonMeterId = instructionJson.get("meterId").longValue();
+        if (instructionToMatch.meterId().id() != jsonMeterId) {
+            description.appendText("meterId was " + jsonMeterId);
+            return false;
         }
 
         return true;
@@ -482,6 +506,8 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
             return matchOutputInstruction(jsonInstruction, description);
         } else if (instruction instanceof GroupInstruction) {
             return matchGroupInstruction(jsonInstruction, description);
+        } else if (instruction instanceof MeterInstruction) {
+            return matchMeterInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModLambdaInstruction) {
             return matchModLambdaInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModOchSignalInstruction) {