Move stats caching to FM StatisticsManager

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / IOFStatisticsManager.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java
index 18fe686dd5be1dbf98bbafea3841b9803e7fbd93..fa225a8d3ee9e77cf5c034c73c383e26c518d3a6 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/IOFStatisticsManager.java
@@ -22,9 +22,9 @@ public interface IOFStatisticsManager {
     /**
      * Return all the statistics for all the flows present on the specified switch
      *
-        * @param switchId the openflow datapath id
-        * @return      the list of openflow statistics
-        */
+     * @param switchId the openflow datapath id
+     * @return the list of openflow statistics
+     */
     List<OFStatistics> getOFFlowStatistics(Long switchId);
 
     /**
@@ -32,14 +32,15 @@ public interface IOFStatisticsManager {
      *
      * @param switchId the openflow datapath id
      * @param ofMatch the openflow match to query. If null, the query is intended for all the flows
+     * @param priority Priority of the wanted flow
      * @return the list of openflow statistics
      */
-    List<OFStatistics> getOFFlowStatistics(Long switchId, OFMatch ofMatch);
+    List<OFStatistics> getOFFlowStatistics(Long switchId, OFMatch ofMatch, short priority);
 
     /**
      * Return the description statistics for the specified switch.
      *
-        * @param switchId the openflow datapath id
+     * @param switchId the openflow datapath id
      * @return the list of openflow statistics
      */
     List<OFStatistics> getOFDescStatistics(Long switchId);
@@ -47,7 +48,7 @@ public interface IOFStatisticsManager {
     /**
      * Returns the statistics for all the ports on the specified switch
      *
-        * @param switchId the openflow datapath id
+     * @param switchId the openflow datapath id
      * @return the list of openflow statistics
      */
     List<OFStatistics> getOFPortStatistics(Long switchId);
@@ -55,7 +56,7 @@ public interface IOFStatisticsManager {
     /**
      * Returns the statistics for the specified switch port
      *
-        * @param switchId the openflow datapath id
+     * @param switchId the openflow datapath id
      * @param portId the openflow switch port id
      * @return the list of openflow statistics
      */
@@ -64,7 +65,7 @@ public interface IOFStatisticsManager {
     /**
      * Returns the number of flows installed on the switch
      *
-        * @param switchId the openflow datapath id
+     * @param switchId the openflow datapath id
      * @return the number of flows installed on the switch
      */
     int getFlowsNumber(long switchId);
@@ -77,12 +78,12 @@ public interface IOFStatisticsManager {
      * @param switchId the openflow datapath id of the target switch
      * @param statType the openflow statistics type
      * @param target the target object. For flow statistics it is the OFMatch.
-     *                                  For port statistics, it is the port id. If null the query
-     *                                  will be performed for all the targets for the specified
-     *                                  statistics type. 
-     *                                  
+     *                                  For port statistics, it is the port id. If null the query
+     *                                  will be performed for all the targets for the specified
+     *                                  statistics type.
+     *
      * @param timeout the timeout in milliseconds the system will wait for a response
-     *                   from the switch, before declaring failure 
+     *                  from the switch, before declaring failure
      * @return the list of openflow statistics
      */
     List<OFStatistics> queryStatistics(Long switchId,
@@ -97,4 +98,21 @@ public interface IOFStatisticsManager {
      */
     long getTransmitRate(Long switchId, Short port);
 
+    /**
+     * Returns the statistics for the specified switch table
+     *
+     * @param switchId the openflow datapath id
+     * @param tableId the openflow switch table id
+     * @return the list of openflow statistics
+     */
+    List<OFStatistics> getOFTableStatistics(Long switchId, Byte tableId);
+
+    /**
+     * Returns all the table statistics for the node specified
+     *
+     * @param switchId the openflow datapath id
+     * @return the list of openflow statistics
+     */
+    List<OFStatistics> getOFTableStatistics(Long switchId);
+
 }