\r
import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;\r
import org.opendaylight.openflowjava.protocol.impl.util.ActionsDeserializer;\r
+import org.opendaylight.openflowjava.protocol.impl.util.InstructionsDeserializer;\r
+import org.opendaylight.openflowjava.protocol.impl.util.MatchDeserializer;\r
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.InstructionRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.InstructionRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NextTableRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NextTableRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.table.features.properties.container.table.feature.properties.NextTableIds;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.ActionsList;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupCapabilities;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortState;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessageBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.buckets.BucketsList;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyQueueBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTable;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTableBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTableFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTableFeaturesBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow.FlowStats;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow.FlowStatsBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.GroupStats;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.queue.QueueStatsBuilder;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.TableStats;\r
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.TableStatsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.features.TableFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.features.TableFeaturesBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.TableFeatureProperties;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.TableFeaturePropertiesBuilder;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
\r
/**\r
* @author timotej.kubas\r
*/\r
public class MultipartReplyMessageFactory implements OFDeserializer<MultipartReplyMessage> {\r
\r
- private static MultipartReplyMessageFactory instance;\r
+ private static final Logger LOGGER = LoggerFactory\r
+ .getLogger(MultipartReplyMessageFactory.class);\r
private static final byte PADDING_IN_MULTIPART_REPLY_HEADER = 4;\r
\r
+ private static MultipartReplyMessageFactory instance;\r
+\r
private MultipartReplyMessageFactory() {\r
// singleton\r
}\r
MultipartReplyMessageBuilder builder = new MultipartReplyMessageBuilder();\r
builder.setVersion(version);\r
builder.setXid(rawMessage.readUnsignedInt());\r
- builder.setType(MultipartType.forValue(rawMessage.readUnsignedShort()));\r
+ int type = rawMessage.readUnsignedShort();\r
+ builder.setType(MultipartType.forValue(type));\r
builder.setFlags(new MultipartRequestFlags((rawMessage.readUnsignedShort() & 0x01) != 0));\r
rawMessage.skipBytes(PADDING_IN_MULTIPART_REPLY_HEADER);\r
\r
- switch (builder.getType().getIntValue()) {\r
+ switch (type) {\r
case 0: builder.setMultipartReplyBody(setDesc(rawMessage));\r
break;\r
case 1: builder.setMultipartReplyBody(setFlow(rawMessage));\r
break;\r
case 11: builder.setMultipartReplyBody(setMeterFeatures(rawMessage));\r
break;\r
+ case 12: builder.setMultipartReplyBody(setTableFeatures(rawMessage));\r
+ break;\r
case 13: builder.setMultipartReplyBody(setPortDesc(rawMessage));\r
break;\r
case 0xFFFF: builder.setMultipartReplyBody(setExperimenter(rawMessage));\r
private static MultipartReplyFlow setFlow(ByteBuf input) {\r
final byte PADDING_IN_FLOW_STATS_HEADER_01 = 1;\r
final byte PADDING_IN_FLOW_STATS_HEADER_02 = 4;\r
- final byte flowLength = 2;\r
MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();\r
List<FlowStats> flowStatsList = new ArrayList<>();\r
- FlowStatsBuilder flowStatsBuilder = new FlowStatsBuilder();\r
while (input.readableBytes() > 0) {\r
- input.skipBytes(flowLength);\r
+ FlowStatsBuilder flowStatsBuilder = new FlowStatsBuilder();\r
+ input.skipBytes(Short.SIZE / Byte.SIZE);\r
flowStatsBuilder.setTableId(input.readUnsignedByte());\r
input.skipBytes(PADDING_IN_FLOW_STATS_HEADER_01);\r
flowStatsBuilder.setDurationSec(input.readUnsignedInt());\r
flowStatsBuilder.setPriority(input.readUnsignedShort());\r
flowStatsBuilder.setIdleTimeout(input.readUnsignedShort());\r
flowStatsBuilder.setHardTimeout(input.readUnsignedShort());\r
- flowStatsBuilder.setFlags(createFlowModFalgsFromBitmap(input.readShort()));\r
+ flowStatsBuilder.setFlags(createFlowModFlagsFromBitmap(input.readShort()));\r
input.skipBytes(PADDING_IN_FLOW_STATS_HEADER_02);\r
byte[] cookie = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(cookie);\r
byte[] byteCount = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(byteCount);\r
flowStatsBuilder.setByteCount(new BigInteger(byteCount));\r
- // TODO match\r
- // TODO instructions\r
+ flowStatsBuilder.setMatch(MatchDeserializer.createMatch(input));\r
+ flowStatsBuilder.setInstructions(InstructionsDeserializer.createInstructions(input, input.readableBytes()));\r
flowStatsList.add(flowStatsBuilder.build());\r
}\r
- flowBuilder.setFlowStats(new ArrayList<>(flowStatsList));\r
- flowStatsList.clear();\r
+ flowBuilder.setFlowStats(flowStatsList);\r
return flowBuilder.build();\r
}\r
\r
- private static FlowModFlags createFlowModFalgsFromBitmap(short input){\r
+ private static FlowModFlags createFlowModFlagsFromBitmap(short input){\r
final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) != 0;\r
final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) != 0;\r
final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) != 0; \r
private static MultipartReplyTable setTable(ByteBuf input) {\r
final byte PADDING_IN_TABLE_HEADER = 3;\r
MultipartReplyTableBuilder builder = new MultipartReplyTableBuilder();\r
- TableStatsBuilder tableStatsBuilder = new TableStatsBuilder();\r
List<TableStats> tableStatsList = new ArrayList<>();\r
while (input.readableBytes() > 0) {\r
+ TableStatsBuilder tableStatsBuilder = new TableStatsBuilder();\r
tableStatsBuilder.setTableId(input.readUnsignedByte());\r
input.skipBytes(PADDING_IN_TABLE_HEADER);\r
tableStatsBuilder.setActiveCount(input.readUnsignedInt());\r
tableStatsBuilder.setMatchedCount(new BigInteger(matchedCount));\r
tableStatsList.add(tableStatsBuilder.build());\r
}\r
- builder.setTableStats(new ArrayList<>(tableStatsList));\r
- tableStatsList.clear();\r
+ builder.setTableStats(tableStatsList);\r
+ return builder.build();\r
+ }\r
+ \r
+ private static MultipartReplyTableFeatures setTableFeatures(ByteBuf input) {\r
+ final byte PADDING_IN_MULTIPART_REPLY_TABLE_FEATURES = 5;\r
+ final byte MAX_TABLE_NAME_LENGTH = 32;\r
+ final byte MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH = 64;\r
+ MultipartReplyTableFeaturesBuilder builder = new MultipartReplyTableFeaturesBuilder();\r
+ List<TableFeatures> features = new ArrayList<>();\r
+ while (input.readableBytes() > 0) {\r
+ TableFeaturesBuilder featuresBuilder = new TableFeaturesBuilder();\r
+ int length = input.readUnsignedShort();\r
+ featuresBuilder.setTableId(input.readUnsignedByte());\r
+ input.skipBytes(PADDING_IN_MULTIPART_REPLY_TABLE_FEATURES);\r
+ featuresBuilder.setName(input.readBytes(MAX_TABLE_NAME_LENGTH).toString());\r
+ byte[] metadataMatch = new byte[Long.SIZE / Byte.SIZE];\r
+ input.readBytes(metadataMatch);\r
+ featuresBuilder.setMetadataMatch(metadataMatch);\r
+ byte[] metadataWrite = new byte[Long.SIZE / Byte.SIZE];\r
+ input.readBytes(metadataWrite);\r
+ featuresBuilder.setMetadataWrite(metadataWrite);\r
+ featuresBuilder.setConfig(createPortConfig(input.readUnsignedInt()));\r
+ featuresBuilder.setMaxEntries(input.readUnsignedInt());\r
+ featuresBuilder.setTableFeatureProperties(createTableFeaturesProperties(input, \r
+ length - MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH));\r
+ features.add(featuresBuilder.build());\r
+ }\r
+ builder.setTableFeatures(features);\r
return builder.build();\r
}\r
\r
+ private static List<TableFeatureProperties> createTableFeaturesProperties(ByteBuf input, int length) {\r
+ final byte COMMON_PROPERTY_LENGTH = 4;\r
+ List<TableFeatureProperties> properties = new ArrayList<>();\r
+ int tableFeaturesLength = length;\r
+ while (tableFeaturesLength > 0) {\r
+ TableFeaturePropertiesBuilder builder = new TableFeaturePropertiesBuilder();\r
+ TableFeaturesPropType type = TableFeaturesPropType.forValue(input.readUnsignedShort());\r
+ builder.setType(type);\r
+ int propertyLength = input.readUnsignedShort();\r
+ tableFeaturesLength -= propertyLength;\r
+ if (type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS)) {\r
+ InstructionRelatedTableFeaturePropertyBuilder insBuilder = new InstructionRelatedTableFeaturePropertyBuilder();\r
+ insBuilder.setInstructions(InstructionsDeserializer.createInstructions(input, propertyLength - COMMON_PROPERTY_LENGTH));\r
+ builder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insBuilder.build());\r
+ } else if (type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLES)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS)) {\r
+ propertyLength -= COMMON_PROPERTY_LENGTH;\r
+ NextTableRelatedTableFeaturePropertyBuilder tableBuilder = new NextTableRelatedTableFeaturePropertyBuilder();\r
+ List<NextTableIds> ids = new ArrayList<>();\r
+ while (propertyLength > 0) {\r
+ NextTableIdsBuilder nextTableIdsBuilder = new NextTableIdsBuilder();\r
+ nextTableIdsBuilder.setTableId(input.readUnsignedByte());\r
+ ids.add(nextTableIdsBuilder.build());\r
+ }\r
+ tableBuilder.setNextTableIds(ids);\r
+ builder.addAugmentation(NextTableRelatedTableFeatureProperty.class, tableBuilder.build());\r
+ } else if (type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS)) {\r
+ ActionRelatedTableFeaturePropertyBuilder actionBuilder = new ActionRelatedTableFeaturePropertyBuilder();\r
+ actionBuilder.setActionsList(ActionsDeserializer.createActionsList(input, propertyLength - COMMON_PROPERTY_LENGTH));\r
+ builder.addAugmentation(ActionRelatedTableFeatureProperty.class, actionBuilder.build());\r
+ } else if (type.equals(TableFeaturesPropType.OFPTFPTMATCH)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTWILDCARDS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELD)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS)) {\r
+ OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
+ oxmBuilder.setMatchEntries(MatchDeserializer.createMatchEntries(input, propertyLength - COMMON_PROPERTY_LENGTH));\r
+ builder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
+ } else if (type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTER)\r
+ || type.equals(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS)) {\r
+ final byte EXPERIMENTER_PROPERTY_LENGTH = 12;\r
+ ExperimenterRelatedTableFeaturePropertyBuilder expBuilder = new ExperimenterRelatedTableFeaturePropertyBuilder();\r
+ expBuilder.setExperimenter(input.readUnsignedInt());\r
+ expBuilder.setExpType(input.readUnsignedInt());\r
+ byte[] data = new byte[propertyLength - EXPERIMENTER_PROPERTY_LENGTH];\r
+ input.readBytes(data);\r
+ expBuilder.setData(data);\r
+ builder.addAugmentation(ExperimenterRelatedTableFeatureProperty.class, expBuilder.build());\r
+ }\r
+ properties.add(builder.build());\r
+ }\r
+ return properties;\r
+ }\r
+ \r
private static MultipartReplyPortStats setPortStats(ByteBuf input) {\r
final byte PADDING_IN_PORT_STATS_HEADER = 4;\r
MultipartReplyPortStatsBuilder builder = new MultipartReplyPortStatsBuilder();\r
- PortStatsBuilder portStatsBuilder = new PortStatsBuilder();\r
List<PortStats> portStatsList = new ArrayList<>();\r
while (input.readableBytes() > 0) {\r
+ PortStatsBuilder portStatsBuilder = new PortStatsBuilder();\r
portStatsBuilder.setPortNo(input.readUnsignedInt());\r
input.skipBytes(PADDING_IN_PORT_STATS_HEADER);\r
- \r
byte[] rxPackets = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxPackets);\r
portStatsBuilder.setRxPackets(new BigInteger(rxPackets));\r
- \r
byte[] txPackets = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txPackets);\r
portStatsBuilder.setTxPackets(new BigInteger(txPackets));\r
- \r
byte[] rxBytes = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxBytes);\r
portStatsBuilder.setRxBytes(new BigInteger(rxBytes));\r
- \r
byte[] txBytes = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txBytes);\r
portStatsBuilder.setTxBytes(new BigInteger(txBytes));\r
- \r
byte[] rxDropped = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxDropped);\r
portStatsBuilder.setRxDropped(new BigInteger(rxDropped));\r
- \r
byte[] txDropped = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txDropped);\r
portStatsBuilder.setTxDropped(new BigInteger(txDropped));\r
- \r
byte[] rxErrors = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxErrors);\r
portStatsBuilder.setRxErrors(new BigInteger(rxErrors));\r
- \r
byte[] txErrors = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txErrors);\r
portStatsBuilder.setTxErrors(new BigInteger(txErrors));\r
- \r
byte[] rxFrameErr = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxFrameErr);\r
portStatsBuilder.setRxFrameErr(new BigInteger(rxFrameErr));\r
- \r
byte[] rxOverErr = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxOverErr);\r
portStatsBuilder.setRxOverErr(new BigInteger(rxOverErr));\r
- \r
byte[] rxCrcErr = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(rxCrcErr);\r
portStatsBuilder.setRxCrcErr(new BigInteger(rxCrcErr));\r
- \r
byte[] collisions = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(collisions);\r
portStatsBuilder.setCollisions(new BigInteger(collisions));\r
- \r
portStatsBuilder.setDurationSec(input.readUnsignedInt());\r
portStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
portStatsList.add(portStatsBuilder.build());\r
}\r
- builder.setPortStats(new ArrayList<>(portStatsList));\r
- portStatsList.clear();\r
+ builder.setPortStats(portStatsList);\r
return builder.build();\r
}\r
\r
private static MultipartReplyQueue setQueue(ByteBuf input) {\r
MultipartReplyQueueBuilder builder = new MultipartReplyQueueBuilder();\r
- QueueStatsBuilder queueStatsBuilder = new QueueStatsBuilder();\r
List<QueueStats> queueStatsList = new ArrayList<>();\r
- \r
while (input.readableBytes() > 0) {\r
+ QueueStatsBuilder queueStatsBuilder = new QueueStatsBuilder();\r
queueStatsBuilder.setPortNo(input.readUnsignedInt());\r
queueStatsBuilder.setQueueId(input.readUnsignedInt());\r
-\r
byte[] txBytes = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txBytes);\r
queueStatsBuilder.setTxBytes(new BigInteger(txBytes));\r
-\r
byte[] txPackets = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txPackets);\r
queueStatsBuilder.setTxPackets(new BigInteger(txPackets));\r
-\r
byte[] txErrors = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(txErrors);\r
queueStatsBuilder.setTxErrors(new BigInteger(txErrors));\r
-\r
queueStatsBuilder.setDurationSec(input.readUnsignedInt());\r
queueStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
queueStatsList.add(queueStatsBuilder.build());\r
}\r
- builder.setQueueStats(new ArrayList<>(queueStatsList));\r
- queueStatsList.clear();\r
+ builder.setQueueStats(queueStatsList);\r
return builder.build();\r
}\r
\r
final byte PADDING_IN_GROUP_HEADER_02 = 4;\r
final byte BUCKET_COUNTER_LENGTH = 16;\r
final byte GROUP_BODY_LENGTH = 40;\r
- int actualLength;\r
MultipartReplyGroupBuilder builder = new MultipartReplyGroupBuilder();\r
- GroupStatsBuilder groupStatsBuilder = new GroupStatsBuilder();\r
List<GroupStats> groupStatsList = new ArrayList<>();\r
- \r
- BucketStatsBuilder bucketStatsBuilder = new BucketStatsBuilder();\r
- List<BucketStats> bucketStatsList = new ArrayList<>();\r
- \r
while (input.readableBytes() > 0) {\r
+ GroupStatsBuilder groupStatsBuilder = new GroupStatsBuilder();\r
int bodyLength = input.readUnsignedShort();\r
- actualLength = 0;\r
- \r
input.skipBytes(PADDING_IN_GROUP_HEADER_01);\r
groupStatsBuilder.setGroupId(input.readUnsignedInt());\r
groupStatsBuilder.setRefCount(input.readUnsignedInt());\r
groupStatsBuilder.setByteCount(new BigInteger(byteCount));\r
groupStatsBuilder.setDurationSec(input.readUnsignedInt());\r
groupStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
- actualLength = GROUP_BODY_LENGTH;\r
- \r
+ int actualLength = GROUP_BODY_LENGTH;\r
+ List<BucketStats> bucketStatsList = new ArrayList<>();\r
while (actualLength < bodyLength) {\r
+ BucketStatsBuilder bucketStatsBuilder = new BucketStatsBuilder();\r
byte[] packetCountBucket = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(packetCountBucket);\r
bucketStatsBuilder.setPacketCount(new BigInteger(packetCountBucket));\r
input.readBytes(byteCountBucket);\r
bucketStatsBuilder.setByteCount(new BigInteger(byteCountBucket));\r
bucketStatsList.add(bucketStatsBuilder.build());\r
-\r
- actualLength = actualLength + BUCKET_COUNTER_LENGTH;\r
+ actualLength += BUCKET_COUNTER_LENGTH;\r
} \r
- groupStatsBuilder.setBucketStats(new ArrayList<>(bucketStatsList));\r
- bucketStatsList.clear();\r
+ groupStatsBuilder.setBucketStats(bucketStatsList);\r
groupStatsList.add(groupStatsBuilder.build());\r
}\r
- builder.setGroupStats(new ArrayList<>(groupStatsList));\r
- groupStatsList.clear();\r
+ builder.setGroupStats(groupStatsList);\r
return builder.build();\r
}\r
\r
MultipartReplyMeterFeaturesBuilder builder = new MultipartReplyMeterFeaturesBuilder();\r
builder.setMaxMeter(input.readUnsignedInt());\r
builder.setBandTypes(MeterBandType.forValue(input.readInt()));\r
- builder.setCapabilities(decodeMeterModFlags((int) input.readUnsignedInt()));\r
+ builder.setCapabilities(decodeMeterModFlags(input.readUnsignedInt()));\r
builder.setMaxBands(input.readUnsignedByte());\r
builder.setMaxColor(input.readUnsignedByte());\r
input.skipBytes(PADDING_IN_METER_FEATURES_HEADER);\r
return builder.build();\r
}\r
\r
- private static MeterFlags decodeMeterModFlags(int input){\r
+ private static MeterFlags decodeMeterModFlags(long input){\r
final Boolean _oFPMFKBPS = (input & (1 << 0)) != 0;\r
final Boolean _oFPMFPKTPS = (input & (1 << 1)) != 0;\r
final Boolean _oFPMFBURST = (input & (1 << 2)) != 0; \r
final byte PADDING_IN_METER_STATS_HEADER = 6;\r
final byte METER_BAND_STATS_LENGTH = 16;\r
final byte METER_BODY_LENGTH = 40;\r
- int actualLength;\r
MultipartReplyMeterBuilder builder = new MultipartReplyMeterBuilder();\r
List<MeterStats> meterStatsList = new ArrayList<>();\r
- MeterStatsBuilder meterStatsBuilder = new MeterStatsBuilder();\r
- List<MeterBandStats> meterBandStatsList = new ArrayList<>();\r
- MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder();\r
while (input.readableBytes() > 0) {\r
+ MeterStatsBuilder meterStatsBuilder = new MeterStatsBuilder();\r
meterStatsBuilder.setMeterId(input.readUnsignedInt());\r
- actualLength = 0;\r
int meterStatsBodyLength = input.readUnsignedShort();\r
input.skipBytes(PADDING_IN_METER_STATS_HEADER);\r
meterStatsBuilder.setFlowCount(input.readUnsignedInt());\r
meterStatsBuilder.setByteInCount(new BigInteger(byteInCount));\r
meterStatsBuilder.setDurationSec(input.readUnsignedInt());\r
meterStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
- actualLength = METER_BODY_LENGTH;\r
- \r
+ int actualLength = METER_BODY_LENGTH;\r
+ List<MeterBandStats> meterBandStatsList = new ArrayList<>();\r
while (actualLength < meterStatsBodyLength) {\r
+ MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder();\r
byte[] packetBandCount = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(packetBandCount);\r
meterBandStatsBuilder.setPacketBandCount(new BigInteger(packetBandCount));\r
byte[] byteBandCount = new byte[Long.SIZE/Byte.SIZE];\r
input.readBytes(byteBandCount);\r
meterBandStatsBuilder.setByteBandCount(new BigInteger(byteBandCount));\r
- \r
meterBandStatsList.add(meterBandStatsBuilder.build());\r
- actualLength = actualLength + METER_BAND_STATS_LENGTH;\r
+ actualLength += METER_BAND_STATS_LENGTH;\r
}\r
- \r
- meterStatsBuilder.setMeterBandStats(new ArrayList<>(meterBandStatsList));\r
- meterBandStatsList.clear();\r
+ meterStatsBuilder.setMeterBandStats(meterBandStatsList);\r
meterStatsList.add(meterStatsBuilder.build());\r
}\r
- builder.setMeterStats(new ArrayList<>(meterStatsList));\r
- meterStatsList.clear();\r
+ builder.setMeterStats(meterStatsList);\r
return builder.build();\r
}\r
\r
private static MultipartReplyMeterConfig setMeterConfig(ByteBuf input) {\r
- final byte METER_BAND_LENGTH = 16;\r
final byte METER_CONFIG_LENGTH = 8;\r
- final byte bandLength = 2;\r
- int actualLength;\r
+ final byte PADDING_IN_METER_BAND_DROP_HEADER = 4;\r
+ final byte PADDING_IN_METER_BAND_DSCP_HEADER = 3;\r
MultipartReplyMeterConfigBuilder builder = new MultipartReplyMeterConfigBuilder();\r
List<MeterConfig> meterConfigList = new ArrayList<>();\r
- MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();\r
- List<Bands> bandsList = new ArrayList<>();\r
- BandsBuilder bandsBuilder = new BandsBuilder();\r
- \r
while (input.readableBytes() > 0) {\r
+ MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();\r
int meterConfigBodyLength = input.readUnsignedShort();\r
- actualLength = 0;\r
meterConfigBuilder.setFlags(MeterModCommand.forValue(input.readUnsignedShort()));\r
meterConfigBuilder.setMeterId(input.readUnsignedInt());\r
- actualLength = METER_CONFIG_LENGTH;\r
- \r
+ int actualLength = METER_CONFIG_LENGTH;\r
+ List<Bands> bandsList = new ArrayList<>();\r
while (actualLength < meterConfigBodyLength) {\r
- MeterBandDropBuilder bandDropBuilder = new MeterBandDropBuilder();\r
- final byte PADDING_IN_METER_BAND_DROP_HEADER = 4;\r
- MeterBandDscpRemarkBuilder bandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();\r
- final byte PADDING_IN_METER_BAND_DSCP_HEADER = 3;\r
- MeterBandExperimenterBuilder bandExperimenterBuilder = new MeterBandExperimenterBuilder(); \r
+ BandsBuilder bandsBuilder = new BandsBuilder();\r
int bandType = input.readUnsignedShort();\r
switch (bandType) {\r
- case 1: bandDropBuilder.setType(MeterBandType.forValue(bandType));\r
- input.skipBytes(bandLength);\r
- bandDropBuilder.setRate(input.readUnsignedInt());\r
- bandDropBuilder.setBurstSize(input.readUnsignedInt());\r
- input.skipBytes(PADDING_IN_METER_BAND_DROP_HEADER);\r
- bandsBuilder.setMeterBand(bandDropBuilder.build());\r
- break;\r
- case 2: bandDscpRemarkBuilder.setType(MeterBandType.forValue(bandType));\r
- input.skipBytes(bandLength);\r
- bandDscpRemarkBuilder.setRate(input.readUnsignedInt());\r
- bandDscpRemarkBuilder.setBurstSize(input.readUnsignedInt());\r
- bandDscpRemarkBuilder.setPrecLevel(input.readUnsignedByte());\r
- input.skipBytes(PADDING_IN_METER_BAND_DSCP_HEADER);\r
- bandsBuilder.setMeterBand(bandDscpRemarkBuilder.build());\r
- break;\r
- case 0xFFFF: bandExperimenterBuilder.setType(MeterBandType.forValue(bandType));\r
- input.skipBytes(bandLength);\r
- bandExperimenterBuilder.setRate(input.readUnsignedInt());\r
- bandExperimenterBuilder.setBurstSize(input.readUnsignedInt());\r
- bandExperimenterBuilder.setExperimenter(input.readUnsignedInt());\r
- bandsBuilder.setMeterBand(bandExperimenterBuilder.build());\r
- break;\r
- default: break;\r
+ case 1:\r
+ MeterBandDropBuilder bandDropBuilder = new MeterBandDropBuilder();\r
+ bandDropBuilder.setType(MeterBandType.forValue(bandType));\r
+ actualLength += input.readUnsignedShort();\r
+ bandDropBuilder.setRate(input.readUnsignedInt());\r
+ bandDropBuilder.setBurstSize(input.readUnsignedInt());\r
+ input.skipBytes(PADDING_IN_METER_BAND_DROP_HEADER);\r
+ bandsBuilder.setMeterBand(bandDropBuilder.build());\r
+ break;\r
+ case 2:\r
+ MeterBandDscpRemarkBuilder bandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();\r
+ bandDscpRemarkBuilder.setType(MeterBandType.forValue(bandType));\r
+ actualLength += input.readUnsignedShort();\r
+ bandDscpRemarkBuilder.setRate(input.readUnsignedInt());\r
+ bandDscpRemarkBuilder.setBurstSize(input.readUnsignedInt());\r
+ bandDscpRemarkBuilder.setPrecLevel(input.readUnsignedByte());\r
+ input.skipBytes(PADDING_IN_METER_BAND_DSCP_HEADER);\r
+ bandsBuilder.setMeterBand(bandDscpRemarkBuilder.build());\r
+ break;\r
+ case 0xFFFF:\r
+ MeterBandExperimenterBuilder bandExperimenterBuilder = new MeterBandExperimenterBuilder();\r
+ bandExperimenterBuilder.setType(MeterBandType.forValue(bandType));\r
+ actualLength += input.readUnsignedShort();\r
+ bandExperimenterBuilder.setRate(input.readUnsignedInt());\r
+ bandExperimenterBuilder.setBurstSize(input.readUnsignedInt());\r
+ bandExperimenterBuilder.setExperimenter(input.readUnsignedInt());\r
+ bandsBuilder.setMeterBand(bandExperimenterBuilder.build());\r
+ break;\r
+ default:\r
+ break;\r
}\r
bandsList.add(bandsBuilder.build());\r
- actualLength = actualLength + METER_BAND_LENGTH;\r
}\r
- meterConfigBuilder.setBands(new ArrayList<>(bandsList));\r
- bandsList.clear();\r
+ meterConfigBuilder.setBands(bandsList);\r
meterConfigList.add(meterConfigBuilder.build());\r
}\r
- builder.setMeterConfig(new ArrayList<>(meterConfigList));\r
- meterConfigList.clear();\r
+ builder.setMeterConfig(meterConfigList);\r
return builder.build();\r
}\r
\r
MultipartReplyExperimenterBuilder builder = new MultipartReplyExperimenterBuilder();\r
builder.setExperimenter(input.readUnsignedInt());\r
builder.setExpType(input.readUnsignedInt());\r
- byte[] data = new byte[Long.SIZE/Byte.SIZE];\r
+ byte[] data = new byte[input.readableBytes()];\r
input.readBytes(data);\r
builder.setData(data);\r
return builder.build();\r
final byte MAX_PORT_NAME_LEN = 16;\r
MultipartReplyPortDescBuilder builder = new MultipartReplyPortDescBuilder();\r
List<Ports> portsList = new ArrayList<>();\r
- PortsBuilder portsBuilder = new PortsBuilder();\r
- \r
while (input.readableBytes() > 0) {\r
+ PortsBuilder portsBuilder = new PortsBuilder();\r
portsBuilder.setPortNo(input.readUnsignedInt());\r
input.skipBytes(PADDING_IN_PORT_DESC_HEADER_01);\r
StringBuffer macToString = new StringBuffer();\r
}\r
portsBuilder.setHwAddr(new MacAddress(macToString.toString()));\r
input.skipBytes(PADDING_IN_PORT_DESC_HEADER_02);\r
- \r
byte[] portNameBytes = new byte[MAX_PORT_NAME_LEN];\r
input.readBytes(portNameBytes);\r
String portName = new String(portNameBytes);\r
portsBuilder.setName(portName.trim());\r
- \r
portsBuilder.setConfig(createPortConfig(input.readUnsignedInt()));\r
portsBuilder.setState(createPortState(input.readUnsignedInt()));\r
portsBuilder.setCurrentFeatures(createPortFeatures(input.readUnsignedInt()));\r
portsBuilder.setMaxSpeed(input.readUnsignedInt());\r
portsList.add(portsBuilder.build());\r
}\r
- \r
- builder.setPorts(new ArrayList<>(portsList));\r
- portsList.clear();\r
+ builder.setPorts(portsList);\r
return builder.build();\r
}\r
\r
final Boolean _linkDown = ((input) & (1<<0)) != 0;\r
final Boolean _blocked = ((input) & (1<<1)) != 0;\r
final Boolean _live = ((input) & (1<<2)) != 0;\r
- return new PortState(_linkDown, _blocked,_live);\r
+ return new PortState(_blocked, _linkDown, _live);\r
}\r
\r
private static PortFeatures createPortFeatures(long input){\r
}\r
\r
private static MultipartReplyBody setGroupFeatures(ByteBuf rawMessage) {\r
- final int SIZE_OF_MAX_GROUPS = 4;\r
+ final int GROUP_TYPES = 4;\r
MultipartReplyGroupFeaturesBuilder featuresBuilder = new MultipartReplyGroupFeaturesBuilder();\r
featuresBuilder.setTypes(createGroupType(rawMessage.readUnsignedInt()));\r
featuresBuilder.setCapabilities(createCapabilities(rawMessage.readUnsignedInt()));\r
List<Long> maxGroupsList = new ArrayList<>();\r
- for (int i = 0; i < SIZE_OF_MAX_GROUPS ; i++) {\r
+ for (int i = 0; i < GROUP_TYPES ; i++) {\r
maxGroupsList.add(rawMessage.readUnsignedInt());\r
}\r
featuresBuilder.setMaxGroups(maxGroupsList);\r
- // TODO - groupfeatures - actions bitmap\r
- rawMessage.skipBytes(4);\r
+ List<ActionType> actionBitmaps = new ArrayList<>();\r
+ for (int i = 0; i < GROUP_TYPES ; i++) {\r
+ actionBitmaps.add(createActionBitmap(rawMessage.readUnsignedInt()));\r
+ }\r
+ featuresBuilder.setActionsBitmap(actionBitmaps);\r
return featuresBuilder.build();\r
}\r
+ \r
+ private static ActionType createActionBitmap(long input) {\r
+ final Boolean OFPAT_OUTPUT = ((input) & (1<<0)) != 0;\r
+ final Boolean OFPAT_COPY_TTL_OUT = ((input) & (1<<1)) != 0;\r
+ final Boolean OFPAT_COPY_TTL_IN = ((input) & (1<<2)) != 0;\r
+ final Boolean OFPAT_SET_MPLS_TTL = ((input) & (1<<3)) != 0;\r
+ final Boolean OFPAT_DEC_MPLS_TTL = ((input) & (1<<4)) != 0;\r
+ final Boolean OFPAT_PUSH_VLAN = ((input) & (1<<5)) != 0;\r
+ final Boolean OFPAT_POP_VLAN = ((input) & (1<<6)) != 0;\r
+ final Boolean OFPAT_PUSH_MPLS = ((input) & (1<<7)) != 0;\r
+ final Boolean OFPAT_POP_MPLS = ((input) & (1<<8)) != 0;\r
+ final Boolean OFPAT_SET_QUEUE = ((input) & (1<<9)) != 0;\r
+ final Boolean OFPAT_GROUP = ((input) & (1<<10)) != 0;\r
+ final Boolean OFPAT_SET_NW_TTL = ((input) & (1<<11)) != 0;\r
+ final Boolean OFPAT_DEC_NW_TTL = ((input) & (1<<12)) != 0;\r
+ final Boolean OFPAT_SET_FIELD = ((input) & (1<<13)) != 0;\r
+ final Boolean OFPAT_PUSH_PBB = ((input) & (1<<14)) != 0;\r
+ final Boolean OFPAT_POP_PBB = ((input) & (1<<15)) != 0;\r
+ final Boolean OFPAT_EXPERIMENTER = ((input) & (1<<16)) != 0;\r
+ return new ActionType(OFPAT_COPY_TTL_IN, OFPAT_COPY_TTL_OUT, OFPAT_DEC_MPLS_TTL,\r
+ OFPAT_DEC_NW_TTL, OFPAT_EXPERIMENTER, OFPAT_GROUP, OFPAT_OUTPUT, OFPAT_POP_MPLS,\r
+ OFPAT_POP_PBB, OFPAT_POP_VLAN, OFPAT_PUSH_MPLS, OFPAT_PUSH_PBB, OFPAT_PUSH_VLAN,\r
+ OFPAT_SET_FIELD, OFPAT_SET_MPLS_TTL, OFPAT_SET_NW_TTL, OFPAT_SET_QUEUE);\r
+ }\r
\r
private static GroupCapabilities createCapabilities(long input) {\r
final Boolean OFOFPGFC_SELECT_WEIGHT = ((input) & (1<<0)) != 0;\r
final byte PADDING_IN_GROUP_DESC_HEADER = 1;\r
final byte PADDING_IN_BUCKETS_HEADER = 4;\r
final byte GROUP_DESC_HEADER_LENGTH = 8;\r
- int actualLength;\r
- int bucketsLength = 0;\r
- int bucketsCurrentLength = 0;\r
- int bodyLength = 0;\r
+ final byte BUCKETS_HEADER_LENGTH = 16;\r
MultipartReplyGroupDescBuilder builder = new MultipartReplyGroupDescBuilder();\r
- GroupDescBuilder groupDescBuilder = new GroupDescBuilder();\r
List<GroupDesc> groupDescsList = new ArrayList<>();\r
- BucketsListBuilder bucketsBuilder = new BucketsListBuilder();\r
- List<BucketsList> bucketsList = new ArrayList<>();\r
- List<ActionsList> actionsList = new ArrayList<>();\r
- \r
+ LOGGER.info("readablebytes pred: " + input.readableBytes());\r
while (input.readableBytes() > 0) {\r
- bodyLength = input.readUnsignedShort();\r
- actualLength = 0;\r
- \r
- groupDescBuilder.setType(GroupType.forValue(input.readUnsignedByte())); // TODO enum or class?\r
+ LOGGER.info("readablebytes po: " + input.readableBytes());\r
+ GroupDescBuilder groupDescBuilder = new GroupDescBuilder();\r
+ int bodyLength = input.readUnsignedShort();\r
+ LOGGER.info("bodylength: " + bodyLength);\r
+ groupDescBuilder.setType(GroupType.forValue(input.readUnsignedByte()));\r
input.skipBytes(PADDING_IN_GROUP_DESC_HEADER);\r
groupDescBuilder.setGroupId(input.readUnsignedInt());\r
- actualLength = GROUP_DESC_HEADER_LENGTH;\r
- \r
+ int actualLength = GROUP_DESC_HEADER_LENGTH;\r
+ List<BucketsList> bucketsList = new ArrayList<>();\r
while (actualLength < bodyLength) {\r
- \r
- bucketsLength = input.readUnsignedShort();\r
+ System.out.println("cyklim v buckets");\r
+ BucketsListBuilder bucketsBuilder = new BucketsListBuilder();\r
+ int bucketsLength = input.readUnsignedShort();\r
bucketsBuilder.setWeight(input.readUnsignedShort());\r
bucketsBuilder.setWatchPort(new PortNumber(input.readUnsignedInt()));\r
bucketsBuilder.setWatchGroup(input.readUnsignedInt());\r
input.skipBytes(PADDING_IN_BUCKETS_HEADER);\r
- bucketsCurrentLength = bucketsLength;\r
- actionsList = ActionsDeserializer.createActionsList(input, bucketsLength);\r
- bucketsBuilder.setActionsList(new ArrayList<>(actionsList));\r
- actionsList.clear();\r
+ System.out.println("bucketslength: " + bucketsLength);\r
+ System.out.println("actuallength: " + actualLength);\r
+ System.out.println("bodylength: " + bodyLength);\r
+ LOGGER.info("length - length: " + (bucketsLength - BUCKETS_HEADER_LENGTH));\r
+ List<ActionsList> actionsList = ActionsDeserializer\r
+ .createActionsList(input, bucketsLength - BUCKETS_HEADER_LENGTH);\r
+ LOGGER.info("actions size: " + actionsList.size());\r
+ bucketsBuilder.setActionsList(actionsList);\r
bucketsList.add(bucketsBuilder.build());\r
- actualLength = actualLength + bucketsCurrentLength;\r
+ actualLength += bucketsLength;\r
}\r
- groupDescBuilder.setBucketsList(new ArrayList<>(bucketsList));\r
- bucketsList.clear();\r
+ groupDescBuilder.setBucketsList(bucketsList);\r
groupDescsList.add(groupDescBuilder.build());\r
}\r
- builder.setGroupDesc(new ArrayList<>(groupDescsList));\r
- groupDescsList.clear();\r
+ builder.setGroupDesc(groupDescsList);\r
return builder.build();\r
}\r
\r
Code Review / openflowjava.git / blobdiff