commit 58fe6dc46f982be17a9dca934a435b021bfd47d9
author alshabib <alshabibi.ali@gmail.com> Wed Aug 19 17:16:13 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Aug 20 16:21:08 2015 +0000
tree 465b5e259c6d33f2d4e6522ded1b580bf926bda2
parent bad538c7c43ed9e8c77efd93e3957ee5fec6e37a

fixes for Meter Service

Change-Id: I83d5b8a2e0a955c050f7afe96761d5709d4f9f18

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 a0c1dfc..4e75301 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
@@ -52,7 +52,7 @@
 /**
  * Provides implementation of the meter service APIs.
  */
-@Component(immediate = true)
+@Component(immediate = true, enabled = true)
 @Service
 public class MeterManager extends AbstractListenerProviderRegistry<MeterEvent, MeterListener,
         MeterProvider, MeterProviderService>
@@ -66,7 +66,7 @@
     protected StorageService storageService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    MeterStore store;
+    protected MeterStore store;
 
     private AtomicCounter meterIdCounter;
 
@@ -78,6 +78,8 @@
                 .withName(meterIdentifier)
                 .build();
 
+        store.setDelegate(delegate);
+
         onComplete = (op, result, error) ->
             {
                 op.context().ifPresent(c -> {
@@ -98,6 +100,7 @@
 
     @Deactivate
     public void deactivate() {
+        store.unsetDelegate(delegate);
         log.info("Stopped");
     }
 
@@ -136,6 +139,11 @@
     }
 
     @Override
+    public Collection<Meter> getAllMeters() {
+        return store.getAllMeters();
+    }
+
+    @Override
     public MeterId allocateMeterId() {
         // FIXME: This will break one day.
         return MeterId.meterId((int) meterIdCounter.getAndIncrement());