Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

@@ -209,9 +209,13 @@ public class TopologyResource extends BaseResource {
     // Produces JSON for a link.
     // Produces JSON for a link.
     private ObjectNode json(ObjectMapper mapper, AggLink aggLink) {
     private ObjectNode json(ObjectMapper mapper, AggLink aggLink) {
         Link link = aggLink.link;
         Link link = aggLink.link;
+        ConnectPoint src = link.src();
+        ConnectPoint dst = link.dst();
         return mapper.createObjectNode()
         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("type", link.type().toString().toLowerCase())
                 .put("linkWidth", aggLink.links.size());
                 .put("linkWidth", aggLink.links.size());
     }
     }

@@ -28,73 +28,73 @@
 
 
     // configuration data
     // configuration data
     var config = {
     var config = {
-            debugOn: false,
-            debug: {
-                showNodeXY: false,
-                showKeyHandler: true
+        debugOn: false,
+        debug: {
+            showNodeXY: false,
+            showKeyHandler: true
+        },
+        options: {
+            layering: true,
+            collisionPrevention: true
+        },
+        jsonUrl: 'rs/topology/graph',
+        jsonPrefix: '',
+        XjsonUrl: 'json/network.json',
+        XjsonPrefix: 'json/',
+        iconUrl: {
+            device: 'img/device.png',
+            host: 'img/host.png',
+            pkt: 'img/pkt.png',
+            opt: 'img/opt.png'
+        },
+        mastHeight: 36,
+        force: {
+            note: 'node.class or link.class is used to differentiate',
+            linkDistance: {
+                infra: 200,
+                host: 40
             },
             },
-            options: {
-                layering: true,
-                collisionPrevention: true
+            linkStrength: {
+                infra: 1.0,
+                host: 1.0
             },
             },
-            jsonUrl: 'rs/topology/graph',
-            jsonPrefix: '',
-            XjsonUrl: 'json/network.json',
-            XjsonPrefix: 'json/',
-            iconUrl: {
-                device: 'img/device.png',
-                host: 'img/host.png',
-                pkt: 'img/pkt.png',
-                opt: 'img/opt.png'
+            charge: {
+                device: -800,
+                host: -1000
             },
             },
-            mastHeight: 36,
-            force: {
-                note: 'node.class or link.class is used to differentiate',
-                linkDistance: {
-                    infra: 200,
-                    host: 40
-                },
-                linkStrength: {
-                    infra: 1.0,
-                    host: 1.0
-                },
-                charge: {
-                    device: -800,
-                    host: -1000
-                },
-                ticksWithoutCollisions: 50,
-                marginLR: 20,
-                marginTB: 20,
-                translate: function() {
-                    return 'translate(' +
-                        config.force.marginLR + ',' +
-                        config.force.marginTB + ')';
-                }
-            },
-            labels: {
-                imgPad: 16,
-                padLR: 8,
-                padTB: 6,
-                marginLR: 3,
-                marginTB: 2
-            },
-            icons: {
-                w: 32,
-                h: 32,
-                xoff: -12,
-                yoff: -8
-            },
-            constraints: {
-                ypos: {
-                    host: 0.05,
-                    switch: 0.3,
-                    roadm: 0.7
-                }
-            },
-            hostLinkWidth: 1.0,
-            hostRadius: 7,
-            mouseOutTimerDelayMs: 120
-        };
+            ticksWithoutCollisions: 50,
+            marginLR: 20,
+            marginTB: 20,
+            translate: function() {
+                return 'translate(' +
+                    config.force.marginLR + ',' +
+                    config.force.marginTB + ')';
+            }
+        },
+        labels: {
+            imgPad: 16,
+            padLR: 8,
+            padTB: 6,
+            marginLR: 3,
+            marginTB: 2
+        },
+        icons: {
+            w: 32,
+            h: 32,
+            xoff: -12,
+            yoff: -8
+        },
+        constraints: {
+            ypos: {
+                host: 0.05,
+                switch: 0.3,
+                roadm: 0.7
+            }
+        },
+        hostLinkWidth: 1.0,
+        hostRadius: 7,
+        mouseOutTimerDelayMs: 120
+    };
 
 
     // state variables
     // state variables
     var view = {},
     var view = {},