mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-20 20:02:17 +02:00
Code Issues Projects Releases Wiki Activity

GUI - Adding display of attached hosts (in addition to showing egress links) in device details.

Browse Source 
Change-Id: I94f1489a0226de81dec7744eb26e64e3769034c1
This commit is contained in:
Thomas Vachuska 2016-07-05 12:21:38 -07:00 committed by Gerrit Code Review
parent 67fd1e6233
commit 018110c26a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
View File

@ -24,11 +24,13 @@ import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
import org.onosproject.net.Link;
import org.onosproject.net.Port;
import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.BasicDeviceConfig;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.host.HostService;
import org.onosproject.net.link.LinkService;
import org.onosproject.ui.RequestHandler;
import org.onosproject.ui.UiMessageHandler;
@ -230,7 +232,8 @@ public class DeviceViewMessageHandler extends UiMessageHandler {
port.put(ENABLED, p.isEnabled());
port.put(NAME, name != null ? name : "");
Set<Link> links = ls.getEgressLinks(new ConnectPoint(id, p.number()));
ConnectPoint connectPoint = new ConnectPoint(id, p.number());
Set<Link> links = ls.getEgressLinks(connectPoint);
if (!links.isEmpty()) {
StringBuilder egressLinks = new StringBuilder();
for (Link l : links) {
@ -239,6 +242,12 @@ public class DeviceViewMessageHandler extends UiMessageHandler {
.append(dest.port()).append(" ");
}
port.put(LINK_DEST, egressLinks.toString());
} else {
HostService hs = get(HostService.class);
Set<Host> hosts = hs.getConnectedHosts(connectPoint);
if (hosts != null && !hosts.isEmpty()) {
port.put(LINK_DEST, hosts.iterator().next().id().toString());
}
}
return port;