Merge "Fixing OF Multipart messages 1) So we have a MultipartRequestDesc message...

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / MultipartRequestMessageFactory.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestMessageFactory.java
index 16bf6a91a4aa4a91ad22620cbc1a21fe0f91e540..f223c56203beecb0a000c97ee77e150d15831c6c 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestMessageFactory.java
@@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestMessage;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.MultipartRequestBody;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestAggregate;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDesc;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestExperimenter;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlow;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroup;\r
@@ -49,12 +50,12 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
     private static final int MESSAGE_LENGTH = 16;\r
     private static final byte PADDING_IN_MULTIPART_REQUEST_MESSAGE = 4;\r
     private static final byte TABLE_FEAT_HEADER_LENGTH = 4;\r
-    private static MultipartRequestMessageFactory instance; \r
-    \r
+    private static MultipartRequestMessageFactory instance;\r
+\r
     private MultipartRequestMessageFactory() {\r
         // singleton\r
     }\r
-    \r
+\r
     /**\r
      * @return singleton factory\r
      */\r
@@ -64,7 +65,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
         }\r
         return instance;\r
     }\r
-    \r
+\r
     @Override\r
     public void messageToBuffer(short version, ByteBuf out,\r
             MultipartRequestMessage message) {\r
@@ -72,8 +73,10 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
         out.writeShort(message.getType().getIntValue());\r
         out.writeShort(createMultipartRequestFlagsBitmask(message.getFlags()));\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_MESSAGE, out);\r
-        \r
-        if (message.getMultipartRequestBody() instanceof MultipartRequestFlow) {\r
+\r
+        if (message.getMultipartRequestBody() instanceof MultipartRequestDesc ){\r
+            encodeDescBody(message.getMultipartRequestBody(), out);\r
+        } else if (message.getMultipartRequestBody() instanceof MultipartRequestFlow) {\r
             encodeFlowBody(message.getMultipartRequestBody(), out);\r
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestAggregate) {\r
             encodeAggregateBody(message.getMultipartRequestBody(), out);\r
@@ -93,7 +96,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             encodeExperimenterBody(message.getMultipartRequestBody(), out);\r
         }\r
     }\r
-    \r
+\r
     @Override\r
     public int computeLength(MultipartRequestMessage message) {\r
         return MESSAGE_LENGTH + computeBodyLength(message);\r
@@ -102,9 +105,9 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
     public byte getMessageType() {\r
         return MESSAGE_TYPE;\r
     }\r
-    \r
+\r
     /**\r
-     * \r
+     *\r
      * @param message\r
      * @return length of MultipartRequestMessage\r
      */\r
@@ -190,16 +193,22 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
         }\r
         return length;\r
     }\r
-    \r
+\r
     private static int createMultipartRequestFlagsBitmask(MultipartRequestFlags flags) {\r
         int multipartRequestFlagsBitmask = 0;\r
         Map<Integer, Boolean> multipartRequestFlagsMap = new HashMap<>();\r
         multipartRequestFlagsMap.put(0, flags.isOFPMPFREQMORE());\r
-        \r
+\r
         multipartRequestFlagsBitmask = ByteBufUtils.fillBitMaskFromMap(multipartRequestFlagsMap);\r
         return multipartRequestFlagsBitmask;\r
     }\r
-    \r
+\r
+    private void encodeDescBody(MultipartRequestBody multipartRequestBody,\r
+            ByteBuf output) {\r
+        // The body of MultiPartRequestDesc is empty\r
+\r
+    }\r
+\r
     private static void encodeFlowBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01 = 3;\r
         final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02 = 4;\r
@@ -209,11 +218,11 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
         output.writeInt(flow.getOutPort().intValue());\r
         output.writeInt(flow.getOutGroup().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02, output);\r
-        output.writeLong(flow.getCookie().longValue()); \r
+        output.writeLong(flow.getCookie().longValue());\r
         output.writeLong(flow.getCookieMask().longValue());\r
         MatchSerializer.encodeMatch(flow.getMatch(), output);\r
     }\r
-    \r
+\r
     private static void encodeAggregateBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_01 = 3;\r
         final byte PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_02 = 4;\r
@@ -223,45 +232,45 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
         output.writeInt(aggregate.getOutPort().intValue());\r
         output.writeInt(aggregate.getOutGroup().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_02, output);\r
-        output.writeLong(aggregate.getCookie().longValue()); \r
+        output.writeLong(aggregate.getCookie().longValue());\r
         output.writeLong(aggregate.getCookieMask().longValue());\r
         MatchSerializer.encodeMatch(aggregate.getMatch(), output);\r
     }\r
