commit 3a46e48fd9d0fff3a0bc5d169025966b8021f633
author Pavlin Radoslavov <pavlin@onlab.us> Thu Nov 06 15:57:06 2014 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Thu Nov 06 15:57:06 2014 -0800
tree a54b35fb7188ad0d3bcdb375bc60eeaf50b6f51d
parent 0694af950bae42f6be7464c046d73857de3d91d3

Updated each of the metrics applications (Intent and Topology Metrics)
to register with the ONOS core services as an application.

Change-Id: If1d9eb3d79909d519673e751a9e047263efa1431

apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java

diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java
index 11ab99b..bffed2e 100644
--- a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java
+++ b/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java
@@ -29,6 +29,8 @@
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.metrics.EventMetric;
 import org.onlab.metrics.MetricsService;
+import org.onlab.onos.core.ApplicationId;
+import org.onlab.onos.core.CoreService;
 import org.onlab.onos.net.intent.IntentEvent;
 import org.onlab.onos.net.intent.IntentListener;
 import org.onlab.onos.net.intent.IntentService;
@@ -44,10 +46,16 @@
     private static final Logger log = getLogger(IntentMetrics.class);
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected CoreService coreService;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected IntentService intentService;
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MetricsService metricsService;
 
+    private ApplicationId appId;
+
     private LinkedList<IntentEvent> lastEvents = new LinkedList<>();
     private static final int LAST_EVENTS_MAX_N = 100;
 
@@ -74,10 +82,13 @@
 
     @Activate
     protected void activate() {
+        appId =
+            coreService.registerApplication("org.onlab.onos.metrics.intent");
+
         clear();
         registerMetrics();
         intentService.addListener(this);
-        log.info("ONOS Intent Metrics started.");
+        log.info("Started with Application ID {}", appId.id());
     }
 
     @Deactivate
@@ -85,7 +96,7 @@
         intentService.removeListener(this);
         removeMetrics();
         clear();
-        log.info("ONOS Intent Metrics stopped.");
+        log.info("Stopped");
     }
 
     @Override