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=ace547a03c9f5d17d28764b0ffe9a53a227e1612;hb=cf870b9474f14659a68d3fba504962ba859a94fa;hp=edffb976c6f87148badc8aa3c48b7db3595e67a1;hpb=455f312f6921b39b99387ca18634b9444a336d28;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 edffb976c6..ace547a03c 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 @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.HashMap; import java.util.List; import java.util.concurrent.ConcurrentMap; +import org.opendaylight.controller.md.statistics.manager.NodeStatisticsAger.FlowEntry; +import org.opendaylight.controller.md.statistics.manager.NodeStatisticsAger.QueueEntry; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; @@ -29,10 +30,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; @@ -47,7 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue; 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; @@ -90,12 +88,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. 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; @@ -128,7 +125,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList private final StatisticsProvider statisticsManager; - private final int unaccountedFlowsCounter = 1; + private int unaccountedFlowsCounter = 1; public StatisticsUpdateCommiter(final StatisticsProvider manager){ @@ -145,19 +142,19 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; + NodeKey key = new NodeKey(notification.getId()); + //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - cache.get(notification.getId()).setMeterConfigStats(notification.getMeterConfigStats()); + cache.get(notification.getId()).updateMeterConfigStats(notification.getMeterConfigStats()); //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); - - List eterConfigStatsList = notification.getMeterConfigStats(); + List meterConfigStatsList = notification.getMeterConfigStats(); - for(MeterConfigStats meterConfigStats : eterConfigStatsList){ + for(MeterConfigStats meterConfigStats : meterConfigStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterConfigStats.getMeterId()); @@ -187,13 +184,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).setMeterStatistics(notification.getMeterStats()); - NodeKey key = new NodeKey(notification.getId()); List meterStatsList = notification.getMeterStats(); @@ -229,15 +219,16 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; + NodeKey key = new NodeKey(notification.getId()); + //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - cache.get(notification.getId()).setGroupDescStats(notification.getGroupDescStats()); + cache.get(notification.getId()).updateGroupDescStats(notification.getGroupDescStats()); //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); List groupDescStatsList = notification.getGroupDescStats(); for(GroupDescStats groupDescStats : groupDescStatsList){ @@ -271,13 +262,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).setGroupStatistics(notification.getGroupStats()); - //Publish data to configuration data store NodeKey key = new NodeKey(notification.getId()); List groupStatsList = notification.getGroupStats(); @@ -308,11 +292,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onMeterFeaturesUpdated(MeterFeaturesUpdated notification) { - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } MeterFeaturesBuilder meterFeature = new MeterFeaturesBuilder(); meterFeature.setMeterBandSupported(notification.getMeterBandSupported()); meterFeature.setMeterCapabilitiesSupported(notification.getMeterCapabilitiesSupported()); @@ -320,8 +299,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList meterFeature.setMaxColor(notification.getMaxColor()); meterFeature.setMaxMeter(notification.getMaxMeter()); - cache.get(notification.getId()).setMeterFeatures(meterFeature.build()); - //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); @@ -344,18 +321,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onGroupFeaturesUpdated(GroupFeaturesUpdated notification) { - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - GroupFeaturesBuilder groupFeatures = new GroupFeaturesBuilder(); groupFeatures.setActions(notification.getActions()); groupFeatures.setGroupCapabilitiesSupported(notification.getGroupCapabilitiesSupported()); groupFeatures.setGroupTypesSupported(notification.getGroupTypesSupported()); groupFeatures.setMaxGroups(notification.getMaxGroups()); - cache.get(notification.getId()).setGroupFeatures(groupFeatures.build()); //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); @@ -429,14 +399,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList GenericStatistics flowStats = stats.build(); //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - if(!cache.get(notification.getId()).getFlowAndStatsMap().containsKey(tableId)){ - cache.get(notification.getId()).getFlowAndStatsMap().put(tableId, new HashMap()); - } - cache.get(notification.getId()).getFlowAndStatsMap().get(tableId).put(flowRule,flowStats); + NodeStatisticsAger nsa = cache.get(notification.getId()); + FlowEntry flowStatsEntry = nsa.new FlowEntry(tableId,flowRule); + cache.get(notification.getId()).updateFlowStats(flowStatsEntry); //Augment the data to the flow node @@ -485,7 +454,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(); @@ -494,11 +463,36 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } } + table= (Table)it.readOperationalData(tableRef); + if(!foundOriginalFlow && table != null){ + + for(Flow existingFlow : table.getFlow()){ + FlowStatisticsData augmentedflowStatisticsData = existingFlow.getAugmentation(FlowStatisticsData.class); + if(augmentedflowStatisticsData != null){ + FlowBuilder existingOperationalFlow = new FlowBuilder(); + existingOperationalFlow.fieldsFrom(augmentedflowStatisticsData.getFlowStatistics()); + sucLogger.debug("Existing unaccounted flow in operational data store : {}",existingFlow.toString()); + if(flowEquals(flowRule,existingOperationalFlow.build())){ + InstanceIdentifier flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) + .augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(tableId)) + .child(Flow.class,existingFlow.getKey()).toInstance(); + flowBuilder.setKey(existingFlow.getKey()); + flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); + sucLogger.debug("Found matching flow in the operational datastore, augmenting statistics"); + foundOriginalFlow = true; + it.putOperationalData(flowRef, flowBuilder.build()); + it.commit(); + break; + } + } + } + } 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"); + long flowKey = Long.parseLong(new String("1"+Short.toString(tableId)+"0"+Integer.toString(this.unaccountedFlowsCounter))); + 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)) @@ -536,12 +530,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList aggregateFlowStatisticsBuilder.setPacketCount(notification.getPacketCount()); aggregateFlowStatisticsDataBuilder.setAggregateFlowStatistics(aggregateFlowStatisticsBuilder.build()); - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).getTableAndAggregateFlowStatsMap().put(tableId,aggregateFlowStatisticsBuilder.build()); - sucLogger.debug("Augment aggregate statistics: {} for table {} on Node {}",aggregateFlowStatisticsBuilder.build().toString(),tableId,key); TableBuilder tableBuilder = new TableBuilder(); @@ -554,7 +542,7 @@ 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; @@ -562,13 +550,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received port stats update : {}",notification.toString()); - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - - List portsStats = notification.getNodeConnectorStatisticsAndPortNumberMap(); for(NodeConnectorStatisticsAndPortNumberMap portStats : portsStats){ @@ -588,9 +569,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList statisticsBuilder.setTransmitDrops(portStats.getTransmitDrops()); statisticsBuilder.setTransmitErrors(portStats.getTransmitErrors()); - //Update data in the cache - cache.get(notification.getId()).getNodeConnectorStats().put(portStats.getNodeConnectorId(), statisticsBuilder.build()); - //Augment data to the node-connector FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = new FlowCapableNodeConnectorStatisticsDataBuilder(); @@ -637,12 +615,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList statisticsDataBuilder.setFlowTableStatistics(statisticsBuilder.build()); - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).getFlowTableAndStatisticsMap().put(ftStats.getTableId().getValue(),statisticsBuilder.build()); - sucLogger.debug("Augment flow table statistics: {} for table {} on Node {}",statisticsBuilder.build().toString(),ftStats.getTableId(),key); TableBuilder tableBuilder = new TableBuilder(); @@ -664,17 +636,18 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList sucLogger.debug("Received queue stats update : {}",notification.toString()); //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } + NodeStatisticsAger nsa = cache.get(notification.getId()); + List queuesStats = notification.getQueueIdAndStatisticsMap(); for(QueueIdAndStatisticsMap swQueueStats : queuesStats){ - if(!cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().containsKey(swQueueStats.getNodeConnectorId())){ - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().put(swQueueStats.getNodeConnectorId(), new HashMap()); - } + QueueEntry queueEntry = nsa.new QueueEntry(swQueueStats.getNodeConnectorId(),swQueueStats.getQueueId()); + nsa.updateQueueStats(queueEntry); FlowCapableNodeConnectorQueueStatisticsDataBuilder queueStatisticsDataBuilder = new FlowCapableNodeConnectorQueueStatisticsDataBuilder(); @@ -684,11 +657,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList queueStatisticsDataBuilder.setFlowCapableNodeConnectorQueueStatistics(queueStatisticsBuilder.build()); - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap() - .get(swQueueStats.getNodeConnectorId()) - .put(swQueueStats.getQueueId(), queueStatisticsBuilder.build()); - - DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier queueRef @@ -714,28 +682,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()); @@ -770,14 +716,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) { @@ -810,5 +750,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; + } }