-    \r
+\r
     private static void encodePortStatsBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_PORTSTATS_BODY = 4;\r
         MultipartRequestPortStats portstats = (MultipartRequestPortStats) multipartRequestBody;\r
         output.writeInt(portstats.getPortNo().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_PORTSTATS_BODY, output);\r
     }\r
-    \r
+\r
     private static void encodeQueueBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         MultipartRequestQueue queue = (MultipartRequestQueue) multipartRequestBody;\r
         output.writeInt(queue.getPortNo().intValue());\r
         output.writeInt(queue.getQueueId().intValue());\r
     }\r
-    \r
+\r
     private static void encodeGroupStatsBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_GROUP_BODY = 4;\r
         MultipartRequestGroup groupStats = (MultipartRequestGroup) multipartRequestBody;\r
         output.writeInt(groupStats.getGroupId().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY, output);\r
     }\r
-    \r
+\r
     private static void encodeMeterBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_METER_BODY = 4;\r
         MultipartRequestMeter meter = (MultipartRequestMeter) multipartRequestBody;\r
         output.writeInt(meter.getMeterId().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_BODY, output);\r
     }\r
-    \r
+\r
     private static void encodeMeterConfigBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY = 4;\r
         MultipartRequestMeterConfig meterConfig = (MultipartRequestMeterConfig) multipartRequestBody;\r
         output.writeInt(meterConfig.getMeterId().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY, output);\r
     }\r
-    \r
+\r
     private static void encodeExperimenterBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         MultipartRequestExperimenter experimenter = (MultipartRequestExperimenter) multipartRequestBody;\r
         output.writeInt(experimenter.getExperimenter().intValue());\r
@@ -271,7 +280,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeBytes(data);\r
         }\r
     }\r
-    \r
+\r
     private static void encodeTableFeaturesBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         if (multipartRequestBody != null) {\r
             MultipartRequestTableFeatures tableFeatures = (MultipartRequestTableFeatures) multipartRequestBody;\r
@@ -289,7 +298,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             }\r
         }\r
     }\r
-    \r
+\r
     private static void writeTableFeatureProperties(ByteBuf output, List<TableFeatureProperties> props) {\r
         if (props != null) {\r
             for (TableFeatureProperties property : props) {\r
@@ -342,7 +351,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
                 } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {\r
                     final int EXPERIMENTER_MISS_CODE = 65535; // 0xFFFF\r
                     writeExperimenterRelatedTableProperty(output, property, EXPERIMENTER_MISS_CODE);\r
-                } \r
+                }\r
             }\r
         }\r
     }\r
@@ -361,7 +370,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeShort(length);\r
         }\r
     }\r
-    \r
+\r
     private static void writeNextTableRelatedTableProperty(ByteBuf output,\r
             TableFeatureProperties property, byte code) {\r
         output.writeShort(code);\r
@@ -377,7 +386,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeShort(length);\r
         }\r
     }\r
-    \r
+\r
     private static void writeActionsRelatedTableProperty(ByteBuf output,\r
             TableFeatureProperties property, byte code) {\r
         output.writeShort(code);\r
@@ -392,7 +401,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeShort(length);\r
         }\r
     }\r
-    \r
+\r
     private static void writeOxmRelatedTableProperty(ByteBuf output,\r
             TableFeatureProperties property, byte code) {\r
         output.writeShort(code);\r
@@ -407,7 +416,7 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeShort(length);\r
         }\r
     }\r
-    \r
+\r
     private static void writeExperimenterRelatedTableProperty(ByteBuf output,\r
             TableFeatureProperties property, int code) {\r
         output.writeShort(code);\r
@@ -426,12 +435,12 @@ public class MultipartRequestMessageFactory implements OFSerializer<MultipartReq
             output.writeInt(exp.getExpType().intValue());\r
         }\r
     }\r
-    \r
+\r
     private static int createTableConfigBitmask(TableConfig tableConfig) {\r
         int tableConfigBitmask = 0;\r
         Map<Integer, Boolean> tableConfigMap = new HashMap<>();\r
         tableConfigMap.put(3, tableConfig.isOFPTCDEPRECATEDMASK());\r
-        \r
+\r
         tableConfigBitmask = ByteBufUtils.fillBitMaskFromMap(tableConfigMap);\r
         return tableConfigBitmask;\r
     }\r