import io.netty.buffer.ByteBuf;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import org.opendaylight.openflowjava.protocol.api.extensibility.EnhancedMessageTypeKey;
-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.SerializerRegistryInjector;
import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
-import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;
-import org.opendaylight.openflowjava.protocol.impl.util.CodingUtils;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeatureProperty;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterRelatedTableFeatureProperty;
-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.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.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.Experimenter;
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;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestExperimenterCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupDescCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableFeaturesCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.aggregate._case.MultipartRequestAggregate;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.experimenter._case.MultipartRequestExperimenter;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlow;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group._case.MultipartRequestGroup;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter._case.MultipartRequestMeter;
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;
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 int EXPERIMENTER_CODE = 65534; // 0xFFFE
- private static final int EXPERIMENTER_MISS_CODE = 65535; // 0xFFFF
- 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;
private SerializerRegistry registry;
@Override
- public void serialize(MultipartRequestInput message, ByteBuf outBuffer) {
+ public void serialize(final MultipartRequestInput message, final ByteBuf outBuffer) {
ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH);
outBuffer.writeShort(message.getType().getIntValue());
outBuffer.writeShort(createMultipartRequestFlagsBitmask(message.getFlags()));
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_MESSAGE, outBuffer);
+ 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);
}
ByteBufUtils.updateOFHeaderLength(outBuffer);
}
- private static int createMultipartRequestFlagsBitmask(MultipartRequestFlags flags) {
- int multipartRequestFlagsBitmask = 0;
- Map<Integer, Boolean> multipartRequestFlagsMap = new HashMap<>();
- multipartRequestFlagsMap.put(0, flags.isOFPMPFREQMORE());
+ private void serializeExperimenterBody(final MultipartRequestInput message,
+ final ByteBuf outBuffer) {
+ MultipartRequestExperimenterCase expCase =
+ (MultipartRequestExperimenterCase) message.getMultipartRequestBody();
+ MultipartRequestExperimenter experimenter = expCase.getMultipartRequestExperimenter();
+ long expId = experimenter.getAugmentation(ExperimenterIdMultipartRequest.class).getExperimenter().getValue();
+ OFSerializer<MultipartRequestExperimenterCase> serializer = registry.getSerializer(
+ ExperimenterSerializerKeyFactory.createMultipartRequestSerializerKey(
+ EncodeConstants.OF13_VERSION_ID, expId));
+ serializer.serialize(expCase, outBuffer);
+ }
- multipartRequestFlagsBitmask = ByteBufUtils.fillBitMaskFromMap(multipartRequestFlagsMap);
- return multipartRequestFlagsBitmask;
+ private static int createMultipartRequestFlagsBitmask(final MultipartRequestFlags flags) {
+ return ByteBufUtils.fillBitMask(0, flags.isOFPMPFREQMORE());
}
/**
* @param multipartRequestBody
* @param output
*/
- private void serializeDescBody(MultipartRequestBody multipartRequestBody,
- ByteBuf output) {
+ private void serializeDescBody() {
// The body of MultiPartRequestDesc is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeTableBody(MultipartRequestBody multipartRequestBody,
- ByteBuf out) {
+ private void serializeTableBody() {
// The body of MultiPartTable is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeGroupDescBody(MultipartRequestBody multipartRequestBody,
- ByteBuf out) {
+ private void serializeGroupDescBody() {
// The body of MultiPartRequestGroupDesc is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeGroupFeaturesBody(
- MultipartRequestBody multipartRequestBody, ByteBuf out) {
+ private void serializeGroupFeaturesBody() {
// The body of MultiPartRequestGroupFeatures is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializeMeterFeaturesBody(
- MultipartRequestBody multipartRequestBody, ByteBuf out) {
+ private void serializeMeterFeaturesBody() {
// The body of MultiPartMeterFeatures is empty
}
* @param multipartRequestBody
* @param out
*/
- private void serializePortDescBody(MultipartRequestBody multipartRequestBody,
- ByteBuf out) {
+ private void serializePortDescBody() {
// The body of MultiPartPortDesc is empty
}
- private void serializeFlowBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private void serializeFlowBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestFlowCase flowCase = (MultipartRequestFlowCase) multipartRequestBody;
MultipartRequestFlow flow = flowCase.getMultipartRequestFlow();
output.writeByte(flow.getTableId().byteValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_01);
output.writeInt(flow.getOutPort().intValue());
output.writeInt(flow.getOutGroup().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_FLOW_BODY_02);
output.writeLong(flow.getCookie().longValue());
output.writeLong(flow.getCookieMask().longValue());
OFSerializer<Match> serializer = registry.getSerializer(new MessageTypeKey<>(
serializer.serialize(flow.getMatch(), output);
}
- private void serializeAggregateBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private void serializeAggregateBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestAggregateCase aggregateCase = (MultipartRequestAggregateCase) multipartRequestBody;
MultipartRequestAggregate aggregate = aggregateCase.getMultipartRequestAggregate();
output.writeByte(aggregate.getTableId().byteValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_01, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_01);
output.writeInt(aggregate.getOutPort().intValue());
output.writeInt(aggregate.getOutGroup().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_02, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_AGREGGATE_BODY_02);
output.writeLong(aggregate.getCookie().longValue());
output.writeLong(aggregate.getCookieMask().longValue());
OFSerializer<Match> serializer = registry.getSerializer(new MessageTypeKey<>(
serializer.serialize(aggregate.getMatch(), output);
}
- private static void serializePortStatsBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private static void serializePortStatsBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestPortStatsCase portstatsCase = (MultipartRequestPortStatsCase) multipartRequestBody;
MultipartRequestPortStats portstats = portstatsCase.getMultipartRequestPortStats();
output.writeInt(portstats.getPortNo().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_PORTSTATS_BODY, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_PORTSTATS_BODY);
}
- private static void serializeQueueBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private static void serializeQueueBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestQueueCase queueCase = (MultipartRequestQueueCase) multipartRequestBody;
MultipartRequestQueue queue = queueCase.getMultipartRequestQueue();
output.writeInt(queue.getPortNo().intValue());
output.writeInt(queue.getQueueId().intValue());
}
- private static void serializeeGroupStatsBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private static void serializeeGroupStatsBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestGroupCase groupStatsCase = (MultipartRequestGroupCase) multipartRequestBody;
MultipartRequestGroup groupStats = groupStatsCase.getMultipartRequestGroup();
output.writeInt(groupStats.getGroupId().getValue().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY);
}
- private static void serializeMeterBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private static void serializeMeterBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestMeterCase meterCase = (MultipartRequestMeterCase) multipartRequestBody;
MultipartRequestMeter meter = meterCase.getMultipartRequestMeter();
output.writeInt(meter.getMeterId().getValue().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_BODY, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_BODY);
}
- private static void serializeMeterConfigBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private static void serializeMeterConfigBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
MultipartRequestMeterConfigCase meterConfigCase = (MultipartRequestMeterConfigCase) multipartRequestBody;
MultipartRequestMeterConfig meterConfig = meterConfigCase.getMultipartRequestMeterConfig();
output.writeInt(meterConfig.getMeterId().getValue().intValue());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY);
}
- private void serializeTableFeaturesBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {
+ private void serializeTableFeaturesBody(final MultipartRequestBody multipartRequestBody, final ByteBuf output) {
if (multipartRequestBody != null) {
MultipartRequestTableFeaturesCase tableFeaturesCase = (MultipartRequestTableFeaturesCase) multipartRequestBody;
MultipartRequestTableFeatures tableFeatures = tableFeaturesCase.getMultipartRequestTableFeatures();
int tableFeatureLengthIndex = output.writerIndex();
output.writeShort(EncodeConstants.EMPTY_LENGTH);
output.writeByte(currTableFeature.getTableId());
- ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_TABLE_FEATURES_BODY, output);
+ output.writeZero(PADDING_IN_MULTIPART_REQUEST_TABLE_FEATURES_BODY);
output.writeBytes(currTableFeature.getName().getBytes());
- ByteBufUtils.padBuffer((32 - currTableFeature.getName().getBytes().length), output);
+ output.writeZero(32 - currTableFeature.getName().getBytes().length);
output.writeLong(currTableFeature.getMetadataMatch().longValue());
output.writeLong(currTableFeature.getMetadataWrite().longValue());
output.writeInt(createTableConfigBitmask(currTableFeature.getConfig()));
}
}
- private void writeTableFeatureProperties(
ByteBuf output, List<TableFeatureProperties> props) {
+ private void writeTableFeatureProperties(
final ByteBuf output, final List<TableFeatureProperties> props) {
if (props != null) {
for (TableFeatureProperties property : props) {
TableFeaturesPropType type = property.getType();
} else if (type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) {
writeOxmRelatedTableProperty(output, property, APPLY_SETFIELD_MISS_CODE);
} else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER)) {
- writeExperimenterRelatedTableProperty(output, property, EXPERIMENTER_CODE);
+ writeExperimenterRelatedTableProperty(output, property);
} else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {
- writeExperimenterRelatedTableProperty(output, property, EXPERIMENTER_MISS_CODE);
+ writeExperimenterRelatedTableProperty(output, property);
}
}
}
}
- private void writeInstructionRelatedTableProperty(ByteBuf output,
- TableFeatureProperties property, byte code) {
+ 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);
- HeaderSerializer<Instruction> instructionSerializer = registry.getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Instruction.class));
- CodingUtils.serializeHeaders(instructions, instructionSerializer, output);
- } else {
- padding = paddingNeeded(length);
- output.writeShort(length);
+ TypeKeyMaker<Instruction> keyMaker = TypeKeyMakerFactory
+ .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID);
+ ListSerializer.serializeHeaderList(instructions, keyMaker, registry, output);
}
- ByteBufUtils.padBuffer(padding, output);
+ int length = output.writerIndex() - startIndex;
+ output.setShort(lengthIndex, length);
+ output.writeZero(paddingNeeded(length));
}
- private static void writeNextTableRelatedTableProperty(ByteBuf output,
- TableFeatureProperties property, byte code) {
+ 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);
}
- ByteBufUtils.padBuffer(padding, output);
+ int length = output.writerIndex() - startIndex;
+ output.setShort(lengthIndex, length);
+ output.writeZero(paddingNeeded(length));
}
- private static int paddingNeeded(int length) {
+ private static int paddingNeeded(final int length) {
int paddingRemainder = length % EncodeConstants.PADDING;
int result = 0;
if (paddingRemainder != 0) {
return result;
}
- private void writeActionsRelatedTableProperty(ByteBuf output,
- TableFeatureProperties property, byte code) {
+ 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);
- HeaderSerializer<Action> actionSerializer = registry.getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Action.class));
- CodingUtils.serializeHeaders(actions, actionSerializer, output);
- } else {
- padding = paddingNeeded(length);
- output.writeShort(length);
+ TypeKeyMaker<Action> keyMaker = TypeKeyMakerFactory
+ .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID);
+ ListSerializer.serializeHeaderList(actions, keyMaker, registry, output);
}
- ByteBufUtils.padBuffer(padding, output);
+ int length = output.writerIndex() - startIndex;
+ output.setShort(lengthIndex, length);
+ output.writeZero(paddingNeeded(length));
}
- private void writeOxmRelatedTableProperty(ByteBuf output,
- TableFeatureProperties property, byte code) {
+ 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) {
- HeaderSerializer<MatchEntries> entrySerializer = registry.getSerializer(
- new EnhancedMessageTypeKey<>(EncodeConstants.OF13_VERSION_ID,
- entry.getOxmClass(), entry.getOxmMatchField()));
- 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);
}
- ByteBufUtils.padBuffer(padding, output);
+ int length = output.writerIndex() - startIndex;
+ output.setShort(lengthIndex, length);
+ output.writeZero(paddingNeeded(length));
}
- private static void writeExperimenterRelatedTableProperty(ByteBuf output,
- TableFeatureProperties property, int code) {
- output.writeShort(code);
- ExperimenterRelatedTableFeatureProperty exp = property.
- getAugmentation(ExperimenterRelatedTableFeatureProperty.class);
- byte[] data = exp.getData();
- int length = TABLE_FEAT_HEADER_LENGTH + 2 * (EncodeConstants.SIZE_OF_INT_IN_BYTES);
- int padding = 0;
- if (data != null) {
- output.writeShort(length + data.length);
- padding = paddingNeeded(length + data.length);
- output.writeInt(exp.getExperimenter().intValue());
- output.writeInt(exp.getExpType().intValue());
- output.writeBytes(data);
- } else {
- output.writeShort(length);
- padding = paddingNeeded(length);
- output.writeInt(exp.getExperimenter().intValue());
- output.writeInt(exp.getExpType().intValue());
- }
- ByteBufUtils.padBuffer(padding, output);
+ private void writeExperimenterRelatedTableProperty(final ByteBuf output,
+ final TableFeatureProperties property) {
+ 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(TableConfig tableConfig) {
- int tableConfigBitmask = 0;
- Map<Integer, Boolean> tableConfigMap = new HashMap<>();
- tableConfigMap.put(3, tableConfig.isOFPTCDEPRECATEDMASK());
-
- tableConfigBitmask = ByteBufUtils.fillBitMaskFromMap(tableConfigMap);
- return tableConfigBitmask;
+ private static int createTableConfigBitmask(final TableConfig tableConfig) {
+ return ByteBufUtils.fillBitMask(3, tableConfig.isOFPTCDEPRECATEDMASK());
}
@Override
- public void injectSerializerRegistry(SerializerRegistry serializerRegistry) {
+ public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) {
this.registry = serializerRegistry;
}
}
Code Review / openflowjava.git / blobdiff