import java.util.List;
-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.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.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.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.rev130731.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.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;
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;
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) {
} 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);
}
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) {
* @param multipartRequestBody
* @param output
*/
- private void serializeDescBody(final MultipartRequestBody multipartRequestBody,
- final ByteBuf output) {
+ private void serializeDescBody() {
// The body of MultiPartRequestDesc is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeTableBody(final MultipartRequestBody multipartRequestBody,
- final ByteBuf out) {
+ private void serializeTableBody() {
// The body of MultiPartTable is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeGroupDescBody(final MultipartRequestBody multipartRequestBody,
- final ByteBuf out) {
+ private void serializeGroupDescBody() {
// The body of MultiPartRequestGroupDesc is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeGroupFeaturesBody(
- final MultipartRequestBody multipartRequestBody, final ByteBuf out) {
+ private void serializeGroupFeaturesBody() {
// The body of MultiPartRequestGroupFeatures is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeMeterFeaturesBody(
- final MultipartRequestBody multipartRequestBody, final ByteBuf out) {
+ private void serializeMeterFeaturesBody() {
// The body of MultiPartMeterFeatures is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializePortDescBody(final MultipartRequestBody multipartRequestBody,
- final ByteBuf out) {
+ private void serializePortDescBody() {
// The body of MultiPartPortDesc is empty
}
output.writeShort(code);
int lengthIndex = output.writerIndex();
output.writeShort(EncodeConstants.EMPTY_LENGTH);
- List<MatchEntries> entries = property.
- getAugmentation(OxmRelatedTableFeatureProperty.class).getMatchEntries();
+ List<MatchEntry> entries = property.
+ getAugmentation(OxmRelatedTableFeatureProperty.class).getMatchEntry();
if (entries != null) {
- TypeKeyMaker<MatchEntries> keyMaker = TypeKeyMakerFactory
+ TypeKeyMaker<MatchEntry> keyMaker = TypeKeyMakerFactory
.createMatchEntriesKeyMaker(EncodeConstants.OF13_VERSION_ID);
ListSerializer.serializeHeaderList(entries, keyMaker, registry, output);
}
private void writeExperimenterRelatedTableProperty(final ByteBuf output,
final TableFeatureProperties property) {
+ long expId = property.getAugmentation(ExperimenterIdTableFeatureProperty.class).getExperimenter().getValue();
OFSerializer<TableFeatureProperties> serializer = registry.getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, TableFeatureProperties.class));
+ ExperimenterSerializerKeyFactory.createMultipartRequestTFSerializerKey(
+ EncodeConstants.OF13_VERSION_ID, expId));
serializer.serialize(property, output);
}