ONOS-2186 - GUI Topo Overlay - (WIP)
- added devicesWithHover(), hostsWithHover(), hovered() to NodeSelection.
- wrote unit tests for NodeSelection.
Change-Id: I6dca0f4f0a4ce2412438c8411102034969ef4343
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java b/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
index 39beb0b..45e0a6c 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
@@ -186,7 +186,7 @@
switch (mode) {
case DEV_LINK_FLOWS:
// only care about devices (not hosts)
- if (selectedNodes.devices().isEmpty()) {
+ if (selectedNodes.devicesWithHover().isEmpty()) {
sendClearAll();
} else {
scheduleTask();
@@ -371,11 +371,11 @@
private Highlights deviceLinkFlows() {
Highlights highlights = new Highlights();
- if (selectedNodes != null && !selectedNodes.devices().isEmpty()) {
+ if (selectedNodes != null && !selectedNodes.devicesWithHover().isEmpty()) {
// capture flow counts on bilinks
TrafficLinkMap linkMap = new TrafficLinkMap();
- for (Device device : selectedNodes.devices()) {
+ for (Device device : selectedNodes.devicesWithHover()) {
Map<Link, Integer> counts = getLinkFlowCounts(device.id());
for (Link link : counts.keySet()) {
TrafficLink tlink = linkMap.add(link);
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
index 01ae93d..151e613 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
@@ -50,7 +50,7 @@
*/
public IntentSelection(NodeSelection nodes, TopoIntentFilter filter) {
this.nodes = nodes;
- intents = filter.findPathIntents(nodes.hosts(), nodes.devices());
+ intents = filter.findPathIntents(nodes.hostsWithHover(), nodes.devicesWithHover());
if (intents.size() == 1) {
index = 0; // pre-select a single intent
}