commit 21daebff4bcd14bcf13d77d8f8f91b52d4a4f151
author Jordi Ortiz <jordi.ortiz@um.es> Tue Dec 27 18:50:14 2016 +0100
committer Pier Luigi <pierventre@hotmail.com> Tue Jan 24 13:01:43 2017 -0800
tree 4d0bc051591ea07a0aed991dfc11a7e1b666a5c5
parent aa8de497656fa7ab4186b0fe2e0fb7af70361401

MeterManager, check max meters before requesting a new meter

Change-Id: I5a5d55ede89bee46c6442b885fe64f231a14e165

incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java

diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
index 37251f6..db5cff0 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
@@ -30,6 +30,7 @@
 import org.onosproject.net.meter.MeterEvent;
 import org.onosproject.net.meter.MeterFailReason;
 import org.onosproject.net.meter.MeterFeatures;
+import org.onosproject.net.meter.MeterFeaturesKey;
 import org.onosproject.net.meter.MeterId;
 import org.onosproject.net.meter.MeterKey;
 import org.onosproject.net.meter.MeterListener;
@@ -173,14 +174,26 @@
     }
 
     private MeterId allocateMeterId(DeviceId deviceId) {
+        long maxMeters = store.getMaxMeters(MeterFeaturesKey.key(deviceId));
+
+        if (maxMeters == 0L) {
+            throw new IllegalStateException("Meters not supported by device " + deviceId);
+        }
+
+        final long mmeters = maxMeters;
         long id = meterIdCounters.compute(deviceId, (k, v) -> {
             if (v == null) {
                 return allocateCounter(k);
             }
+            if (v.get() >= mmeters) {
+                throw new IllegalStateException("Maximum number of meters " +
+                        meterIdCounters.get(deviceId).get() +
+                        " reached for device " + deviceId);
+            }
             return v;
         }).incrementAndGet();
 
-        return MeterId.meterId((int) id);
+        return MeterId.meterId(id);
     }
 
     private AtomicCounter allocateCounter(DeviceId deviceId) {