Merge "Fixed Group and meter id bugs"

[controller.git] / opendaylight / northbound / statistics / src / main / java / org / opendaylight / controller / statistics / northbound / StatisticsNorthbound.java
diff --git a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java b/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java

index a47bfa70b77e9fa2d0657529df2e676f8ab98f2a..5338849a62626ed740c6d930d72064efa1dca4d2 100644 (file)
--- a/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java
+++ b/opendaylight/northbound/statistics/src/main/java/org/opendaylight/controller/statistics/northbound/StatisticsNorthbound.java
@@ -114,7 +114,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/flow
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "flowStatistics": [
       *         {
@@ -171,7 +171,7 @@ public class StatisticsNorthbound {
       *     ]
       * }
       *
-     * Response in XML:
+     * Response body in XML:
       * &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       * &lt;list&gt;
       *     &lt;flowStatistics&gt;
@@ -287,7 +287,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/flow/node/OF/00:00:00:00:00:00:00:01
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "node": {
       *         "id":"00:00:00:00:00:00:00:01",
@@ -340,7 +340,7 @@ public class StatisticsNorthbound {
       *     ]
       * }
       *
-     * Response in XML:
+     * Response body in XML:
       * &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       *     &lt;nodeFlowStatistics&gt;
       *         &lt;node&gt;
@@ -474,7 +474,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/port
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "portStatistics": [
       *         {
@@ -544,7 +544,7 @@ public class StatisticsNorthbound {
       *     ]
       * }
       *
-     * Response in XML:
+     * Response body in XML:
       * &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       * &lt;list&gt;
       *     &lt;portStatistics&gt;
@@ -662,7 +662,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/port/node/OF/00:00:00:00:00:00:00:01
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "node": {
       *         "id":"00:00:00:00:00:00:00:01",
@@ -716,7 +716,7 @@ public class StatisticsNorthbound {
       *     ]
       * }
       *
-     * Response in XML:
+     * Response body in XML:
       * &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       * &lt;nodePortStatistics&gt;
       *     &lt;node&gt;
@@ -825,7 +825,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/table
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "tableStatistics": [
       *         {
@@ -844,7 +844,8 @@ public class StatisticsNorthbound {
       *                     },
       *                     "activeCount": "11",
       *                     "lookupCount": "816",
-     *                     "matchedCount": "220"
+     *                     "matchedCount": "220",
+     *                     "maximumEntries": "1000"
       *                 },
       *                 {
       *                     ...another table
@@ -857,7 +858,7 @@ public class StatisticsNorthbound {
       *     ]
       * }
       *
-     *  Response in XML:
+     *  Response body in XML:
       *  &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       *  &lt;list&gt;
       *  &lt;tableStatistics&gt;
@@ -876,6 +877,7 @@ public class StatisticsNorthbound {
       *          &lt;activeCount&gt;12&lt;/activeCount&gt;
       *          &lt;lookupCount&gt;10935&lt;/lookupCount&gt;
       *          &lt;matchedCount&gt;10084&lt;/matchedCount&gt;
+     *          &lt;maximumEntries&gt;1000&lt;/maximumEntries&gt;
       *      &lt;/tableStatistic&gt;
       *      &lt;tableStatistic&gt;
       *          &lt;nodeTable&gt;
@@ -888,6 +890,7 @@ public class StatisticsNorthbound {
       *          &lt;activeCount&gt;0&lt;/activeCount&gt;
       *          &lt;lookupCount&gt;0&lt;/lookupCount&gt;
       *          &lt;matchedCount&gt;0&lt;/matchedCount&gt;
+     *          &lt;maximumEntries&gt;0&lt;/maximumEntries&gt;
       *      &lt;/tableStatistic&gt;
       *      &lt;tableStatistic&gt;
       *          &lt;nodeTable&gt;
@@ -900,6 +903,7 @@ public class StatisticsNorthbound {
       *          &lt;activeCount&gt;0&lt;/activeCount&gt;
       *          &lt;lookupCount&gt;0&lt;/lookupCount&gt;
       *          &lt;matchedCount&gt;0&lt;/matchedCount&gt;
+     *          &lt;maximumEntries&gt;0&lt;/maximumEntries&gt;
       *      &lt;/tableStatistic&gt;
       *  &lt;/tableStatistics&gt;
       *  &lt;tableStatistics&gt;
@@ -970,7 +974,7 @@ public class StatisticsNorthbound {
       * Request URL:
       * http://localhost:8080/controller/nb/v2/statistics/default/table/node/OF/00:00:00:00:00:00:00:01
       *
-     * Response in JSON:
+     * Response body in JSON:
       * {
       *     "node": {
       *         "id":"00:00:00:00:00:00:00:01",
@@ -987,7 +991,8 @@ public class StatisticsNorthbound {
       *             },
       *             "activeCount": "12",
       *             "lookupCount": "11382",
-     *             "matchedCount": "10524"
+     *             "matchedCount": "10524",
+     *             "maximumEntries": "1000"
       *         },
       *         {
       *             "nodeTable": {
@@ -999,12 +1004,13 @@ public class StatisticsNorthbound {
       *             },
       *             "activeCount": "0",
       *             "lookupCount": "0",
-     *             "matchedCount": "0"
+     *             "matchedCount": "0",
+     *             "maximumEntries": "0"
       *         }
       *    ]
       * }
       *
-     * Response in XML:
+     * Response body in XML:
       * &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;yes&quot;?&gt;
       * &lt;nodeTableStatistics&gt;
       *     &lt;node&gt;
@@ -1022,6 +1028,7 @@ public class StatisticsNorthbound {
       *         &lt;activeCount&gt;12&lt;/activeCount&gt;
       *         &lt;lookupCount&gt;10935&lt;/lookupCount&gt;
       *         &lt;matchedCount&gt;10084&lt;/matchedCount&gt;
+     *         &lt;maximumEntries&gt;1000&lt;/maximumEntries&gt;
       *     &lt;/tableStatistic&gt;
       *     &lt;tableStatistic&gt;
       *         &lt;nodeTable&gt;
@@ -1034,6 +1041,7 @@ public class StatisticsNorthbound {
       *         &lt;activeCount&gt;0&lt;/activeCount&gt;
       *         &lt;lookupCount&gt;0&lt;/lookupCount&gt;
       *         &lt;matchedCount&gt;0&lt;/matchedCount&gt;
+     *         &lt;maximumEntries&gt;0&lt;/maximumEntries&gt;
       *     &lt;/tableStatistic&gt;
       *     &lt;tableStatistic&gt;
       *         &lt;nodeTable&gt;
@@ -1046,6 +1054,7 @@ public class StatisticsNorthbound {
       *         &lt;activeCount&gt;0&lt;/activeCount&gt;
       *         &lt;lookupCount&gt;0&lt;/lookupCount&gt;
       *         &lt;matchedCount&gt;0&lt;/matchedCount&gt;
+     *         &lt;maximumEntries&gt;0&lt;/maximumEntries&gt;
       *     &lt;/tableStatistic&gt;
       * &lt;/nodeTableStatistics&gt;
       *