From 7b7128de3a077f6eac714f113735212eb1790023 Mon Sep 17 00:00:00 2001 From: Katelyn Kasperowicz Date: Wed, 4 Dec 2013 17:20:47 -0800 Subject: [PATCH] Exposed maximumEntries for TableStatistics to sal Change-Id: Ib5fd0362e898f4bcaeda97416c1f048826e3e440 Signed-off-by: Katelyn Kasperowicz --- .../northbound/StatisticsNorthbound.java | 15 ++++++++++++--- .../internal/TableStatisticsConverter.java | 1 + .../sal/reader/NodeTableStatistics.java | 16 ++++++++++++++++ .../sal/reader/NodeTableStatisticsTest.java | 2 ++ 4 files changed, 31 insertions(+), 3 deletions(-) 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 05cb500273..5338849a62 100644 --- 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 @@ -844,7 +844,8 @@ public class StatisticsNorthbound { * }, * "activeCount": "11", * "lookupCount": "816", - * "matchedCount": "220" + * "matchedCount": "220", + * "maximumEntries": "1000" * }, * { * ...another table @@ -876,6 +877,7 @@ public class StatisticsNorthbound { * <activeCount>12</activeCount> * <lookupCount>10935</lookupCount> * <matchedCount>10084</matchedCount> + * <maximumEntries>1000</maximumEntries> * </tableStatistic> * <tableStatistic> * <nodeTable> @@ -888,6 +890,7 @@ public class StatisticsNorthbound { * <activeCount>0</activeCount> * <lookupCount>0</lookupCount> * <matchedCount>0</matchedCount> + * <maximumEntries>0</maximumEntries> * </tableStatistic> * <tableStatistic> * <nodeTable> @@ -900,6 +903,7 @@ public class StatisticsNorthbound { * <activeCount>0</activeCount> * <lookupCount>0</lookupCount> * <matchedCount>0</matchedCount> + * <maximumEntries>0</maximumEntries> * </tableStatistic> * </tableStatistics> * <tableStatistics> @@ -987,7 +991,8 @@ public class StatisticsNorthbound { * }, * "activeCount": "12", * "lookupCount": "11382", - * "matchedCount": "10524" + * "matchedCount": "10524", + * "maximumEntries": "1000" * }, * { * "nodeTable": { @@ -999,7 +1004,8 @@ public class StatisticsNorthbound { * }, * "activeCount": "0", * "lookupCount": "0", - * "matchedCount": "0" + * "matchedCount": "0", + * "maximumEntries": "0" * } * ] * } @@ -1022,6 +1028,7 @@ public class StatisticsNorthbound { * <activeCount>12</activeCount> * <lookupCount>10935</lookupCount> * <matchedCount>10084</matchedCount> + * <maximumEntries>1000</maximumEntries> * </tableStatistic> * <tableStatistic> * <nodeTable> @@ -1034,6 +1041,7 @@ public class StatisticsNorthbound { * <activeCount>0</activeCount> * <lookupCount>0</lookupCount> * <matchedCount>0</matchedCount> + * <maximumEntries>0</maximumEntries> * </tableStatistic> * <tableStatistic> * <nodeTable> @@ -1046,6 +1054,7 @@ public class StatisticsNorthbound { * <activeCount>0</activeCount> * <lookupCount>0</lookupCount> * <matchedCount>0</matchedCount> + * <maximumEntries>0</maximumEntries> * </tableStatistic> * </nodeTableStatistics> * diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java index bcc2445808..35a763869b 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TableStatisticsConverter.java @@ -54,6 +54,7 @@ public class TableStatisticsConverter { ntStat.setActiveCount(ofTableStat.getActiveCount()); ntStat.setLookupCount(ofTableStat.getLookupCount()); ntStat.setMatchedCount(ofTableStat.getMatchedCount()); + ntStat.setMaximumEntries(ofTableStat.getMaximumEntries()); this.ntStatsList.add(ntStat); } } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java index 7c404178cf..eb33ad6799 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/reader/NodeTableStatistics.java @@ -37,6 +37,8 @@ public class NodeTableStatistics implements Serializable { private long lookupCount; @XmlElement private long matchedCount; + @XmlElement + private int maximumEntries; @Override @@ -164,6 +166,20 @@ public class NodeTableStatistics implements Serializable { this.matchedCount = matchedCount; } + /** + * @return the maximumEntries + */ + public long getMaximumEntries() { + return maximumEntries; + } + + /** + * @param maximumEntries the maximumEntries to set + */ + public void setMaximumEntries(int maximumEntries) { + this.maximumEntries = maximumEntries; + } + @Override public String toString() { return "NodeTableStats[tableId = " + nodeTable diff --git a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java index c0d6bb698a..a29d4268da 100644 --- a/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java +++ b/opendaylight/sal/api/src/test/java/org/opendaylight/controller/sal/reader/NodeTableStatisticsTest.java @@ -24,12 +24,14 @@ public class NodeTableStatisticsTest { ntStats.setActiveCount(100); ntStats.setLookupCount(200); ntStats.setMatchedCount(500); + ntStats.setMaximumEntries(1000); ntStats.setName("Test"); Assert.assertTrue(ntStats.getNodeTable().equals(nt)); Assert.assertTrue(ntStats.getActiveCount() == 100); Assert.assertTrue(ntStats.getLookupCount() == 200); Assert.assertTrue(ntStats.getMatchedCount() == 500); + Assert.assertTrue(ntStats.getMaximumEntries() == 1000); Assert.assertTrue(ntStats.getName().equals("Test")); } } -- 2.36.6