From c3d86aee9be5e49aa1c9dc4d35d0dd485a974fc8 Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Thu, 30 Oct 2014 09:15:34 -0700 Subject: [PATCH] Added link port information to topology data. --- .../main/java/org/onlab/onos/gui/TopologyResource.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java index 4b2e93cb06..14795b2c10 100644 --- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java +++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java @@ -209,9 +209,13 @@ public class TopologyResource extends BaseResource { // Produces JSON for a link. private ObjectNode json(ObjectMapper mapper, AggLink aggLink) { Link link = aggLink.link; + ConnectPoint src = link.src(); + ConnectPoint dst = link.dst(); return mapper.createObjectNode() - .put("src", link.src().deviceId().toString()) - .put("dst", link.dst().deviceId().toString()) + .put("src", src.deviceId().toString()) + .put("srcPort", src.port().toString()) + .put("dst", dst.deviceId().toString()) + .put("dstPort", dst.port().toString()) .put("type", link.type().toString().toLowerCase()) .put("linkWidth", aggLink.links.size()); }