MD-SAL Statistics Manager - Fixed keys of group and meter models and their sub component

[controller.git] / opendaylight / md-sal / statistics-manager / src / main / java / org / opendaylight / controller / md / statistics / manager / StatisticsProvider.java

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java
index cdcd1ef32edde93dbc83745a62c97f81a2f42a83..f22ca00b2ab4d0dc20d551aa08d58522848923a7 100644 (file)
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java
@@ -16,12 +16,11 @@ import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
@@ -31,8 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -55,8 +52,9 @@ public class StatisticsProvider implements AutoCloseable {
     
     private Thread statisticsRequesterThread;
     
-    private final  InstanceIdentifier<Nodes> nodesIdentifier = InstanceIdentifier.builder().node(Nodes.class).toInstance();
+    private final  InstanceIdentifier<Nodes> nodesIdentifier = InstanceIdentifier.builder(Nodes.class).toInstance();
     
+    private final int STATS_THREAD_EXECUTION_TIME= 50000;
     //Local caching of stats
     
     private final ConcurrentMap<NodeId,NodeStatistics> statisticsCache = 
@@ -103,7 +101,7 @@ public class StatisticsProvider implements AutoCloseable {
                     try {
                         statsRequestSender();
                         
-                        Thread.sleep(5000);
+                        Thread.sleep(STATS_THREAD_EXECUTION_TIME);
                     }catch (Exception e){
                         spLogger.error("Exception occurred while sending stats request : {}",e);
                     }
@@ -111,9 +109,9 @@ public class StatisticsProvider implements AutoCloseable {
             }
         });
         
-        spLogger.debug("Statistics requester thread started with timer interval : {}",5000);
+        spLogger.debug("Statistics requester thread started with timer interval : {}",STATS_THREAD_EXECUTION_TIME);
         
-        //statisticsRequesterThread.start();
+        statisticsRequesterThread.start();
         
         spLogger.info("Statistics Provider started.");
     }
@@ -133,25 +131,26 @@ public class StatisticsProvider implements AutoCloseable {
             return;
 
         for (Node targetNode : targetNodes){
-            spLogger.info("Send request for stats collection to node : {})",targetNode.getId());
-            
-            //We need to add check, so see if groups/meters are supported
-            //by the target node. Below check doesn't look good.
-            if(targetNode.getId().getValue().contains("openflow:")){
+
+            if(targetNode.getAugmentation(FlowCapableNode.class) != null){
+
+                spLogger.info("Send request for stats collection to node : {})",targetNode.getId());
+                
                 InstanceIdentifier<Node> targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance();
                 NodeRef targetNodeRef = new NodeRef(targetInstanceId);
                 
-                sendAllGroupStatisticsRequest(targetNodeRef);
-                
-                sendAllMeterStatisticsRequest(targetNodeRef);
-                
-                sendGroupDescriptionRequest(targetNodeRef);
-                
-                sendGroupFeaturesRequest(targetNodeRef);
-                
-                sendMeterConfigStatisticsRequest(targetNodeRef);
-                
-                sendMeterFeaturesRequest(targetNodeRef);
+                try{
+                  sendAllGroupStatisticsRequest(targetNodeRef);
+                  Thread.sleep(1000);
+                  sendAllMeterStatisticsRequest(targetNodeRef);
+                  Thread.sleep(1000);
+                  sendGroupDescriptionRequest(targetNodeRef);
+                  Thread.sleep(1000);
+                  sendMeterConfigStatisticsRequest(targetNodeRef);
+                  Thread.sleep(1000);
+                }catch(Exception e){
+                    spLogger.error("Exception occured while sending statistics request : {}", e);
+                }
             }
         }
     }
@@ -178,17 +177,6 @@ public class StatisticsProvider implements AutoCloseable {
                 groupStatsService.getGroupDescription(input.build());
     }
     
-    private void sendGroupFeaturesRequest(NodeRef targetNode){
-        
-        GetGroupFeaturesInputBuilder input = new GetGroupFeaturesInputBuilder();
-        
-        input.setNode(targetNode);
-
-        @SuppressWarnings("unused")
-        Future<RpcResult<GetGroupFeaturesOutput>> response = 
-                groupStatsService.getGroupFeatures(input.build());
-    }
-    
     private void sendAllMeterStatisticsRequest(NodeRef targetNode){
         
         GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder();
@@ -211,16 +199,6 @@ public class StatisticsProvider implements AutoCloseable {
                 meterStatsService.getAllMeterConfigStatistics(input.build());
         
     }
-    private void sendMeterFeaturesRequest(NodeRef targetNode){
-     
-        GetMeterFeaturesInputBuilder input = new GetMeterFeaturesInputBuilder();
-        
-        input.setNode(targetNode);
-
-        @SuppressWarnings("unused")
-        Future<RpcResult<GetMeterFeaturesOutput>> response = 
-                meterStatsService.getMeterFeatures(input.build());
-    }
     
     public ConcurrentMap<NodeId, NodeStatistics> getStatisticsCache() {
         return statisticsCache;