BUG-650: remove unneeded sort()

[controller.git] / opendaylight / sal / implementation / src / main / java / org / opendaylight / controller / sal / implementation / internal / ReadService.java

diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java
index edc91173890970b12680fa27628fe378a9ba1490..12de35f53677492581412017e9c763de96a05c0b 100644 (file)
--- a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java
+++ b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/ReadService.java
@@ -9,12 +9,15 @@
 
 package org.opendaylight.controller.sal.implementation.internal;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
@@ -25,15 +28,17 @@ import org.opendaylight.controller.sal.action.Output;
 import org.opendaylight.controller.sal.action.PopVlan;
 import org.opendaylight.controller.sal.core.ConstructionException;
 import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.controller.sal.core.NodeTable;
-import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.core.Node.NodeIDType;
+import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.core.NodeTable;
 import org.opendaylight.controller.sal.flowprogrammer.Flow;
 import org.opendaylight.controller.sal.match.Match;
 import org.opendaylight.controller.sal.match.MatchType;
 import org.opendaylight.controller.sal.reader.FlowOnNode;
 import org.opendaylight.controller.sal.reader.IPluginInReadService;
+import org.opendaylight.controller.sal.reader.IPluginOutReadService;
 import org.opendaylight.controller.sal.reader.IReadService;
+import org.opendaylight.controller.sal.reader.IReadServiceListener;
 import org.opendaylight.controller.sal.reader.NodeConnectorStatistics;
 import org.opendaylight.controller.sal.reader.NodeDescription;
 import org.opendaylight.controller.sal.reader.NodeTableStatistics;
@@ -49,19 +54,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The SAL Read Service. It dispatches the read request to
- * the proper SDN protocol plugin
- *
- *
- *
+ * The SAL Read Service. Dispatches read requests to the proper SDN protocol
+ * plugin, and notifies any listeners on updates from any plugin readers
  */
