commit 5eb7939e20ac03127c75c8e73e248809fb6d3ec0
author alshabib <alshabibi.ali@gmail.com> Wed Aug 19 18:09:55 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Aug 20 16:30:39 2015 +0000
tree 2e05f2ff671601bda8d30b1904fea1e1c694cb4e
parent 7b1ef13662a65bc1c908a44f668301c3c92a5f4e

Added Meter object accounting

Change-Id: I2a3b88ffd1756b738e197943b3e02771f5729e45

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 4e75301..b48a25b 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
@@ -45,6 +45,8 @@
 import org.slf4j.Logger;
 
 import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -170,7 +172,25 @@
 
         @Override
         public void pushMeterMetrics(DeviceId deviceId, Collection<Meter> meterEntries) {
-            meterEntries.forEach(m -> store.updateMeterState(m));
+            //FIXME: FOLLOWING CODE CANNOT BE TESTED UNTIL SOMETHING THAT
+            //FIXME: IMPLEMENTS METERS EXISTS
+            Map<MeterId, Meter> storedMeterMap = store.getAllMeters().stream()
+                    .collect(Collectors.toMap(Meter::id, m -> m));
+
+            meterEntries.stream()
+                    .filter(m -> storedMeterMap.remove(m.id()) != null)
+                    .forEach(m -> store.updateMeterState(m));
+
+            storedMeterMap.values().stream().forEach(m -> {
+                if (m.state() == MeterState.PENDING_ADD) {
+                    provider().performMeterOperation(m.deviceId(),
+                                                     new MeterOperation(m,
+                                                                        MeterOperation.Type.ADD,
+                                                                        null));
+                } else {
+                    store.deleteMeterNow(m);
+                }
+            });
         }
     }