Support to encode and decode setqueue id in InstructionCodec

Change-Id: I911e14b750d5264755687a9eff322502ba9ed118

Support to encode and decode setqueue id in InstructionCodec
Change-Id: I911e14b750d5264755687a9eff322502ba9ed118
Jian Li · Gerrit Code Review
Commit 70dffe4447747ed3c05c5bc4e39cc53254eab071 70dffe44 1 parent 913e9e1f
Showing 4 changed files with 85 additions and 16 deletions
core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
View file @70dffe4
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
View file @70dffe4
@@ -233,32 +233,42 @@ public final class DecodeInstructionCodecHelper {
     }
     /**
-     * Decodes the JSON into an instruction object.
+     * Extracts port number of the given json node.
      *
-     * @return Criterion object
+     * @param jsonNode json node
-     * @throws IllegalArgumentException if the JSON is invalid
+     * @return port number
      */
-    public Instruction decode() {
+    private PortNumber getPortNumber(ObjectNode jsonNode) {
-        String type = json.get(InstructionCodec.TYPE).asText();
-
-        if (type.equals(Instruction.Type.OUTPUT.name())) {
         PortNumber portNumber;
-            if (json.get(InstructionCodec.PORT).isLong() || json.get(InstructionCodec.PORT).isInt()) {
+        if (jsonNode.get(InstructionCodec.PORT).isLong() || jsonNode.get(InstructionCodec.PORT).isInt()) {
             portNumber = PortNumber
-                        .portNumber(nullIsIllegal(json.get(InstructionCodec.PORT)
+                    .portNumber(nullIsIllegal(jsonNode.get(InstructionCodec.PORT)
                             .asLong(), InstructionCodec.PORT
                             + InstructionCodec.MISSING_MEMBER_MESSAGE));
-            } else if (json.get(InstructionCodec.PORT).isTextual()) {
+        } else if (jsonNode.get(InstructionCodec.PORT).isTextual()) {
             portNumber = PortNumber
-                        .fromString(nullIsIllegal(json.get(InstructionCodec.PORT)
+                    .fromString(nullIsIllegal(jsonNode.get(InstructionCodec.PORT)
                             .textValue(), InstructionCodec.PORT
                             + InstructionCodec.MISSING_MEMBER_MESSAGE));
         } else {
             throw new IllegalArgumentException("Port value "
-                                                           + json.get(InstructionCodec.PORT).toString()
+                    + jsonNode.get(InstructionCodec.PORT).toString()
                     + " is not supported");
         }
-            return Instructions.createOutput(portNumber);
+        return portNumber;
+    }
+
+    /**
+     * Decodes the JSON into an instruction object.
+     *
+     * @return Criterion object
+     * @throws IllegalArgumentException if the JSON is invalid
+     */
+    public Instruction decode() {
+        String type = json.get(InstructionCodec.TYPE).asText();
+
+        if (type.equals(Instruction.Type.OUTPUT.name())) {
+            return Instructions.createOutput(getPortNumber(json));
         } else if (type.equals(Instruction.Type.NOACTION.name())) {
             return Instructions.createNoAction();
         } else if (type.equals(Instruction.Type.TABLE.name())) {
@@ -272,6 +282,10 @@ public final class DecodeInstructionCodecHelper {
             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.QUEUE.name())) {
+            long queueId = nullIsIllegal(json.get(InstructionCodec.QUEUE_ID)
+                    .asLong(), InstructionCodec.QUEUE_ID + InstructionCodec.MISSING_MEMBER_MESSAGE);
+            return Instructions.setQueue(queueId, getPortNumber(json));
         } else if (type.equals(Instruction.Type.L0MODIFICATION.name())) {
             return decodeL0();
         } else if (type.equals(Instruction.Type.L1MODIFICATION.name())) {
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
View file @70dffe4
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
View file @70dffe4
@@ -256,6 +256,13 @@ public final class EncodeInstructionCodecHelper {
                 result.put(InstructionCodec.METER_ID, meterInstruction.meterId().toString());
                 break;
+            case QUEUE:
+                final Instructions.SetQueueInstruction setQueueInstruction =
+                        (Instructions.SetQueueInstruction) instruction;
+                result.put(InstructionCodec.QUEUE_ID, setQueueInstruction.queueId());
+                result.put(InstructionCodec.PORT, setQueueInstruction.port().toString());
+                break;
+
             case L0MODIFICATION:
                 encodeL0(result);
                 break;
--- a/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
View file @70dffe4
+++ b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
View file @70dffe4
@@ -52,6 +52,7 @@ public final class InstructionCodec extends JsonCodec<Instruction> {
     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 QUEUE_ID = "queueId";
     protected static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
     protected static final String TRIBUTARY_SLOT_LEN = "tributarySlotLength";
     protected static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";
--- a/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
View file @70dffe4
+++ b/core/common/src/test/java/org/onosproject/codec/impl/InstructionJsonMatcher.java
View file @70dffe4
@@ -25,6 +25,7 @@ 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.Instructions.SetQueueInstruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModOchSignalInstruction;
 import org.onosproject.net.flow.instructions.L1ModificationInstruction.ModOduSignalIdInstruction;
@@ -115,7 +116,7 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
             }
         } else {
             final String jsonPort = instructionJson.get("port").toString();
-            description.appendText("Unmathcing types ");
+            description.appendText("Unmatching types ");
             description.appendText("instructionToMatch " + instructionToMatch.port().toString());
             description.appendText("jsonPort " + jsonPort);
         }
@@ -174,6 +175,51 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
     }
     /**
+     * Matches the contents of a set queue instruction.
+     *
+     * @param instructionJson JSON instruction to match
+     * @param description Description object used for recording errors
+     * @return true if contents match, false otherwise
+     */
+    private boolean matchSetQueueInstruction(JsonNode instructionJson,
+                                             Description description) {
+        final String jsonType = instructionJson.get("type").textValue();
+        SetQueueInstruction instructionToMatch = (SetQueueInstruction) instruction;
+        if (!instructionToMatch.type().name().equals(jsonType)) {
+            description.appendText("type was " + jsonType);
+            return false;
+        }
+
+        final long jsonQueueId = instructionJson.get("queueId").longValue();
+        if (instructionToMatch.queueId() != jsonQueueId) {
+            description.appendText("queueId was " + jsonQueueId);
+            return false;
+        }
+
+        if (instructionJson.get("port").isLong() ||
+                instructionJson.get("port").isInt()) {
+            final long jsonPort = instructionJson.get("port").asLong();
+            if (instructionToMatch.port().toLong() != (jsonPort)) {
+                description.appendText("port was " + jsonPort);
+                return false;
+            }
+        } else if (instructionJson.get("port").isTextual()) {
+            final String jsonPort = instructionJson.get("port").textValue();
+            if (!instructionToMatch.port().toString().equals(jsonPort)) {
+                description.appendText("port was " + jsonPort);
+                return false;
+            }
+        } else {
+            final String jsonPort = instructionJson.get("port").toString();
+            description.appendText("Unmatching types ");
+            description.appendText("instructionToMatch " + instructionToMatch.port().toString());
+            description.appendText("jsonPort " + jsonPort);
+        }
+
+        return true;
+    }
+
+    /**
      * Matches the contents of a mod lambda instruction.
      *
      * @param instructionJson JSON instruction to match
@@ -508,6 +554,8 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
             return matchGroupInstruction(jsonInstruction, description);
         } else if (instruction instanceof MeterInstruction) {
             return matchMeterInstruction(jsonInstruction, description);
+        } else if (instruction instanceof SetQueueInstruction) {
+            return matchSetQueueInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModLambdaInstruction) {
             return matchModLambdaInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModOchSignalInstruction) {
@@ -521,8 +569,7 @@ public final class InstructionJsonMatcher extends TypeSafeDiagnosingMatcher<Json
         } else if (instruction instanceof ModIPInstruction) {
             return matchModIpInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModIPv6FlowLabelInstruction) {
-            return matchModIPv6FlowLabelInstruction(jsonInstruction,
+            return matchModIPv6FlowLabelInstruction(jsonInstruction, description);
-                                                    description);
         } else if (instruction instanceof ModMplsLabelInstruction) {
             return matchModMplsLabelInstruction(jsonInstruction, description);
         } else if (instruction instanceof ModOduSignalIdInstruction) {