commit 018110c26a811aef2ca637f0f23bb8036ce04a03
author Thomas Vachuska <tom@onlab.us> Tue Jul 05 12:21:38 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 05 20:30:51 2016 +0000
tree a7eae05184e53a6be125001a5bbf6221dd72c932
parent 67fd1e6233d3b8e4ddb2ed3300c841ed153ba86e

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

Change-Id: I94f1489a0226de81dec7744eb26e64e3769034c1

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

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
index 2ddb3d2..56ab5ad 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
@@ -24,11 +24,13 @@
 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 @@
             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 @@
                             .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;