Fixed Group and Meter RPC model to use MD-SAL routing correctly

[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 5c02b6cea069b5266244189990f54e66cddff67f..bb7d6f71575d47949012b1f815c047ff54b9f565 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
@@ -1,6 +1,12 @@
+/*
+ * Copyright IBM Corporation, 2013.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.md.statistics.manager;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -17,6 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.
 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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@ -52,8 +59,8 @@ public class StatisticsProvider implements AutoCloseable {
     
     //Local caching of stats
     
-    private final ConcurrentMap<NodeRef,NodeStatistics> statisticsCache = 
-            new ConcurrentHashMap<NodeRef,NodeStatistics>();
+    private final ConcurrentMap<NodeId,NodeStatistics> statisticsCache = 
+            new ConcurrentHashMap<NodeId,NodeStatistics>();
     
     public DataProviderService getDataService() {
       return this.dps;
@@ -98,12 +105,16 @@ public class StatisticsProvider implements AutoCloseable {
                         
                         Thread.sleep(5000);
                     }catch (Exception e){
-                        spLogger.error("Exception occurred while sending stats request : {}",e.getMessage());
-                        e.printStackTrace();
+                        spLogger.error("Exception occurred while sending stats request : {}",e);
                     }
                 }
             }
         });
+        
+        spLogger.debug("Statistics requester thread started with timer interval : {}",5000);
+        
+        statisticsRequesterThread.start();
+        
         spLogger.info("Statistics Provider started.");
     }
     
@@ -116,42 +127,53 @@ public class StatisticsProvider implements AutoCloseable {
     private void statsRequestSender(){
         
         //Need to call API to receive all the nodes connected to controller.
+        List<Node> targetNodes = getAllConnectedNodes();
         
-        List<NodeRef> targetNodes = new ArrayList<NodeRef>();
-        
-        for (NodeRef targetNode : targetNodes){
-            
-            sendAllGroupStatisticsRequest(targetNode);
-            
-            sendAllMeterStatisticsRequest(targetNode);
+        if(targetNodes == null)
+            return;
 
-            //We need to add check, so see if groups/meters are supported
-            //by the target node.
-            sendGroupDescriptionRequest(targetNode);
-            
-            sendGroupFeaturesRequest(targetNode);
+        for (Node targetNode : targetNodes){
+            spLogger.info("Send request for stats collection to node : {})",targetNode.getId());
             
-            sendMeterConfigStatisticsRequest(targetNode);
-            
-            sendMeterFeaturesRequest(targetNode);
+            //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:")){
+                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);
+            }
         }
     }
     
     private void sendAllGroupStatisticsRequest(NodeRef targetNode){
         
-        GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder();
+        final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder();
         
+        input.setNode(targetNode);
         input.setNode(targetNode);
 
+        @SuppressWarnings("unused")
         Future<RpcResult<GetAllGroupStatisticsOutput>> response = 
                 groupStatsService.getAllGroupStatistics(input.build());
     }
     
     private void sendGroupDescriptionRequest(NodeRef targetNode){
-        GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
+        final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
         
         input.setNode(targetNode);
-        
+
+        @SuppressWarnings("unused")
         Future<RpcResult<GetGroupDescriptionOutput>> response = 
                 groupStatsService.getGroupDescription(input.build());
     }
@@ -161,17 +183,19 @@ public class StatisticsProvider implements AutoCloseable {
         GetGroupFeaturesInputBuilder input = new GetGroupFeaturesInputBuilder();
         
         input.setNode(targetNode);
-        
+
+        @SuppressWarnings("unused")
         Future<RpcResult<GetGroupFeaturesOutput>> response = 
                 groupStatsService.getGroupFeatures(input.build());
     }
     
-    private void sendAllMeterStatisticsRequest(NodeRef targenetNode){
+    private void sendAllMeterStatisticsRequest(NodeRef targetNode){
         
         GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder();
         
-        input.setNode(targenetNode);
-        
+        input.setNode(targetNode);
+
+        @SuppressWarnings("unused")
         Future<RpcResult<GetAllMeterStatisticsOutput>> response = 
                 meterStatsService.getAllMeterStatistics(input.build());
     }
@@ -181,7 +205,8 @@ public class StatisticsProvider implements AutoCloseable {
         GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder();
         
         input.setNode(targetNode);
-        
+
+        @SuppressWarnings("unused")
         Future<RpcResult<GetAllMeterConfigStatisticsOutput>> response = 
                 meterStatsService.getAllMeterConfigStatistics(input.build());
         
@@ -191,18 +216,23 @@ public class StatisticsProvider implements AutoCloseable {
         GetMeterFeaturesInputBuilder input = new GetMeterFeaturesInputBuilder();
         
         input.setNode(targetNode);
-        
+
+        @SuppressWarnings("unused")
         Future<RpcResult<GetMeterFeaturesOutput>> response = 
                 meterStatsService.getMeterFeatures(input.build());
     }
     
-    public ConcurrentMap<NodeRef, NodeStatistics> getStatisticsCache() {
+    public ConcurrentMap<NodeId, NodeStatistics> getStatisticsCache() {
         return statisticsCache;
     }
     
     private List<Node> getAllConnectedNodes(){
         
         Nodes nodes = (Nodes) dps.readOperationalData(nodesIdentifier);
+        if(nodes == null)
+            return null;
+        
+        spLogger.info("Number of connected nodes : {}",nodes.getNode().size());
         return nodes.getNode();
     }
 
@@ -222,7 +252,6 @@ public class StatisticsProvider implements AutoCloseable {
           } catch (Throwable e) {
             throw Exceptions.sneakyThrow(e);
           }
-
     }
 
 }