홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
3a46e48f 1 parent 0694af95

Updated each of the metrics applications (Intent and Topology Metrics) 

to register with the ONOS core services as an application.

Change-Id: If1d9eb3d79909d519673e751a9e047263efa1431
Inline Side-by-side
Showing 2 changed files with 31 additions and 6 deletions
...@@ -29,6 +29,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -29,6 +29,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
29 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 import org.onlab.metrics.EventMetric; 30 import org.onlab.metrics.EventMetric;
31 import org.onlab.metrics.MetricsService; 31 import org.onlab.metrics.MetricsService;
32 +import org.onlab.onos.core.ApplicationId;
33 +import org.onlab.onos.core.CoreService;
32 import org.onlab.onos.net.intent.IntentEvent; 34 import org.onlab.onos.net.intent.IntentEvent;
33 import org.onlab.onos.net.intent.IntentListener; 35 import org.onlab.onos.net.intent.IntentListener;
34 import org.onlab.onos.net.intent.IntentService; 36 import org.onlab.onos.net.intent.IntentService;
...@@ -44,10 +46,16 @@ public class IntentMetrics implements IntentMetricsService, ...@@ -44,10 +46,16 @@ public class IntentMetrics implements IntentMetricsService,
44 private static final Logger log = getLogger(IntentMetrics.class); 46 private static final Logger log = getLogger(IntentMetrics.class);
45 47
46 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 48 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
49 + protected CoreService coreService;
50 +
51 + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
47 protected IntentService intentService; 52 protected IntentService intentService;
53 +
48 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 54 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
49 protected MetricsService metricsService; 55 protected MetricsService metricsService;
50 56
57 + private ApplicationId appId;
58 +
51 private LinkedList<IntentEvent> lastEvents = new LinkedList<>(); 59 private LinkedList<IntentEvent> lastEvents = new LinkedList<>();
52 private static final int LAST_EVENTS_MAX_N = 100; 60 private static final int LAST_EVENTS_MAX_N = 100;
53 61
...@@ -74,10 +82,13 @@ public class IntentMetrics implements IntentMetricsService, ...@@ -74,10 +82,13 @@ public class IntentMetrics implements IntentMetricsService,
74 82
75 @Activate 83 @Activate
76 protected void activate() { 84 protected void activate() {
85 + appId =
86 + coreService.registerApplication("org.onlab.onos.metrics.intent");
87 +
77 clear(); 88 clear();
78 registerMetrics(); 89 registerMetrics();
79 intentService.addListener(this); 90 intentService.addListener(this);
80 - log.info("ONOS Intent Metrics started."); 91 + log.info("Started with Application ID {}", appId.id());
81 } 92 }
82 93
83 @Deactivate 94 @Deactivate
...@@ -85,7 +96,7 @@ public class IntentMetrics implements IntentMetricsService, ...@@ -85,7 +96,7 @@ public class IntentMetrics implements IntentMetricsService,
85 intentService.removeListener(this); 96 intentService.removeListener(this);
86 removeMetrics(); 97 removeMetrics();
87 clear(); 98 clear();
88 - log.info("ONOS Intent Metrics stopped."); 99 + log.info("Stopped");
89 } 100 }
90 101
91 @Override 102 @Override
......
...@@ -29,6 +29,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -29,6 +29,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
29 import org.apache.felix.scr.annotations.Service; 29 import org.apache.felix.scr.annotations.Service;
30 import org.onlab.metrics.EventMetric; 30 import org.onlab.metrics.EventMetric;
31 import org.onlab.metrics.MetricsService; 31 import org.onlab.metrics.MetricsService;
32 +import org.onlab.onos.core.ApplicationId;
33 +import org.onlab.onos.core.CoreService;
32 import org.onlab.onos.event.Event; 34 import org.onlab.onos.event.Event;
33 import org.onlab.onos.net.device.DeviceEvent; 35 import org.onlab.onos.net.device.DeviceEvent;
34 import org.onlab.onos.net.device.DeviceListener; 36 import org.onlab.onos.net.device.DeviceListener;
...@@ -53,16 +55,25 @@ public class TopologyMetrics implements TopologyMetricsService { ...@@ -53,16 +55,25 @@ public class TopologyMetrics implements TopologyMetricsService {
53 private static final Logger log = getLogger(TopologyMetrics.class); 55 private static final Logger log = getLogger(TopologyMetrics.class);
54 56
55 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 57 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
58 + protected CoreService coreService;
59 +
60 + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
56 protected DeviceService deviceService; 61 protected DeviceService deviceService;
62 +
57 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 63 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
58 protected HostService hostService; 64 protected HostService hostService;
65 +
59 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 66 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
60 protected LinkService linkService; 67 protected LinkService linkService;
61 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 68 +
62 - protected TopologyService topologyService;
63 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 69 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
64 protected MetricsService metricsService; 70 protected MetricsService metricsService;
65 71
72 + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
73 + protected TopologyService topologyService;
74 +
75 + private ApplicationId appId;
76 +
66 private LinkedList<Event> lastEvents = new LinkedList<>(); 77 private LinkedList<Event> lastEvents = new LinkedList<>();
67 private static final int LAST_EVENTS_MAX_N = 100; 78 private static final int LAST_EVENTS_MAX_N = 100;
68 79
...@@ -94,6 +105,9 @@ public class TopologyMetrics implements TopologyMetricsService { ...@@ -94,6 +105,9 @@ public class TopologyMetrics implements TopologyMetricsService {
94 105
95 @Activate 106 @Activate
96 protected void activate() { 107 protected void activate() {
108 + appId =
109 + coreService.registerApplication("org.onlab.onos.metrics.topology");
110 +
97 clear(); 111 clear();
98 registerMetrics(); 112 registerMetrics();
99 113
...@@ -103,7 +117,7 @@ public class TopologyMetrics implements TopologyMetricsService { ...@@ -103,7 +117,7 @@ public class TopologyMetrics implements TopologyMetricsService {
103 linkService.addListener(linkListener); 117 linkService.addListener(linkListener);
104 topologyService.addListener(topologyListener); 118 topologyService.addListener(topologyListener);
105 119
106 - log.info("ONOS Topology Metrics started."); 120 + log.info("Started with Application ID {}", appId.id());
107 } 121 }
108 122
109 @Deactivate 123 @Deactivate
...@@ -116,7 +130,7 @@ public class TopologyMetrics implements TopologyMetricsService { ...@@ -116,7 +130,7 @@ public class TopologyMetrics implements TopologyMetricsService {
116 130
117 removeMetrics(); 131 removeMetrics();
118 clear(); 132 clear();
119 - log.info("ONOS Topology Metrics stopped."); 133 + log.info("Stopped");
120 } 134 }
121 135
122 @Override 136 @Override
......