X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2Ffactories%2FMultipartRequestInputFactory.java;h=7afb253b4bc50d524d9faa4b59427d34c5f5cd96;hb=5f5622e79402f70a944fa93fd7ee2d84d1776b08;hp=507a636e5ee9b75742c6213c71fe1d97a1dc3766;hpb=d58ee5d9fb3dffc8bf395d2e29342dd5e16c9932;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
index 507a636e..7afb253b 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
@@ -12,32 +12,30 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.List;
 
-import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderSerializer;
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistryInjector;
-import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
+import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.ListSerializer;
 import org.opendaylight.openflowjava.protocol.impl.util.TypeKeyMaker;
 import org.opendaylight.openflowjava.protocol.impl.util.TypeKeyMakerFactory;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeatureProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.InstructionRelatedTableFeatureProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NextTableRelatedTableFeatureProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmRelatedTableFeatureProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.table.features.properties.container.table.feature.properties.NextTableIds;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.Experimenter;
+import org.opendaylight.openflowjava.util.ExperimenterSerializerKeyFactory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdMultipartRequest;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ExperimenterIdTableFeatureProperty;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ExperimenterClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.MultipartRequestBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestAggregateCase;
@@ -75,7 +73,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 public class MultipartRequestInputFactory implements OFSerializer<MultipartRequestInput>, SerializerRegistryInjector {
     private static final byte MESSAGE_TYPE = 18;
     private static final byte PADDING_IN_MULTIPART_REQUEST_MESSAGE = 4;
-    private static final byte TABLE_FEAT_HEADER_LENGTH = 4;
     private static final byte INSTRUCTIONS_CODE = 0;
     private static final byte INSTRUCTIONS_MISS_CODE = 1;
     private static final byte NEXT_TABLE_CODE = 2;
@@ -90,7 +87,6 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
     private static final byte WRITE_SETFIELD_MISS_CODE = 13;
     private static final byte APPLY_SETFIELD_CODE = 14;
     private static final byte APPLY_SETFIELD_MISS_CODE = 15;
-    private static final byte STRUCTURE_HEADER_LENGTH = 4;
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01 = 3;
     private static final byte PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02 = 4;
     private static final byte PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_01 = 3;
@@ -110,13 +106,13 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
         outBuffer.writeZero(PADDING_IN_MULTIPART_REQUEST_MESSAGE);
 
         if (message.getMultipartRequestBody() instanceof MultipartRequestDescCase){
-            serializeDescBody(message.getMultipartRequestBody(), outBuffer);
+            serializeDescBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestFlowCase) {
             serializeFlowBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestAggregateCase) {
             serializeAggregateBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestTableCase) {
-            serializeTableBody(message.getMultipartRequestBody(), outBuffer);
+            serializeTableBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestPortStatsCase) {
             serializePortStatsBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestQueueCase) {
@@ -124,19 +120,19 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestGroupCase) {
             serializeeGroupStatsBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestGroupDescCase) {
-            serializeGroupDescBody(message.getMultipartRequestBody(), outBuffer);
+            serializeGroupDescBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestGroupFeaturesCase) {
-            serializeGroupFeaturesBody(message.getMultipartRequestBody(), outBuffer);
+            serializeGroupFeaturesBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestMeterCase) {
             serializeMeterBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestMeterConfigCase) {
             serializeMeterConfigBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestMeterFeaturesCase) {
-            serializeMeterFeaturesBody(message.getMultipartRequestBody(), outBuffer);
+            serializeMeterFeaturesBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestTableFeaturesCase) {
             serializeTableFeaturesBody(message.getMultipartRequestBody(), outBuffer);
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestPortDescCase) {
-            serializePortDescBody(message.getMultipartRequestBody(), outBuffer);
+            serializePortDescBody();
         } else if (message.getMultipartRequestBody() instanceof MultipartRequestExperimenterCase) {
         	serializeExperimenterBody(message, outBuffer);
         }
@@ -148,9 +144,11 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
         MultipartRequestExperimenterCase expCase =
                 (MultipartRequestExperimenterCase) message.getMultipartRequestBody();
         MultipartRequestExperimenter experimenter = expCase.getMultipartRequestExperimenter();
-        OFSerializer<MultipartRequestExperimenter> serializer = registry.getSerializer(
-                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequestExperimenter.class));
-        serializer.serialize(experimenter, outBuffer);
+        long expId = experimenter.getAugmentation(ExperimenterIdMultipartRequest.class).getExperimenter().getValue();
+        OFSerializer<MultipartRequestExperimenterCase> serializer = registry.getSerializer(
+                ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey(
+                        EncodeConstants.OF13_VERSION_ID, expId));
+        serializer.serialize(expCase, outBuffer);
     }
 
     private static int createMultipartRequestFlagsBitmask(final MultipartRequestFlags flags) {
@@ -161,8 +159,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param output
      */
-    private void serializeDescBody(final MultipartRequestBody multipartRequestBody,
-            final ByteBuf output) {
+    private void serializeDescBody() {
         // The body of MultiPartRequestDesc is empty
     }
 
@@ -170,8 +167,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param out
      */
-    private void serializeTableBody(final MultipartRequestBody multipartRequestBody,
-            final ByteBuf out) {
+    private void serializeTableBody() {
      // The body of MultiPartTable is empty
     }
 
@@ -179,8 +175,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param out
      */
-    private void serializeGroupDescBody(final MultipartRequestBody multipartRequestBody,
-            final ByteBuf out) {
+    private void serializeGroupDescBody() {
      // The body of MultiPartRequestGroupDesc is empty
     }
 
@@ -188,8 +183,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param out
      */
-    private void serializeGroupFeaturesBody(
-            final MultipartRequestBody multipartRequestBody, final ByteBuf out) {
+    private void serializeGroupFeaturesBody() {
      // The body of MultiPartRequestGroupFeatures is empty
     }
 
@@ -197,8 +191,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param out
      */
-    private void serializeMeterFeaturesBody(
-            final MultipartRequestBody multipartRequestBody, final ByteBuf out) {
+    private void serializeMeterFeaturesBody() {
      // The body of MultiPartMeterFeatures is empty
     }
 
@@ -206,8 +199,7 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
      * @param multipartRequestBody
      * @param out
      */
-    private void serializePortDescBody(final MultipartRequestBody multipartRequestBody,
-            final ByteBuf out) {
+    private void serializePortDescBody() {
      // The body of MultiPartPortDesc is empty
     }
 
@@ -342,50 +334,38 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
 
     private void writeInstructionRelatedTableProperty(final ByteBuf output,
             final TableFeatureProperties property, final byte code) {
+        int startIndex = output.writerIndex();
         output.writeShort(code);
+        int lengthIndex = output.writerIndex();
+        output.writeShort(EncodeConstants.EMPTY_LENGTH);
         List<Instruction> instructions = property.
                 getAugmentation(InstructionRelatedTableFeatureProperty.class).getInstruction();
-        int length = TABLE_FEAT_HEADER_LENGTH;
-        int padding = 0;
         if (instructions != null) {
-            for (Instruction instruction : instructions) {
-                if (instruction.getType().isAssignableFrom(Experimenter.class)) {
-                    length += EncodeConstants.EXPERIMENTER_IDS_LENGTH;
-                } else {
-                    length += STRUCTURE_HEADER_LENGTH;
-                }
-            }
-            padding = paddingNeeded(length);
-            output.writeShort(length);
             TypeKeyMaker<Instruction> keyMaker = TypeKeyMakerFactory
                     .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID);
             ListSerializer.serializeHeaderList(instructions, keyMaker, registry, output);
-        } else {
-            padding = paddingNeeded(length);
-            output.writeShort(length);
         }
-        output.writeZero(padding);
+        int length = output.writerIndex() - startIndex;
+        output.setShort(lengthIndex, length);
+        output.writeZero(paddingNeeded(length));
     }
 
     private static void writeNextTableRelatedTableProperty(final ByteBuf output,
             final TableFeatureProperties property, final byte code) {
+        int startIndex = output.writerIndex();
         output.writeShort(code);
+        int lengthIndex = output.writerIndex();
+        output.writeShort(EncodeConstants.EMPTY_LENGTH);
         List<NextTableIds> nextTableIds = property.
                 getAugmentation(NextTableRelatedTableFeatureProperty.class).getNextTableIds();
-        int length = TABLE_FEAT_HEADER_LENGTH;
-        int padding = 0;
         if (nextTableIds != null) {
-            length += nextTableIds.size();
-            padding = paddingNeeded(length);
-            output.writeShort(length);
             for (NextTableIds next : nextTableIds) {
                 output.writeByte(next.getTableId());
             }
-        } else {
-            padding = paddingNeeded(length);
-            output.writeShort(length + padding);
         }
-        output.writeZero(padding);
+        int length = output.writerIndex() - startIndex;
+        output.setShort(lengthIndex, length);
+        output.writeZero(paddingNeeded(length));
     }
 
     private static int paddingNeeded(final int length) {
@@ -399,69 +379,47 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
 
     private void writeActionsRelatedTableProperty(final ByteBuf output,
             final TableFeatureProperties property, final byte code) {
+        int startIndex = output.writerIndex();
         output.writeShort(code);
+        int lengthIndex = output.writerIndex();
+        output.writeShort(EncodeConstants.EMPTY_LENGTH);
         List<Action> actions = property.
                 getAugmentation(ActionRelatedTableFeatureProperty.class).getAction();
-        int length = TABLE_FEAT_HEADER_LENGTH;
-        int padding = 0;
         if (actions != null) {
-            for (Action action : actions) {
-                if (action.getType().isAssignableFrom(Experimenter.class)) {
-                    length += EncodeConstants.EXPERIMENTER_IDS_LENGTH;
-                } else {
-                    length += STRUCTURE_HEADER_LENGTH;
-                }
-            }
-            length += actions.size() * STRUCTURE_HEADER_LENGTH;
-            padding += paddingNeeded(length);
-            output.writeShort(length);
             TypeKeyMaker<Action> keyMaker = TypeKeyMakerFactory
                     .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID);
             ListSerializer.serializeHeaderList(actions, keyMaker, registry, output);
-        } else {
-            padding = paddingNeeded(length);
-            output.writeShort(length);
         }
-        output.writeZero(padding);
+        int length = output.writerIndex() - startIndex;
+        output.setShort(lengthIndex, length);
+        output.writeZero(paddingNeeded(length));
     }
 
     private void writeOxmRelatedTableProperty(final ByteBuf output,
             final TableFeatureProperties property, final byte code) {
+        int startIndex = output.writerIndex();
         output.writeShort(code);
-        List<MatchEntries> entries = property.
-                getAugmentation(OxmRelatedTableFeatureProperty.class).getMatchEntries();
-        int length = TABLE_FEAT_HEADER_LENGTH;
-        int padding = 0;
+        int lengthIndex = output.writerIndex();
+        output.writeShort(EncodeConstants.EMPTY_LENGTH);
+        List<MatchEntry> entries = property.
+                getAugmentation(OxmRelatedTableFeatureProperty.class).getMatchEntry();
         if (entries != null) {
-            // experimenter length / definition ?
-            length += entries.size() * STRUCTURE_HEADER_LENGTH;
-            padding = paddingNeeded(length);
-            output.writeShort(length);
-
-            for (MatchEntries entry : entries) {
-                MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
-                        EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField());
-                if (entry.getOxmClass().equals(ExperimenterClass.class)) {
-                    key.setExperimenterId(entry.getAugmentation(ExperimenterIdMatchEntry.class)
-                            .getExperimenter().getValue());
-                } else {
-                    key.setExperimenterId(null);
-                }
-                HeaderSerializer<MatchEntries> entrySerializer = registry.getSerializer(key);
-                entrySerializer.serializeHeader(entry, output);
-            }
-        } else {
-            padding = paddingNeeded(length);
-            output.writeShort(length);
+            TypeKeyMaker<MatchEntry> keyMaker = TypeKeyMakerFactory
+                    .createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID);
+            ListSerializer.serializeHeaderList(entries, keyMaker, registry, output);
         }
-        output.writeZero(padding);
+        int length = output.writerIndex() - startIndex;
+        output.setShort(lengthIndex, length);
+        output.writeZero(paddingNeeded(length));
     }
 
     private void writeExperimenterRelatedTableProperty(final ByteBuf output,
             final TableFeatureProperties property) {
-    	OFSerializer<TableFeatureProperties> serializer = registry.getSerializer(
-    			new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, TableFeatureProperties.class));
-    	serializer.serialize(property, output);
+        long expId = property.getAugmentation(ExperimenterIdTableFeatureProperty.class).getExperimenter().getValue();
+        OFSerializer<TableFeatureProperties> serializer = registry.getSerializer(
+                ExperimenterSerializerKeyFactory.createMultipartRequestTFSerializerKey(
+                        EncodeConstants.OF13_VERSION_ID, expId));
+        serializer.serialize(property, output);
     }
 
     private static int createTableConfigBitmask(final TableConfig tableConfig) {