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%2FStatisticsListener.java;fp=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsUpdateCommiter.java;h=155815dc8802e70b09015d6590f7957e85a44492;hp=317d2963f68bed7e1b9cce8f60ca54353fc6fffb;hb=a3a95bbc1f01cfb9c641a48cf3c42e31075deb82;hpb=cb016426ddc0f08cee3c9475f4214388c0035edd

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/StatisticsListener.java
similarity index 73%
rename from opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
rename to opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsListener.java
index 317d2963f6..155815dc88 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/StatisticsListener.java
@@ -28,21 +28,21 @@ 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.
+ * This class is responsible for listening for statistics update notifications and
+ * routing them to the appropriate NodeStatisticsHandler.
+
  * 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,
+public class StatisticsListener implements OpendaylightGroupStatisticsListener,
         OpendaylightMeterStatisticsListener,
         OpendaylightFlowStatisticsListener,
         OpendaylightPortStatisticsListener,
         OpendaylightFlowTableStatisticsListener,
         OpendaylightQueueStatisticsListener{
 
-    private final static Logger sucLogger = LoggerFactory.getLogger(StatisticsUpdateCommiter.class);
+    private final static Logger sucLogger = LoggerFactory.getLogger(StatisticsListener.class);
     private final StatisticsProvider statisticsManager;
     private final MultipartMessageManager messageManager;
 
@@ -50,7 +50,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
      * default ctor
      * @param manager
      */
-    public StatisticsUpdateCommiter(final StatisticsProvider manager){
+    public StatisticsListener(final StatisticsProvider manager){
         this.statisticsManager = manager;
         this.messageManager = this.statisticsManager.getMultipartMessageManager();
     }
@@ -62,9 +62,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
             return;
 
         //Add statistics to local cache
-        final NodeStatisticsAger sna = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (sna != null) {
-            sna.updateMeterConfigStats(notification.getMeterConfigStats());
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateMeterConfigStats(notification.getMeterConfigStats());
         }
     }
 
@@ -75,9 +75,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
             return;
 
         //Add statistics to local cache
-        final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateMeterStats(notification.getMeterStats());
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateMeterStats(notification.getMeterStats());
         }
     }
 
@@ -87,9 +87,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies()))
             return;
 
-        final NodeStatisticsAger nsa = statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateGroupDescStats(notification.getGroupDescStats());
+        final NodeStatisticsHandler handler = statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateGroupDescStats(notification.getGroupDescStats());
         }
     }
 
@@ -99,15 +99,15 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies()))
             return;
 
-        final NodeStatisticsAger nsa = statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateGroupStats(notification.getGroupStats());
+        final NodeStatisticsHandler handler = statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateGroupStats(notification.getGroupStats());
         }
     }
 
     @Override
     public void onMeterFeaturesUpdated(MeterFeaturesUpdated notification) {
-        final NodeStatisticsAger sna = this.statisticsManager.getStatisticsHandler(notification.getId());
+        final NodeStatisticsHandler sna = this.statisticsManager.getStatisticsHandler(notification.getId());
         if (sna != null) {
             sna.updateMeterFeatures(notification);
         }
@@ -115,7 +115,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
 
     @Override
     public void onGroupFeaturesUpdated(GroupFeaturesUpdated notification) {
-        final NodeStatisticsAger sna = this.statisticsManager.getStatisticsHandler(notification.getId());
+        final NodeStatisticsHandler sna = this.statisticsManager.getStatisticsHandler(notification.getId());
         if (sna != null) {
             sna.updateGroupFeatures(notification);
         }
@@ -128,7 +128,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
             return;
 
         sucLogger.debug("Received flow stats update : {}",notification.toString());
-        final NodeStatisticsAger sna = this.statisticsManager.getStatisticsHandler(notification.getId());
+        final NodeStatisticsHandler sna = this.statisticsManager.getStatisticsHandler(notification.getId());
         if (sna != null) {
             sna.updateFlowStats(notification.getFlowAndStatisticsMapList());
         }
@@ -140,10 +140,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies()))
             return;
 
-        final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
             final Short tableId = messageManager.getTableIdForTxId(notification.getId(),notification.getTransactionId());
-            nsa.updateAggregateFlowStats(tableId, notification);
+            handler.updateAggregateFlowStats(tableId, notification);
         }
     }
 
@@ -153,9 +153,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies()))
             return;
 
-        final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateNodeConnectorStats(notification.getNodeConnectorStatisticsAndPortNumberMap());
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateNodeConnectorStats(notification.getNodeConnectorStatisticsAndPortNumberMap());
         }
     }
 
@@ -165,9 +165,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if(!messageManager.isRequestTxIdExist(notification.getId(),notification.getTransactionId(),notification.isMoreReplies()))
             return;
 
-        final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateFlowTableStats(notification.getFlowTableAndStatisticsMap());
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateFlowTableStats(notification.getFlowTableAndStatisticsMap());
         }
     }
 
@@ -178,9 +178,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
             return;
 
         //Add statistics to local cache
-        final NodeStatisticsAger nsa = this.statisticsManager.getStatisticsHandler(notification.getId());
-        if (nsa != null) {
-            nsa.updateQueueStats(notification.getQueueIdAndStatisticsMap());
+        final NodeStatisticsHandler handler = this.statisticsManager.getStatisticsHandler(notification.getId());
+        if (handler != null) {
+            handler.updateQueueStats(notification.getQueueIdAndStatisticsMap());
         }
     }
 }