Merge "Add constraint to avoid specified devices"
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
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.java b/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.java
index fcd9f81..fa05dab 100644
--- a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.java
+++ b/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.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.event.Event;
import org.onlab.onos.net.device.DeviceEvent;
import org.onlab.onos.net.device.DeviceListener;
@@ -53,16 +55,25 @@
private static final Logger log = getLogger(TopologyMetrics.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected DeviceService deviceService;
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected HostService hostService;
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected LinkService linkService;
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected TopologyService topologyService;
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected MetricsService metricsService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected TopologyService topologyService;
+
+ private ApplicationId appId;
+
private LinkedList<Event> lastEvents = new LinkedList<>();
private static final int LAST_EVENTS_MAX_N = 100;
@@ -94,6 +105,9 @@
@Activate
protected void activate() {
+ appId =
+ coreService.registerApplication("org.onlab.onos.metrics.topology");
+
clear();
registerMetrics();
@@ -103,7 +117,7 @@
linkService.addListener(linkListener);
topologyService.addListener(topologyListener);
- log.info("ONOS Topology Metrics started.");
+ log.info("Started with Application ID {}", appId.id());
}
@Deactivate
@@ -116,7 +130,7 @@
removeMetrics();
clear();
- log.info("ONOS Topology Metrics stopped.");
+ log.info("Stopped");
}
@Override
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java b/core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java
index 3fbcbfe..0e8689c 100644
--- a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java
@@ -41,15 +41,15 @@
*/
public class WaypointConstraintTest {
- public static final DeviceId DID1 = deviceId("of:1");
- public static final DeviceId DID2 = deviceId("of:2");
- public static final DeviceId DID3 = deviceId("of:3");
- public static final DeviceId DID4 = deviceId("of:4");
- public static final PortNumber PN1 = PortNumber.portNumber(1);
- public static final PortNumber PN2 = PortNumber.portNumber(2);
- public static final PortNumber PN3 = PortNumber.portNumber(3);
- public static final PortNumber PN4 = PortNumber.portNumber(4);
- public static final ProviderId PROVIDER_ID = new ProviderId("of", "foo");
+ private static final DeviceId DID1 = deviceId("of:1");
+ private static final DeviceId DID2 = deviceId("of:2");
+ private static final DeviceId DID3 = deviceId("of:3");
+ private static final DeviceId DID4 = deviceId("of:4");
+ private static final PortNumber PN1 = PortNumber.portNumber(1);
+ private static final PortNumber PN2 = PortNumber.portNumber(2);
+ private static final PortNumber PN3 = PortNumber.portNumber(3);
+ private static final PortNumber PN4 = PortNumber.portNumber(4);
+ private static final ProviderId PROVIDER_ID = new ProviderId("of", "foo");
private WaypointConstraint sut;
private LinkResourceService linkResourceService;