Experimenting.
diff --git a/cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java b/cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java
index 592b737..b3e03b3 100644
--- a/cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java
@@ -7,6 +7,7 @@
import org.onlab.onos.net.host.HostService;
import org.onlab.onos.net.intent.IntentService;
import org.onlab.onos.net.link.LinkService;
+import org.onlab.onos.net.topology.Topology;
import org.onlab.onos.net.topology.TopologyService;
/**
@@ -19,12 +20,14 @@
@Override
protected void execute() {
TopologyService topologyService = get(TopologyService.class);
- print("nodes=%d, devices=%d, links=%d, hosts=%d, clusters=%s, flows=%d, intents=%d",
+ Topology topology = topologyService.currentTopology();
+ print("nodes=%d, devices=%d, links=%d, hosts=%d, clusters=%s, paths=%d, flows=%d, intents=%d",
get(ClusterService.class).getNodes().size(),
get(DeviceService.class).getDeviceCount(),
get(LinkService.class).getLinkCount(),
get(HostService.class).getHostCount(),
- topologyService.getClusters(topologyService.currentTopology()).size(),
+ topologyService.getClusters(topology).size(),
+ topology.pathCount(),
get(FlowRuleService.class).getFlowRuleCount(),
get(IntentService.class).getIntentCount());
}
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/FlowTracker.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/FlowTracker.java
index 8f4a5c7..f69bf78 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/FlowTracker.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/FlowTracker.java
@@ -115,12 +115,7 @@
for (Event reason : event.reasons()) {
if (reason instanceof LinkEvent) {
LinkEvent linkEvent = (LinkEvent) reason;
- if (linkEvent.type() == LinkEvent.Type.LINK_ADDED ||
- linkEvent.type() == LinkEvent.Type.LINK_UPDATED) {
- delegate.bumpIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
- } else if (linkEvent.type() == LinkEvent.Type.LINK_REMOVED) {
- delegate.failIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
- }
+ delegate.bumpIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
}
}
}
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
index ebcb789..6268245 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
@@ -359,13 +359,5 @@
}
}
- @Override
- public void failIntents(Iterable<IntentId> intentIds) {
- for (IntentId intentId : intentIds) {
- Intent intent = getIntent(intentId);
- uninstallIntent(intent);
- compileIntent(intent);
- }
- }
}
}
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java
index 8c39c75..d8a5a95 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java
@@ -15,12 +15,4 @@
*/
void bumpIntents(Iterable<IntentId> intentIds);
- /**
- * Notifies that topology has changed in such a way that the specified
- * intents should be marked failed and then recompiled.
- *
- * @param intentIds intents that should be failed and recompiled
- */
- void failIntents(Iterable<IntentId> intentIds);
-
}