-public class ReadService implements IReadService, CommandProvider {
+public class ReadService implements IReadService, CommandProvider, IPluginOutReadService {
 
-    protected static final Logger logger = LoggerFactory
-            .getLogger(ReadService.class);
-    private ConcurrentHashMap<String, IPluginInReadService>
-        pluginReader =
+    protected static final Logger logger = LoggerFactory.getLogger(ReadService.class);
+    private ConcurrentHashMap<String, IPluginInReadService> pluginReader =
         new ConcurrentHashMap<String, IPluginInReadService>();
+    private Set<IReadServiceListener> readerListeners =
+        new CopyOnWriteArraySet<IReadServiceListener>();
 
     /**
      * Function called by the dependency manager when all the required
@@ -81,6 +83,7 @@ public class ReadService implements IReadService, CommandProvider {
         // In case of plugin disactivating make sure we clear the
         // dependencies
         this.pluginReader.clear();
+        this.readerListeners.clear();
     }
 
     /**
@@ -103,7 +106,7 @@ public class ReadService implements IReadService, CommandProvider {
     }
 
     // Set the reference to the plugin flow Reader service
-    public void setService(Map props, IPluginInReadService s) {
+    public void setService(Map<?, ?> props, IPluginInReadService s) {
         if (this.pluginReader == null) {
             logger.error("pluginReader store null");
             return;
@@ -112,7 +115,7 @@ public class ReadService implements IReadService, CommandProvider {
         logger.trace("Got a service set request {}", s);
         String type = null;
         for (Object e : props.entrySet()) {
-            Map.Entry entry = (Map.Entry) e;
+            Map.Entry<?, ?> entry = (Map.Entry<?, ?>) e;
             logger.trace("Prop key:({}) value:({})", entry.getKey(),
                     entry.getValue());
         }
@@ -130,7 +133,7 @@ public class ReadService implements IReadService, CommandProvider {
         }
     }
 
-    public void unsetService(Map props, IPluginInReadService s) {
+    public void unsetService(Map<?, ?> props, IPluginInReadService s) {
         if (this.pluginReader == null) {
             logger.error("pluginReader store null");
             return;
@@ -139,7 +142,7 @@ public class ReadService implements IReadService, CommandProvider {
         String type = null;
         logger.debug("Received unsetpluginReader request");
         for (Object e : props.entrySet()) {
-            Map.Entry entry = (Map.Entry) e;
+            Map.Entry<?, ?> entry = (Map.Entry<?, ?>) e;
             logger.trace("Prop key:({}) value:({})", entry.getKey(),
                     entry.getValue());
         }
@@ -156,6 +159,15 @@ public class ReadService implements IReadService, CommandProvider {
             logger.debug("Removed the pluginReader for type: {}", type);
         }
     }
+    public void setReaderListener(IReadServiceListener service) {
+        logger.trace("Got a listener set request {}", service);
+        this.readerListeners.add(service);
+    }
+
+    public void unsetReaderListener(IReadServiceListener service) {
+        logger.trace("Got a listener Unset request");
+        this.readerListeners.remove(service);
+    }
 
     @Override
     public FlowOnNode readFlow(Node node, Flow flow) {
@@ -165,7 +177,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readFlow(node, flow, true);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -177,7 +189,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readFlow(node, flow, false);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -189,8 +201,8 @@ public class ReadService implements IReadService, CommandProvider {
                         .readAllFlow(node, true);
             }
         }
-        logger.warn("Plugin unavailable");
-        return null;
+        logger.warn("Plugin {} unavailable", node.getType());
+        return Collections.emptyList();
     }
 
     @Override
@@ -201,8 +213,8 @@ public class ReadService implements IReadService, CommandProvider {
                         .readAllFlow(node, false);
             }
         }
-        logger.warn("Plugin unavailable");
-        return null;
+        logger.warn("Plugin {} unavailable", node.getType());
+        return Collections.emptyList();
     }
 
     @Override
@@ -213,7 +225,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readDescription(node, true);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -225,7 +237,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readDescription(node, false);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -238,7 +250,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readNodeConnector(connector, true);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -252,7 +264,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readNodeConnector(connector, false);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -264,8 +276,8 @@ public class ReadService implements IReadService, CommandProvider {
                         .readAllNodeConnector(node, true);
             }
         }
-        logger.warn("Plugin unavailable");
-        return null;
+        logger.warn("Plugin {} unavailable", node.getType());
+        return Collections.emptyList();
     }
 
     @Override
@@ -276,8 +288,8 @@ public class ReadService implements IReadService, CommandProvider {
                         .readAllNodeTable(node, true);
             }
         }
-        logger.warn("Plugin unavailable");
-        return null;
+        logger.warn("Plugin {} unavailable", node.getType());
+        return Collections.emptyList();
     }
 
 
@@ -290,7 +302,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readNodeTable(table, false);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -303,7 +315,7 @@ public class ReadService implements IReadService, CommandProvider {
                         .readNodeTable(table, true);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return null;
     }
 
@@ -315,8 +327,8 @@ public class ReadService implements IReadService, CommandProvider {
                         .readAllNodeConnector(node, false);
             }
         }
-        logger.warn("Plugin unavailable");
-        return null;
+        logger.warn("Plugin {} unavailable", node.getType());
+        return Collections.emptyList();
     }
 
     @Override
@@ -328,10 +340,38 @@ public class ReadService implements IReadService, CommandProvider {
                         .getTransmitRate(connector);
             }
         }
-        logger.warn("Plugin unavailable");
+        logger.warn("Plugin {} unavailable", node.getType());
         return 0;
     }
 
+    @Override
+    public void nodeFlowStatisticsUpdated(Node node, List<FlowOnNode> flowStatsList) {
+        for (IReadServiceListener l : readerListeners){
+            l.nodeFlowStatisticsUpdated(node, flowStatsList);
+        }
+    }
+
+    @Override
+    public void nodeConnectorStatisticsUpdated(Node node, List<NodeConnectorStatistics> ncStatsList) {
+        for (IReadServiceListener l : readerListeners){
+            l.nodeConnectorStatisticsUpdated(node, ncStatsList);
+        }
+    }
+
+    @Override
+    public void nodeTableStatisticsUpdated(Node node, List<NodeTableStatistics> tableStatsList) {
+        for (IReadServiceListener l : readerListeners){
+            l.nodeTableStatisticsUpdated(node, tableStatsList);
+        }
+    }
+
+    @Override
+    public void descriptionStatisticsUpdated(Node node, NodeDescription nodeDescription) {
+        for (IReadServiceListener l : readerListeners){
+            l.descriptionStatisticsUpdated(node, nodeDescription);
+        }
+    }
+
     // ---------------- OSGI TEST CODE ------------------------------//
 
     private void registerWithOSGIConsole() {
@@ -345,16 +385,15 @@ public class ReadService implements IReadService, CommandProvider {
     public String getHelp() {
         StringBuffer help = new StringBuffer();
         help.append("---SAL Reader testing commands---\n");
-        help
-        .append("\t readflows <sid> <cached>  - Read all the (cached) flows from the openflow switch <sid>\n");
-        help
-        .append("\t readflow  <sid> <cached>  - Read the (cached) sample flow from the openflow switch <sid>\n");
-        help
-        .append("\t readdesc  <sid> <cached>  - Read the (cached) description from openflow switch <sid>\n");
-        help
-        .append("\t           cached=true/false. If false or not specified, the protocol plugin cached info\n");
-        help
-        .append("\t           is returned. If true, the info is directly retrieved from the switch\n");
+        help.append("\t readflows <sid> <cached> - Read all the (cached) flows from the openflow switch <sid>\n");
+        help.append("\t readflow  <sid> <cached> - Read the (cached) sample flow from the openflow switch <sid>\n");
+        help.append("\t readdescr <sid> <cached> - Read the (cached) description from openflow switch <sid>\n");
+        help.append("\t\t cached = (true|false). If false or not specified, the plugin cached info\n");
+        help.append("\t\t is returned. If true, the info is directly retrieved from the switch\n");
+        help.append("\t readport <sid> <port>    - Read port statistics for the specified port\n");
+        help.append("\t readports <sid>          - Read port statistics for all ports of specified switch\n");
+        help.append("\t readtable <sid> <tableid>- Read specified table statistics\n");
+
         return help.toString();
     }
 
@@ -567,5 +606,4 @@ public class ReadService implements IReadService, CommandProvider {
         actions.add(new Controller());
         return new Flow(match, actions);
     }
-
 }