X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsUpdateCommiter.java;h=f3188e1d0e83dbfd7870fd20b4e67d77d01b2219;hb=22074884bbdd216b17f47a0e5c6af871bd616abd;hp=7169b39b77a77f5c11abb3553b621a9f3c9d6a0f;hpb=576aa6018e48dfca8f223b7ac929139a32135201;p=controller.git diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java index 7169b39b77..f3188e1d0e 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java @@ -15,6 +15,9 @@ import org.opendaylight.controller.sal.binding.api.data.DataModificationTransact import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; @@ -26,10 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.A import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.AggregateFlowStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsDataBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowStatisticsUpdated; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowTableStatisticsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.FlowsStatisticsUpdate; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.NodeConnectorStatisticsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.OpendaylightFlowStatisticsListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.aggregate.flow.statistics.AggregateFlowStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list.FlowAndStatisticsMapList; @@ -45,6 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.q import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.QueueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.QueueKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.queue.rev130925.QueueId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupDescStatsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupFeaturesUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupStatisticsUpdated; @@ -58,6 +59,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.desc.GroupDescBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.features.GroupFeaturesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.statistics.GroupStatisticsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStats; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStats; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; @@ -77,15 +83,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsListener; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterConfigStatsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterFeaturesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterStatisticsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterConfigStatsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericQueueStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.NodeConnectorStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsListener; -import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.PortStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.flow.capable.node.connector.statistics.FlowCapableNodeConnectorStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.node.connector.statistics.and.port.number.map.NodeConnectorStatisticsAndPortNumberMap; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsData; @@ -99,6 +107,14 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdenti import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Class implement statistics manager related listener interface and augment all the + * received statistics data to data stores. + * TODO: Need to add error message listener and clean-up the associated tx id + * if it exists in the tx-id cache. + * @author vishnoianil + * + */ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsListener, OpendaylightMeterStatisticsListener, OpendaylightFlowStatisticsListener, @@ -123,7 +139,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onMeterConfigStatsUpdated(MeterConfigStatsUpdated notification) { - + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -132,29 +151,40 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.get(notification.getId()).setMeterConfigStats(notification.getMeterConfigStats()); //Publish data to configuration data store - DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); - NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); - nodeData.setKey(key); - - NodeMeterConfigStatsBuilder meterConfig= new NodeMeterConfigStatsBuilder(); - MeterConfigStatsBuilder stats = new MeterConfigStatsBuilder(); - stats.setMeterConfigStats(notification.getMeterConfigStats()); - meterConfig.setMeterConfigStats(stats.build()); - //Update augmented data - nodeData.addAugmentation(NodeMeterConfigStats.class, meterConfig.build()); + List eterConfigStatsList = notification.getMeterConfigStats(); - InstanceIdentifier refValue = ref.getValue(); - it.putOperationalData(refValue, nodeData.build()); - it.commit(); + for(MeterConfigStats meterConfigStats : eterConfigStatsList){ + DataModificationTransaction it = this.statisticsManager.startChange(); + MeterBuilder meterBuilder = new MeterBuilder(); + MeterKey meterKey = new MeterKey(meterConfigStats.getMeterId()); + meterBuilder.setKey(meterKey); + + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) + .augmentation(FlowCapableNode.class) + .child(Meter.class,meterKey).toInstance(); + + NodeMeterConfigStatsBuilder meterConfig= new NodeMeterConfigStatsBuilder(); + MeterConfigStatsBuilder stats = new MeterConfigStatsBuilder(); + stats.fieldsFrom(meterConfigStats); + meterConfig.setMeterConfigStats(stats.build()); + + //Update augmented data + meterBuilder.addAugmentation(NodeMeterConfigStats.class, meterConfig.build()); + it.putOperationalData(meterRef, meterBuilder.build()); + it.commit(); + } } @Override public void onMeterStatisticsUpdated(MeterStatisticsUpdated notification) { + + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -162,30 +192,41 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } cache.get(notification.getId()).setMeterStatistics(notification.getMeterStats()); - //Publish data to configuration data store - DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); - NodeRef ref = getNodeRef(key); - final NodeBuilder nodeData = new NodeBuilder(); - nodeData.setKey(key); - - NodeMeterStatisticsBuilder meterStats= new NodeMeterStatisticsBuilder(); - MeterStatisticsBuilder stats = new MeterStatisticsBuilder(); - stats.setMeterStats(notification.getMeterStats()); - meterStats.setMeterStatistics(stats.build()); - - //Update augmented data - nodeData.addAugmentation(NodeMeterStatistics.class, meterStats.build()); + List meterStatsList = notification.getMeterStats(); - InstanceIdentifier refValue = ref.getValue(); - it.putOperationalData(refValue, nodeData.build()); - it.commit(); + for(MeterStats meterStats : meterStatsList){ + //Publish data to configuration data store + DataModificationTransaction it = this.statisticsManager.startChange(); + MeterBuilder meterBuilder = new MeterBuilder(); + MeterKey meterKey = new MeterKey(meterStats.getMeterId()); + meterBuilder.setKey(meterKey); + + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) + .augmentation(FlowCapableNode.class) + .child(Meter.class,meterKey).toInstance(); + + NodeMeterStatisticsBuilder meterStatsBuilder= new NodeMeterStatisticsBuilder(); + MeterStatisticsBuilder stats = new MeterStatisticsBuilder(); + stats.fieldsFrom(meterStats); + meterStatsBuilder.setMeterStatistics(stats.build()); + + //Update augmented data + meterBuilder.addAugmentation(NodeMeterStatistics.class, meterStatsBuilder.build()); + it.putOperationalData(meterRef, meterBuilder.build()); + it.commit(); + } } @Override public void onGroupDescStatsUpdated(GroupDescStatsUpdated notification) { + + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -194,30 +235,40 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.get(notification.getId()).setGroupDescStats(notification.getGroupDescStats()); //Publish data to configuration data store - DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); - NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); - nodeData.setKey(key); - - NodeGroupDescStatsBuilder groupDesc= new NodeGroupDescStatsBuilder(); - GroupDescBuilder stats = new GroupDescBuilder(); - stats.setGroupDescStats(notification.getGroupDescStats()); - groupDesc.setGroupDesc(stats.build()); - - //Update augmented data - nodeData.addAugmentation(NodeGroupDescStats.class, groupDesc.build()); + List groupDescStatsList = notification.getGroupDescStats(); - InstanceIdentifier refValue = ref.getValue(); - it.putOperationalData(refValue, nodeData.build()); - it.commit(); + for(GroupDescStats groupDescStats : groupDescStatsList){ + DataModificationTransaction it = this.statisticsManager.startChange(); + + GroupBuilder groupBuilder = new GroupBuilder(); + GroupKey groupKey = new GroupKey(groupDescStats.getGroupId()); + groupBuilder.setKey(groupKey); + + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) + .augmentation(FlowCapableNode.class) + .child(Group.class,groupKey).toInstance(); + + NodeGroupDescStatsBuilder groupDesc= new NodeGroupDescStatsBuilder(); + GroupDescBuilder stats = new GroupDescBuilder(); + stats.fieldsFrom(groupDescStats); + groupDesc.setGroupDesc(stats.build()); + + //Update augmented data + groupBuilder.addAugmentation(NodeGroupDescStats.class, groupDesc.build()); + it.putOperationalData(groupRef, groupBuilder.build()); + it.commit(); + } } @Override public void onGroupStatisticsUpdated(GroupStatisticsUpdated notification) { + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ @@ -226,33 +277,30 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList cache.get(notification.getId()).setGroupStatistics(notification.getGroupStats()); //Publish data to configuration data store - - DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); - NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); - nodeData.setKey(key); - - NodeGroupStatisticsBuilder groupStats = new NodeGroupStatisticsBuilder(); - GroupStatisticsBuilder stats = new GroupStatisticsBuilder(); - stats.setGroupStats(notification.getGroupStats()); - groupStats.setGroupStatistics(stats.build()); - - //Update augmented data - nodeData.addAugmentation(NodeGroupStatistics.class, groupStats.build()); + List groupStatsList = notification.getGroupStats(); - InstanceIdentifier refValue = ref.getValue(); - it.putOperationalData(refValue, nodeData.build()); - it.commit(); - -// for (GroupStats groupstat : notification.getGroupStats()) { -// -// GroupStatsKey groupKey = groupstat.getKey(); -// InstanceIdentifier id = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).augmentation(NodeGroupStatistics.class).child(GroupStatistics.class).child(GroupStats.class,groupKey).toInstance(); -// it.putOperationalData(id, groupstat); -// it.commit(); -// } + for(GroupStats groupStats : groupStatsList){ + DataModificationTransaction it = this.statisticsManager.startChange(); + + GroupBuilder groupBuilder = new GroupBuilder(); + GroupKey groupKey = new GroupKey(groupStats.getGroupId()); + groupBuilder.setKey(groupKey); + + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) + .augmentation(FlowCapableNode.class) + .child(Group.class,groupKey).toInstance(); + + NodeGroupStatisticsBuilder groupStatisticsBuilder= new NodeGroupStatisticsBuilder(); + GroupStatisticsBuilder stats = new GroupStatisticsBuilder(); + stats.fieldsFrom(groupStats); + groupStatisticsBuilder.setGroupStatistics(stats.build()); + + //Update augmented data + groupBuilder.addAugmentation(NodeGroupStatistics.class, groupStatisticsBuilder.build()); + it.putOperationalData(groupRef, groupBuilder.build()); + it.commit(); + } } @Override @@ -328,8 +376,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) { + + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + NodeKey key = new NodeKey(notification.getId()); - sucLogger.info("Received flow stats update : {}",notification.toString()); + sucLogger.debug("Received flow stats update : {}",notification.toString()); for(FlowAndStatisticsMapList map: notification.getFlowAndStatisticsMapList()){ short tableId = map.getTableId(); @@ -430,7 +483,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,existingFlow.getKey()).toInstance(); flowBuilder.setKey(existingFlow.getKey()); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.debug("Found matching flow in the datastore, augmenting statistics"); + sucLogger.info("Found matching flow in the datastore, augmenting statistics"); foundOriginalFlow = true; it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); @@ -440,17 +493,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if(!foundOriginalFlow){ - sucLogger.info("Associated original flow is not found in data store. Augmenting flow in operational data st"); - //TODO: Temporary fix: format [ 0+tableid+0+unaccounted flow counter] - long flowKey = Long.getLong(new String("0"+Short.toString(tableId)+"0"+Integer.toString(this.unaccountedFlowsCounter))); - FlowKey newFlowKey = new FlowKey(new FlowId(flowKey)); + sucLogger.debug("Associated original flow is not found in data store. Augmenting flow in operational data store"); + //TODO: Temporary fix: format [ 1+tableid+1+unaccounted flow counter] + long flowKey = Long.parseLong(new String("1"+Short.toString(tableId)+"1"+Integer.toString(this.unaccountedFlowsCounter))); + FlowKey newFlowKey = new FlowKey(new FlowId(Long.toString(flowKey))); InstanceIdentifier flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(tableId)) .child(Flow.class,newFlowKey).toInstance(); flowBuilder.setKey(newFlowKey); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.debug("Flow was no present in data store, augmenting statistics as an unaccounted flow"); + sucLogger.info("Flow was no present in data store, augmenting statistics as an unaccounted flow"); it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); } @@ -459,6 +512,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onAggregateFlowStatisticsUpdate(AggregateFlowStatisticsUpdate notification) { + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received aggregate flow statistics update : {}",notification.toString()); @@ -495,9 +552,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } @Override - public void onPortStatisticsUpdate(PortStatisticsUpdate notification) { + public void onNodeConnectorStatisticsUpdate(NodeConnectorStatisticsUpdate notification) { + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + NodeKey key = new NodeKey(notification.getId()); - sucLogger.info("Received port stats update : {}",notification.toString()); + sucLogger.debug("Received port stats update : {}",notification.toString()); //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); @@ -550,6 +611,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onFlowTableStatisticsUpdate(FlowTableStatisticsUpdate notification) { + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow table statistics update : {}",notification.toString()); @@ -588,8 +653,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onQueueStatisticsUpdate(QueueStatisticsUpdate notification) { + + //Check if response is for the request statistics-manager sent. + if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + return; + NodeKey key = new NodeKey(notification.getId()); - sucLogger.info("Received queue stats update : {}",notification.toString()); + sucLogger.debug("Received queue stats update : {}",notification.toString()); //Add statistics to local cache ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); @@ -642,28 +712,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } - @Override - public void onFlowStatisticsUpdated(FlowStatisticsUpdated notification) { - // TODO Auto-generated method stub - //TODO: Depricated, will clean it up once sal-compatibility is fixed. - //Sal-Compatibility code usage this notification event. - - } - - @Override - public void onFlowTableStatisticsUpdated(FlowTableStatisticsUpdated notification) { - // TODO Auto-generated method stub - //TODO: Need to implement it yet - - } - - @Override - public void onNodeConnectorStatisticsUpdated(NodeConnectorStatisticsUpdated notification) { - // TODO Auto-generated method stub - //TODO: Need to implement it yet - - } - private NodeRef getNodeRef(NodeKey nodeKey){ InstanceIdentifierBuilder builder = InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey); return new NodeRef(builder.toInstance()); @@ -698,14 +746,8 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if (storedFlow.getMatch() != null) { return false; } - } else if(!statsFlow.getMatch().equals(storedFlow.getMatch())) { - return false; - } - if (statsFlow.getCookie()== null) { - if (storedFlow.getCookie()!= null) { - return false; - } - } else if(!statsFlow.getCookie().equals(storedFlow.getCookie())) { + } //else if(!statsFlow.getMatch().equals(storedFlow.getMatch())) { + else if(!matchEquals(statsFlow.getMatch(), storedFlow.getMatch())) { return false; } if (statsFlow.getHardTimeout() == null) { @@ -738,5 +780,124 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } return true; } - + + /** + * Explicit equals method to compare the 'match' for flows stored in the data-stores and flow fetched from the switch. + * Usecase: e.g If user don't set any ethernet source and destination address for match,data store will store null for + * these address. + * e.g [_ethernetMatch=EthernetMatch [_ethernetDestination=null, _ethernetSource=null, _ethernetType= + * EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] + * + * But when you fetch the flows from switch, openflow driver library converts all zero bytes of mac address in the + * message stream to 00:00:00:00:00:00. Following string shows how library interpret the zero mac address bytes and + * eventually when translator convert it to MD-SAL match, this is how it looks + * [_ethernetDestination=EthernetDestination [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * _ethernetType=EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] + * + * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store. + * When we fetch the same flow (with its statistics) from switch, plugin converts its value to openflow:X:0. + * e.g _inPort=Uri [_value=openflow:1:0] + * + * So this custom equals method add additional check to take care of these scenario, in case any match element is null in data-store-flow, but not + * in the flow fetched from switch. + * + * @param statsFlow + * @param storedFlow + * @return + */ + + public boolean matchEquals(Match statsFlow, Match storedFlow) { + if (statsFlow == storedFlow) { + return true; + } + if (storedFlow.getClass() != statsFlow.getClass()) { + return false; + } + if (storedFlow.getEthernetMatch() == null) { + if (statsFlow.getEthernetMatch() != null) { + return false; + } + } else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) { + return false; + } + if (storedFlow.getIcmpv4Match()== null) { + if (statsFlow.getIcmpv4Match() != null) { + return false; + } + } else if(!storedFlow.getIcmpv4Match().equals(statsFlow.getIcmpv4Match())) { + return false; + } + if (storedFlow.getIcmpv6Match() == null) { + if (statsFlow.getIcmpv6Match() != null) { + return false; + } + } else if(!storedFlow.getIcmpv6Match().equals(statsFlow.getIcmpv6Match())) { + return false; + } + if (storedFlow.getInPhyPort() == null) { + if (statsFlow.getInPhyPort() != null) { + return false; + } + } else if(!storedFlow.getInPhyPort().equals(statsFlow.getInPhyPort())) { + return false; + } + if (storedFlow.getInPort()== null) { + if (statsFlow.getInPort() != null) { + return false; + } + } else if(!storedFlow.getInPort().equals(statsFlow.getInPort())) { + return false; + } + if (storedFlow.getIpMatch()== null) { + if (statsFlow.getIpMatch() != null) { + return false; + } + } else if(!storedFlow.getIpMatch().equals(statsFlow.getIpMatch())) { + return false; + } + if (storedFlow.getLayer3Match()== null) { + if (statsFlow.getLayer3Match() != null) { + return false; + } + } else if(!storedFlow.getLayer3Match().equals(statsFlow.getLayer3Match())) { + return false; + } + if (storedFlow.getLayer4Match()== null) { + if (statsFlow.getLayer4Match() != null) { + return false; + } + } else if(!storedFlow.getLayer4Match().equals(statsFlow.getLayer4Match())) { + return false; + } + if (storedFlow.getMetadata() == null) { + if (statsFlow.getMetadata() != null) { + return false; + } + } else if(!storedFlow.getMetadata().equals(statsFlow.getMetadata())) { + return false; + } + if (storedFlow.getProtocolMatchFields() == null) { + if (statsFlow.getProtocolMatchFields() != null) { + return false; + } + } else if(!storedFlow.getProtocolMatchFields().equals(statsFlow.getProtocolMatchFields())) { + return false; + } + if (storedFlow.getTunnel()== null) { + if (statsFlow.getTunnel() != null) { + return false; + } + } else if(!storedFlow.getTunnel().equals(statsFlow.getTunnel())) { + return false; + } + if (storedFlow.getVlanMatch()== null) { + if (statsFlow.getVlanMatch() != null) { + return false; + } + } else if(!storedFlow.getVlanMatch().equals(statsFlow.getVlanMatch())) { + return false; + } + return true; + } }