X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsUpdateCommiter.java;h=2fa380db3c5a651a47ba0d69386c0499eb68db29;hp=e7f6129aa5018c44baa9be2110597fab05c519a3;hb=dd264400a39fdde7c18798432514d72b753ca531;hpb=64dfe060369551b2f011889a7e77844bf35ce01a 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 e7f6129aa5..2fa380db3c 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,11 +7,15 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.HashMap; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; 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.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; 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; @@ -44,7 +48,6 @@ 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; @@ -64,7 +67,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group 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; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; @@ -88,11 +90,8 @@ 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.match.types.rev131026.match.EthernetMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatch; +import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Layer3Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4Match; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatch; -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; @@ -112,106 +111,100 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Class implement statistics manager related listener interface and augment all the + * 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 + * 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, + OpendaylightMeterStatisticsListener, OpendaylightFlowStatisticsListener, OpendaylightPortStatisticsListener, OpendaylightFlowTableStatisticsListener, OpendaylightQueueStatisticsListener{ - - public final static Logger sucLogger = LoggerFactory.getLogger(StatisticsUpdateCommiter.class); + + private final static Logger sucLogger = LoggerFactory.getLogger(StatisticsUpdateCommiter.class); private final StatisticsProvider statisticsManager; - - private final int unaccountedFlowsCounter = 1; + private final MultipartMessageManager messageManager; + + private int unaccountedFlowsCounter = 1; + /** + * default ctor + * @param manager + */ public StatisticsUpdateCommiter(final StatisticsProvider manager){ this.statisticsManager = manager; + this.messageManager = this.statisticsManager.getMultipartMessageManager(); } - + public StatisticsProvider getStatisticsManager(){ return statisticsManager; } - + @Override - public void onMeterConfigStatsUpdated(MeterConfigStatsUpdated notification) { + public void onMeterConfigStatsUpdated(final MeterConfigStatsUpdated notification) { //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; - + + final NodeKey key = new NodeKey(notification.getId()); + //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()).setMeterConfigStats(notification.getMeterConfigStats()); - + this.statisticsManager.getStatisticsAger(notification.getId()).updateMeterConfigStats(notification.getMeterConfigStats()); + //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); - - List eterConfigStatsList = notification.getMeterConfigStats(); - - for(MeterConfigStats meterConfigStats : eterConfigStatsList){ - DataModificationTransaction it = this.statisticsManager.startChange(); + List meterConfigStatsList = notification.getMeterConfigStats(); + DataModificationTransaction it = this.statisticsManager.startChange(); + + for(MeterConfigStats meterConfigStats : meterConfigStatsList){ 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(); - } + 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) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) 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()); - + final NodeKey key = new NodeKey(notification.getId()); + + //Publish data to configuration data store List meterStatsList = notification.getMeterStats(); - + DataModificationTransaction it = this.statisticsManager.startChange(); + 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); @@ -220,35 +213,32 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList //Update augmented data meterBuilder.addAugmentation(NodeMeterStatistics.class, meterStatsBuilder.build()); it.putOperationalData(meterRef, meterBuilder.build()); - it.commit(); } + 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) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; + final NodeKey key = new NodeKey(notification.getId()); + //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()).setGroupDescStats(notification.getGroupDescStats()); - + this.statisticsManager.getStatisticsAger(key.getId()).updateGroupDescStats(notification.getGroupDescStats()); + //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); List groupDescStatsList = notification.getGroupDescStats(); + DataModificationTransaction it = this.statisticsManager.startChange(); 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(); @@ -257,40 +247,33 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); } + 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) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) 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(); + DataModificationTransaction it = this.statisticsManager.startChange(); 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(); @@ -299,99 +282,87 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); } + it.commit(); } - + @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()); meterFeature.setMaxBands(notification.getMaxBands()); 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()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeMeterFeaturesBuilder nodeMeterFeatures= new NodeMeterFeaturesBuilder(); nodeMeterFeatures.setMeterFeatures(meterFeature.build()); - + //Update augmented data nodeData.addAugmentation(NodeMeterFeatures.class, nodeMeterFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); } - + @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(); NodeKey key = new NodeKey(notification.getId()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeGroupFeaturesBuilder nodeGroupFeatures= new NodeGroupFeaturesBuilder(); nodeGroupFeatures.setGroupFeatures(groupFeatures.build()); - + //Update augmented data nodeData.addAugmentation(NodeGroupFeatures.class, nodeGroupFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); } @Override - public void onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) { - + public void onFlowsStatisticsUpdate(final FlowsStatisticsUpdate notification) { + //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; - NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow stats update : {}",notification.toString()); - + + final NodeKey key = new NodeKey(notification.getId()); + final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsAger(key.getId()); + DataModificationTransaction it = this.statisticsManager.startChange(); + for(FlowAndStatisticsMapList map: notification.getFlowAndStatisticsMapList()){ short tableId = map.getTableId(); - - DataModificationTransaction it = this.statisticsManager.startChange(); + boolean foundOriginalFlow = false; @@ -420,26 +391,16 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flow.setPriority(map.getPriority()); flow.setStrict(map.isStrict()); flow.setTableId(tableId); - + Flow flowRule = flow.build(); - + FlowAndStatisticsMapListBuilder stats = new FlowAndStatisticsMapListBuilder(); stats.setByteCount(map.getByteCount()); stats.setPacketCount(map.getPacketCount()); stats.setDuration(map.getDuration()); - + GenericStatistics flowStats = stats.build(); - - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - 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); - + //Augment the data to the flow node FlowStatisticsBuilder flowStatistics = new FlowStatisticsBuilder(); @@ -464,18 +425,19 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flowStatistics.setTableId(tableId); flowStatisticsData.setFlowStatistics(flowStatistics.build()); - + sucLogger.debug("Flow : {}",flowRule.toString()); sucLogger.debug("Statistics to augment : {}",flowStatistics.build().toString()); InstanceIdentifier tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tableId)).toInstance(); - + Table table= (Table)it.readConfigurationData(tableRef); //TODO: Not a good way to do it, need to figure out better way. - //TODO: major issue in any alternate approach is that flow key is incrementally assigned + //TODO: major issue in any alternate approach is that flow key is incrementally assigned //to the flows stored in data store. + // Augment same statistics to all the matching masked flow if(table != null){ for(Flow existingFlow : table.getFlow()){ @@ -487,19 +449,51 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,existingFlow.getKey()).toInstance(); flowBuilder.setKey(existingFlow.getKey()); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.info("Found matching flow in the datastore, augmenting statistics"); + sucLogger.debug("Found matching flow in the datastore, augmenting statistics"); foundOriginalFlow = true; + // Update entry with timestamp of latest response + flow.setKey(existingFlow.getKey()); + FlowEntry flowStatsEntry = nsa.new FlowEntry(tableId,flow.build()); + nsa.updateFlowStats(flowStatsEntry); + it.putOperationalData(flowRef, flowBuilder.build()); - it.commit(); - break; } } } - + + 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 unaccounted flow in the operational datastore, augmenting statistics"); + foundOriginalFlow = true; + + // Update entry with timestamp of latest response + flow.setKey(existingFlow.getKey()); + FlowEntry flowStatsEntry = nsa.new FlowEntry(tableId,flow.build()); + nsa.updateFlowStats(flowStatsEntry); + + it.putOperationalData(flowRef, flowBuilder.build()); + break; + } + } + } + } if(!foundOriginalFlow){ - 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))); + String flowKey = "#UF$TABLE*"+Short.toString(tableId)+"*"+Integer.toString(this.unaccountedFlowsCounter); + this.unaccountedFlowsCounter++; FlowKey newFlowKey = new FlowKey(new FlowId(flowKey)); InstanceIdentifier flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class) @@ -507,25 +501,30 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,newFlowKey).toInstance(); flowBuilder.setKey(newFlowKey); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.info("Flow was no present in data store, augmenting statistics as an unaccounted flow"); + sucLogger.debug("Flow {} is not present in config data store, augmenting statistics as an unaccounted flow",flowBuilder.build()); + + // Update entry with timestamp of latest response + flow.setKey(newFlowKey); + FlowEntry flowStatsEntry = nsa.new FlowEntry(tableId,flow.build()); + nsa.updateFlowStats(flowStatsEntry); + it.putOperationalData(flowRef, flowBuilder.build()); - it.commit(); } } + it.commit(); } @Override public void onAggregateFlowStatisticsUpdate(AggregateFlowStatisticsUpdate notification) { //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; NodeKey key = new NodeKey(notification.getId()); - sucLogger.debug("Received aggregate flow statistics update : {}",notification.toString()); - - Short tableId = this.statisticsManager.getMultipartMessageManager().getTableIdForTxId(notification.getTransactionId()); + + Short tableId = messageManager.getTableIdForTxId(notification.getId(),notification.getTransactionId()); if(tableId != null){ - + DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) @@ -537,13 +536,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList aggregateFlowStatisticsBuilder.setFlowCount(notification.getFlowCount()); 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(); @@ -558,25 +551,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onNodeConnectorStatisticsUpdate(NodeConnectorStatisticsUpdate notification) { //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; 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(); + DataModificationTransaction it = this.statisticsManager.startChange(); + for(NodeConnectorStatisticsAndPortNumberMap portStats : portsStats){ - - DataModificationTransaction it = this.statisticsManager.startChange(); - FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder + FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder = new FlowCapableNodeConnectorStatisticsBuilder(); statisticsBuilder.setBytes(portStats.getBytes()); statisticsBuilder.setCollisionCount(portStats.getCollisionCount()); @@ -589,149 +574,120 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList statisticsBuilder.setReceiveOverRunError(portStats.getReceiveOverRunError()); 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 = + FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = new FlowCapableNodeConnectorStatisticsDataBuilder(); - + statisticsDataBuilder.setFlowCapableNodeConnectorStatistics(statisticsBuilder.build()); - + InstanceIdentifier nodeConnectorRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).child(NodeConnector.class, new NodeConnectorKey(portStats.getNodeConnectorId())).toInstance(); - + NodeConnector nodeConnector = (NodeConnector)it.readOperationalData(nodeConnectorRef); - + if(nodeConnector != null){ sucLogger.debug("Augmenting port statistics {} to port {}",statisticsDataBuilder.build().toString(),nodeConnectorRef.toString()); NodeConnectorBuilder nodeConnectorBuilder = new NodeConnectorBuilder(); nodeConnectorBuilder.addAugmentation(FlowCapableNodeConnectorStatisticsData.class, statisticsDataBuilder.build()); it.putOperationalData(nodeConnectorRef, nodeConnectorBuilder.build()); - it.commit(); } } + it.commit(); } @Override public void onFlowTableStatisticsUpdate(FlowTableStatisticsUpdate notification) { //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; NodeKey key = new NodeKey(notification.getId()); - sucLogger.debug("Received flow table statistics update : {}",notification.toString()); - + List flowTablesStatsList = notification.getFlowTableAndStatisticsMap(); + DataModificationTransaction it = this.statisticsManager.startChange(); + for (FlowTableAndStatisticsMap ftStats : flowTablesStatsList){ - - DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(ftStats.getTableId().getValue())).toInstance(); - + FlowTableStatisticsDataBuilder statisticsDataBuilder = new FlowTableStatisticsDataBuilder(); - + FlowTableStatisticsBuilder statisticsBuilder = new FlowTableStatisticsBuilder(); statisticsBuilder.setActiveFlows(ftStats.getActiveFlows()); statisticsBuilder.setPacketsLookedUp(ftStats.getPacketsLookedUp()); statisticsBuilder.setPacketsMatched(ftStats.getPacketsMatched()); - + 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(); tableBuilder.setKey(new TableKey(ftStats.getTableId().getValue())); tableBuilder.addAugmentation(FlowTableStatisticsData.class, statisticsDataBuilder.build()); it.putOperationalData(tableRef, tableBuilder.build()); - it.commit(); } + it.commit(); } @Override public void onQueueStatisticsUpdate(QueueStatisticsUpdate notification) { - + //Check if response is for the request statistics-manager sent. - if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) + if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies())) return; NodeKey key = new NodeKey(notification.getId()); - sucLogger.debug("Received queue 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()); - } - + NodeStatisticsAger nsa = this.statisticsManager.getStatisticsAger(key.getId()); + List queuesStats = notification.getQueueIdAndStatisticsMap(); + DataModificationTransaction it = this.statisticsManager.startChange(); + 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(); - + FlowCapableNodeConnectorQueueStatisticsBuilder queueStatisticsBuilder = new FlowCapableNodeConnectorQueueStatisticsBuilder(); - + queueStatisticsBuilder.fieldsFrom(swQueueStats); - + queueStatisticsDataBuilder.setFlowCapableNodeConnectorQueueStatistics(queueStatisticsBuilder.build()); - - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap() - .get(swQueueStats.getNodeConnectorId()) - .put(swQueueStats.getQueueId(), queueStatisticsBuilder.build()); - - - DataModificationTransaction it = this.statisticsManager.startChange(); - InstanceIdentifier queueRef + InstanceIdentifier queueRef = InstanceIdentifier.builder(Nodes.class) .child(Node.class, key) .child(NodeConnector.class, new NodeConnectorKey(swQueueStats.getNodeConnectorId())) .augmentation(FlowCapableNodeConnector.class) .child(Queue.class, new QueueKey(swQueueStats.getQueueId())).toInstance(); - + QueueBuilder queueBuilder = new QueueBuilder(); queueBuilder.addAugmentation(FlowCapableNodeConnectorQueueStatisticsData.class, queueStatisticsDataBuilder.build()); queueBuilder.setKey(new QueueKey(swQueueStats.getQueueId())); - sucLogger.info("Augmenting queue statistics {} of queue {} to port {}" + sucLogger.debug("Augmenting queue statistics {} of queue {} to port {}" ,queueStatisticsDataBuilder.build().toString(), swQueueStats.getQueueId(), swQueueStats.getNodeConnectorId()); - + it.putOperationalData(queueRef, queueBuilder.build()); - it.commit(); - } - + it.commit(); } - private NodeRef getNodeRef(NodeKey nodeKey){ + private static NodeRef getNodeRef(NodeKey nodeKey){ InstanceIdentifierBuilder builder = InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey); return new NodeRef(builder.toInstance()); } - - public boolean flowEquals(Flow statsFlow, Flow storedFlow) { + + public static boolean flowEquals(Flow statsFlow, Flow storedFlow) { if (statsFlow.getClass() != storedFlow.getClass()) { return false; } - if (statsFlow.getBufferId()== null) { - if (storedFlow.getBufferId() != null) { - return false; - } - } else if(!statsFlow.getBufferId().equals(storedFlow.getBufferId())) { - return false; - } if (statsFlow.getContainerName()== null) { if (storedFlow.getContainerName()!= null) { return false; @@ -739,13 +695,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } else if(!statsFlow.getContainerName().equals(storedFlow.getContainerName())) { return false; } - if (statsFlow.getCookie()== null) { - if (storedFlow.getCookie()!= null) { - return false; - } - } else if(!statsFlow.getCookie().equals(storedFlow.getCookie())) { - return false; - } if (statsFlow.getMatch()== null) { if (storedFlow.getMatch() != null) { return false; @@ -754,22 +703,8 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList else if(!matchEquals(statsFlow.getMatch(), storedFlow.getMatch())) { return false; } - if (statsFlow.getHardTimeout() == null) { - if (storedFlow.getHardTimeout() != null) { - return false; - } - } else if(!statsFlow.getHardTimeout().equals(storedFlow.getHardTimeout() )) { - return false; - } - if (statsFlow.getIdleTimeout()== null) { - if (storedFlow.getIdleTimeout() != null) { - return false; - } - } else if(!statsFlow.getIdleTimeout().equals(storedFlow.getIdleTimeout())) { - return false; - } - if (statsFlow.getPriority() == null) { - if (storedFlow.getPriority() != null) { + if (storedFlow.getPriority() == null) { + if (statsFlow.getPriority() != null && statsFlow.getPriority()!= 0x8000) { return false; } } else if(!statsFlow.getPriority().equals(storedFlow.getPriority())) { @@ -784,33 +719,33 @@ 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. - * + * Flow installation process has three steps + * 1) Store flow in config data store + * 2) and send it to plugin for installation + * 3) Flow gets installed in switch + * + * The flow user wants to install and what finally gets installed in switch can be slightly different. + * E.g, If user installs flow with src/dst ip=10.0.0.1/24, when it get installed in the switch + * src/dst ip will be changes to 10.0.0.0/24 because of netmask of 24. When statistics manager fetch + * stats it gets 10.0.0.0/24 rather then 10.0.0.1/24. Custom match takes care of by using masked ip + * while comparing two ip addresses. + * + * Sometimes when user don't provide few values that is required by flow installation request, like + * priority,hard timeout, idle timeout, cookies etc, plugin usages default values before sending + * request to the switch. So when statistics manager gets flow statistics, it gets the default value. + * But the flow stored in config data store don't have those defaults value. I included those checks + * in the customer flow/match equal function. + * + * * @param statsFlow * @param storedFlow * @return */ - public boolean matchEquals(Match statsFlow, Match storedFlow) { + + public static boolean matchEquals(Match statsFlow, Match storedFlow) { if (statsFlow == storedFlow) { return true; } @@ -819,12 +754,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getEthernetMatch() == null) { if (statsFlow.getEthernetMatch() != null) { - if(!statsFlow.getEthernetMatch().getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00") || - !statsFlow.getEthernetMatch().getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } + return false; } - } else if(!EthernetMatchEquals(statsFlow.getEthernetMatch(),storedFlow.getEthernetMatch())) { + } else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) { return false; } if (storedFlow.getIcmpv4Match()== null) { @@ -850,12 +782,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getInPort()== null) { if (statsFlow.getInPort() != null) { - String[] portArr = statsFlow.getInPort().getValue().split(":"); - if(portArr.length >= 3){ - if(Integer.parseInt(portArr[2]) != 0){ - return false; - } - } + return false; } } else if(!storedFlow.getInPort().equals(statsFlow.getInPort())) { return false; @@ -869,22 +796,14 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getLayer3Match()== null) { if (statsFlow.getLayer3Match() != null) { - Ipv4Match ipv4Match = (Ipv4Match)statsFlow.getLayer3Match(); - if(!ipv4Match.getIpv4Source().getValue().equals("0.0.0.0/0") || - !ipv4Match.getIpv4Destination().getValue().equals("0.0.0.0/0")){ return false; - } } - } else if(!storedFlow.getLayer3Match().equals(statsFlow.getLayer3Match())) { + } else if(!layer3MatchEquals(statsFlow.getLayer3Match(),storedFlow.getLayer3Match())) { return false; } if (storedFlow.getLayer4Match()== null) { if (statsFlow.getLayer4Match() != null) { - TcpMatch tcpMatch = (TcpMatch)statsFlow.getLayer4Match(); - if(!tcpMatch.getTcpDestinationPort().getValue().equals(0) || - !tcpMatch.getTcpSourcePort().getValue().equals(0)){ - return false; - } + return false; } } else if(!storedFlow.getLayer4Match().equals(statsFlow.getLayer4Match())) { return false; @@ -912,11 +831,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getVlanMatch()== null) { if (statsFlow.getVlanMatch() != null) { - VlanMatch vlanMatch = statsFlow.getVlanMatch(); - if(!vlanMatch.getVlanId().getVlanId().getValue().equals(0) || - !vlanMatch.getVlanPcp().getValue().equals((short)0)){ - return false; - } + return false; } } else if(!storedFlow.getVlanMatch().equals(statsFlow.getVlanMatch())) { return false; @@ -924,37 +839,133 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList return true; } - public boolean EthernetMatchEquals(EthernetMatch statsEtherMatch, EthernetMatch storedEtherMatch) { - if (statsEtherMatch == storedEtherMatch) { + protected static boolean layer3MatchEquals(Layer3Match statsLayer3Match, Layer3Match storedLayer3Match){ + boolean verdict = true; + if(statsLayer3Match instanceof Ipv4Match && storedLayer3Match instanceof Ipv4Match){ + Ipv4Match statsIpv4Match = (Ipv4Match)statsLayer3Match; + Ipv4Match storedIpv4Match = (Ipv4Match)storedLayer3Match; + + if (verdict) { + verdict = compareNullSafe( + storedIpv4Match.getIpv4Destination(), statsIpv4Match.getIpv4Destination()); + } + if (verdict) { + verdict = compareNullSafe( + statsIpv4Match.getIpv4Source(), storedIpv4Match.getIpv4Source()); + } + } else { + Boolean nullCheckOut = checkNullValues(storedLayer3Match, statsLayer3Match); + if (nullCheckOut != null) { + verdict = nullCheckOut; + } else { + verdict = storedLayer3Match.equals(statsLayer3Match); + } + } + + return verdict; + } + + private static boolean compareNullSafe(Ipv4Prefix statsIpv4, Ipv4Prefix storedIpv4) { + boolean verdict = true; + Boolean checkDestNullValuesOut = checkNullValues(storedIpv4, statsIpv4); + if (checkDestNullValuesOut != null) { + verdict = checkDestNullValuesOut; + } else if(!IpAddressEquals(statsIpv4, storedIpv4)){ + verdict = false; + } + + return verdict; + } + + private static Boolean checkNullValues(Object v1, Object v2) { + Boolean verdict = null; + if (v1 == null && v2 != null) { + verdict = Boolean.FALSE; + } else if (v1 != null && v2 == null) { + verdict = Boolean.FALSE; + } else if (v1 == null && v2 == null) { + verdict = Boolean.TRUE; + } + + return verdict; + } + + /** + * TODO: why don't we use the default Ipv4Prefix.equals()? + * + * @param statsIpAddress + * @param storedIpAddress + * @return true if IPv4prefixes equals + */ + private static boolean IpAddressEquals(Ipv4Prefix statsIpAddress, Ipv4Prefix storedIpAddress) { + IntegerIpAddress statsIpAddressInt = StrIpToIntIp(statsIpAddress.getValue()); + IntegerIpAddress storedIpAddressInt = StrIpToIntIp(storedIpAddress.getValue()); + + if(IpAndMaskBasedMatch(statsIpAddressInt,storedIpAddressInt)){ return true; } - if (storedEtherMatch.getEthernetDestination()== null) { - if (statsEtherMatch.getEthernetDestination() != null) { - if(!statsEtherMatch.getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetDestination().equals(statsEtherMatch.getEthernetDestination())) { - return false; + if(IpBasedMatch(statsIpAddressInt,storedIpAddressInt)){ + return true; } - if (storedEtherMatch.getEthernetSource() == null) { - if (statsEtherMatch.getEthernetSource() != null) { - if(!statsEtherMatch.getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetSource().equals(statsEtherMatch.getEthernetSource())) { - return false; + return false; + } + + private static boolean IpAndMaskBasedMatch(IntegerIpAddress statsIpAddressInt,IntegerIpAddress storedIpAddressInt){ + return ((statsIpAddressInt.getIp() & statsIpAddressInt.getMask()) == (storedIpAddressInt.getIp() & storedIpAddressInt.getMask())); + } + + private static boolean IpBasedMatch(IntegerIpAddress statsIpAddressInt,IntegerIpAddress storedIpAddressInt){ + return (statsIpAddressInt.getIp() == storedIpAddressInt.getIp()); + } + + /** + * Method return integer version of ip address. Converted int will be mask if + * mask specified + */ + private static IntegerIpAddress StrIpToIntIp(String ipAddresss){ + + String[] parts = ipAddresss.split("/"); + String ip = parts[0]; + int prefix; + + if (parts.length < 2) { + prefix = 32; + } else { + prefix = Integer.parseInt(parts[1]); } - if (storedEtherMatch.getEthernetType() == null) { - if (statsEtherMatch.getEthernetType() != null) { - if(!statsEtherMatch.getEthernetType().getType().getValue().equals(0)){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetType().equals(statsEtherMatch.getEthernetType())) { - return false; + + IntegerIpAddress integerIpAddress = null; + try { + Inet4Address addr = (Inet4Address) InetAddress.getByName(ip); + byte[] addrBytes = addr.getAddress(); + int ipInt = ((addrBytes[0] & 0xFF) << 24) | + ((addrBytes[1] & 0xFF) << 16) | + ((addrBytes[2] & 0xFF) << 8) | + ((addrBytes[3] & 0xFF) << 0); + + int mask = 0xffffffff << 32 - prefix; + + integerIpAddress = new IntegerIpAddress(ipInt, mask); + } catch (UnknownHostException e){ + sucLogger.error("Failed to determine host IP address by name: {}", e.getMessage(), e); + } + + return integerIpAddress; + } + + static class IntegerIpAddress{ + int ip; + int mask; + public IntegerIpAddress(int ip, int mask) { + this.ip = ip; + this.mask = mask; + } + public int getIp() { + return ip; + } + public int getMask() { + return mask; } - return true; } } +