Adding enhancements to the GUI server-side.

Fixing a few intent-related glitches for the optical use-case. Fixing lat/lng information in the optical config. Change-Id: I6a1dd1ee69c2db2f0e351d191627bba468a3c49c

Adding enhancements to the GUI server-side.
Fixing a few intent-related glitches for the optical use-case. Fixing lat/lng information in the optical config. Change-Id: I6a1dd1ee69c2db2f0e351d191627bba468a3c49c
Thomas Vachuska · Gerrit Code Review
Commit dea45ff7da521f74488af69144113781075ed441 dea45ff7 1 parent aa7e7dea
Showing 10 changed files with 132 additions and 48 deletions
cli/src/main/java/org/onlab/onos/cli/net/AddHostToHostIntentCommand.java
cli/src/main/java/org/onlab/onos/cli/net/ConnectivityIntentCommand.java
core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java
tools/test/topos/oe-linear-3.json
tools/test/topos/oe-nonlinear-10.json
tools/test/topos/oe-nonlinear-4.json
web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
web/gui/src/main/java/org/onlab/onos/gui/TopologyMessages.java
web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
web/gui/src/main/webapp/topo2.js
--- a/cli/src/main/java/org/onlab/onos/cli/net/AddHostToHostIntentCommand.java
View file @dea45ff
+++ b/cli/src/main/java/org/onlab/onos/cli/net/AddHostToHostIntentCommand.java
View file @dea45ff
@@ -15,8 +15,6 @@
  */
 package org.onlab.onos.cli.net;
-import java.util.List;
-
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.onos.net.HostId;
@@ -28,6 +26,8 @@ import org.onlab.onos.net.intent.Constraint;
 import org.onlab.onos.net.intent.HostToHostIntent;
 import org.onlab.onos.net.intent.IntentService;
+import java.util.List;
+
 /**
  * Installs host-to-host connectivity intent.
  */
--- a/cli/src/main/java/org/onlab/onos/cli/net/ConnectivityIntentCommand.java
View file @dea45ff
+++ b/cli/src/main/java/org/onlab/onos/cli/net/ConnectivityIntentCommand.java
View file @dea45ff
@@ -20,11 +20,13 @@ import java.util.List;
 import org.apache.karaf.shell.commands.Option;
 import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.net.Link;
 import org.onlab.onos.net.flow.DefaultTrafficSelector;
 import org.onlab.onos.net.flow.TrafficSelector;
 import org.onlab.onos.net.intent.Constraint;
 import org.onlab.onos.net.intent.constraint.BandwidthConstraint;
 import org.onlab.onos.net.intent.constraint.LambdaConstraint;
+import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
 import org.onlab.onos.net.resource.Bandwidth;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IpPrefix;
@@ -142,6 +144,7 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand {
         if (lambda) {
             constraints.add(new LambdaConstraint(null));
         }
+        constraints.add(new LinkTypeConstraint(lambda, Link.Type.OPTICAL));
         return constraints;
     }
--- a/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java
View file @dea45ff
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java
View file @dea45ff
@@ -16,12 +16,14 @@
 package org.onlab.onos.net.intent;
 import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
 import org.onlab.onos.core.ApplicationId;
 import org.onlab.onos.net.HostId;
+import org.onlab.onos.net.Link;
 import org.onlab.onos.net.flow.TrafficSelector;
 import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
-import java.util.Collections;
 import java.util.List;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -47,7 +49,8 @@ public final class HostToHostIntent extends ConnectivityIntent {
     public HostToHostIntent(ApplicationId appId, HostId one, HostId two,
                             TrafficSelector selector,
                             TrafficTreatment treatment) {
-        this(appId, one, two, selector, treatment, Collections.emptyList());
+        this(appId, one, two, selector, treatment,
+             ImmutableList.of(new LinkTypeConstraint(false, Link.Type.OPTICAL)));
     }
     /**
--- a/tools/test/topos/oe-linear-3.json
View file @dea45ff
+++ b/tools/test/topos/oe-linear-3.json
View file @dea45ff
@@ -3,32 +3,32 @@
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1",
-            "annotations": { "latitude": 37.6, "longitude": 122.3, "optical.regens": 0 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2",
-            "annotations": { "latitude": 37.3, "longitude": 121.9, "optical.regens": 0 },
+            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
             "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3",
-            "annotations": { "latitude": 33.9, "longitude": 118.4, "optical.regens": 2 },
+            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
-            "annotations": { "latitude": 37.6, "longitude": 122.3 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2",
-            "annotations": { "latitude": 37.3, "longitude": 121.9 },
+            "annotations": { "latitude": 37.3, "longitude": -121.9 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
     ],
--- a/tools/test/topos/oe-nonlinear-10.json
View file @dea45ff
+++ b/tools/test/topos/oe-nonlinear-10.json
View file @dea45ff
@@ -3,7 +3,7 @@
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SFO-W10",
-            "annotations": { "latitude": 37.6, "longitude": 122.3, "optical.regens": 0 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed":100000, "type": "FIBER" } ]
@@ -11,7 +11,7 @@
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SJC-W10",
-            "annotations": { "latitude": 37.3, "longitude": 121.9, "optical.regens": 0 },
+            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
             "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" },
             { "port": 30, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" } ]
@@ -19,7 +19,7 @@
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "LAX-W10",
-            "annotations": { "latitude": 33.9, "longitude": 118.4, "optical.regens": 0 },
+            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" } ]
@@ -27,7 +27,7 @@
         {
             "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SDG-W10",
-            "annotations": { "latitude": 32.8, "longitude": 117.1, "optical.regens": 3 },
+            "annotations": { "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 },
             "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
             { "port":50, "speed": 0, "type": "FIBER" },
              { "port":20, "speed": 0, "type": "FIBER" }]
@@ -35,7 +35,7 @@
         {
             "uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "MSP-M10",
-            "annotations": { "latitude": 44.8, "longitude": 93.1, "optical.regens": 3 },
+            "annotations": { "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 },
             "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
              { "port": 40, "speed": 0, "type": "FIBER" },
@@ -44,7 +44,7 @@
         {
             "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "DFW-M10",
-            "annotations": { "latitude": 32.8, "longitude": 97.1, "optical.regens": 3 },
+            "annotations": { "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
@@ -54,7 +54,7 @@
         {
             "uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "CHG-N10",
-            "annotations": { "latitude": 41.8, "longitude": 120.1, "optical.regens": 3 },
+            "annotations": { "latitude": 41.8, "longitude": -120.1, "optical.regens": 3 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
@@ -63,7 +63,7 @@
         {
             "uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "IAD-M10",
-            "annotations": { "latitude": 38.8, "longitude": 77.1, "optical.regens": 3 },
+            "annotations": { "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 },
             "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
              { "port": 30, "speed": 0, "type": "FIBER" },
              { "port": 50, "speed": 0, "type": "FIBER" }]
@@ -71,7 +71,7 @@
         {
             "uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "JFK-M10",
-            "annotations": { "latitude": 40.8, "longitude": 73.1, "optical.regens": 0 },
+            "annotations": { "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" }]
@@ -79,7 +79,7 @@
         {
             "uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ATL-S10",
-            "annotations": { "latitude": 33.8, "longitude": 84.1, "optical.regens": 0 },
+            "annotations": { "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 },
             "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
             { "port": 20, "speed": 0, "type": "FIBER" },
             { "port": 50, "speed": 0, "type": "FIBER" }]
@@ -87,37 +87,37 @@
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SFO-R10",
-            "annotations": { "latitude": 37.6, "longitude": 122.3 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0003", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "LAX-R10",
-            "annotations": { "latitude": 33.9, "longitude": 118.4 },
+            "annotations": { "latitude": 33.9, "longitude": -118.4 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0003", "mac": "ffffffffff0004", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SDG-R10",
-            "annotations": { "latitude": 32.8, "longitude": 117.1 },
+            "annotations": { "latitude": 32.8, "longitude": -117.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0004", "mac": "ffffffffff0007", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "CHG-R10",
-            "annotations": { "latitude": 41.8, "longitude": 120.1 },
+            "annotations": { "latitude": 41.8, "longitude": -120.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0005", "mac": "ffffffffff0009", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "JFK-R10",
-            "annotations": { "latitude": 40.8, "longitude": 73.1 },
+            "annotations": { "latitude": 40.8, "longitude": -73.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0006", "mac": "ffffffffff000A", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ATL-R10",
-            "annotations": { "latitude": 33.8, "longitude": 84.1 },
+            "annotations": { "latitude": 33.8, "longitude": -84.1 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
--- a/tools/test/topos/oe-nonlinear-4.json
View file @dea45ff
+++ b/tools/test/topos/oe-nonlinear-4.json
View file @dea45ff
@@ -3,37 +3,37 @@
         {
             "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1",
-            "annotations": { "latitude": 37.6, "longitude": 122.3, "optical.regens": 0 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
-            "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" }]
+            "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2",
-            "annotations": { "latitude": 37.3, "longitude": 121.9, "optical.regens": 0 },
+            "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
-            "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" }]
+            "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3",
-            "annotations": { "latitude": 33.9, "longitude": 118.4, "optical.regens": 2 },
+            "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
-            "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" }]
+            "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
-	{
+        {
             "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type":"ROADM",
             "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM4",
-            "annotations": { "latitude": 39.9, "longitude": 119.4, "optical.regens": 2 },
+            "annotations": { "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 },
-            "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" }]
+            "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1",
-            "annotations": { "latitude": 37.6, "longitude": 122.3 },
+            "annotations": { "latitude": 37.6, "longitude": -122.3 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         },
         {
             "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
             "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2",
-            "annotations": { "latitude": 37.3, "longitude": 121.9 },
+            "annotations": { "latitude": 37.3, "longitude": -121.9 },
             "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
         }
     ],
@@ -49,3 +49,4 @@
     ]
 }
+
--- a/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
View file @dea45ff
+++ b/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
View file @dea45ff
@@ -21,6 +21,8 @@ import org.onlab.onos.net.device.DeviceProviderRegistry;
 import org.onlab.onos.net.host.HostProviderRegistry;
 import org.onlab.onos.net.link.LinkProviderRegistry;
 import org.onlab.rest.BaseResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -31,6 +33,8 @@ import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
+import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+
 /**
  * Resource that acts as an ancillary provider for uploading pre-configured
  * devices, ports and links.
@@ -38,17 +42,24 @@ import java.io.InputStream;
 @Path("config")
 public class ConfigResource extends BaseResource {
+    private static Logger log = LoggerFactory.getLogger(ConfigResource.class);
+
     @POST
     @Path("topology")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public Response topology(InputStream input) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
+        try {
-        JsonNode cfg = mapper.readTree(input);
+            ObjectMapper mapper = new ObjectMapper();
-        new ConfigProvider(cfg, get(DeviceProviderRegistry.class),
+            JsonNode cfg = mapper.readTree(input);
-                           get(LinkProviderRegistry.class),
+            new ConfigProvider(cfg, get(DeviceProviderRegistry.class),
-                           get(HostProviderRegistry.class)).parse();
+                               get(LinkProviderRegistry.class),
-        return Response.ok(mapper.createObjectNode().toString()).build();
+                               get(HostProviderRegistry.class)).parse();
+            return Response.ok(mapper.createObjectNode().toString()).build();
+        } catch (Exception e) {
+            log.error("Unable to parse topology configuration", e);
+            return Response.status(INTERNAL_SERVER_ERROR).entity(e.toString()).build();
+        }
     }
 }
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyMessages.java
View file @dea45ff
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyMessages.java
View file @dea45ff
@@ -40,7 +40,12 @@ import org.onlab.onos.net.device.DeviceEvent;
 import org.onlab.onos.net.device.DeviceService;
 import org.onlab.onos.net.host.HostEvent;
 import org.onlab.onos.net.host.HostService;
+import org.onlab.onos.net.intent.ConnectivityIntent;
+import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.intent.IntentState;
+import org.onlab.onos.net.intent.LinkCollectionIntent;
+import org.onlab.onos.net.intent.PathIntent;
 import org.onlab.onos.net.link.LinkEvent;
 import org.onlab.onos.net.link.LinkService;
 import org.onlab.onos.net.provider.ProviderId;
@@ -50,6 +55,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -350,7 +356,7 @@ public abstract class TopologyMessages {
                              new Prop("Longitude", annot.value("longitude"))));
     }
-    // Produces a path message to the client.
+    // Produces a path payload to the client.
     protected ObjectNode pathMessage(Path path, String type) {
         ObjectNode payload = mapper.createObjectNode();
         ArrayNode links = mapper.createArrayNode();
@@ -362,6 +368,50 @@ public abstract class TopologyMessages {
         return payload;
     }
+
+    // Produces JSON message to trigger traffic visualization
+    protected ObjectNode trafficMessage(Set<Intent> intents, long sid) {
+        ObjectNode payload = mapper.createObjectNode();
+        ArrayNode paths = mapper.createArrayNode();
+        payload.set("paths", paths);
+
+        for (Intent intent : intents) {
+            List<Intent> installables = intentService.getInstallableIntents(intent.id());
+            IntentState state = intentService.getIntentState(intent.id());
+            String type = state == IntentState.FAILED ? "inactive" : "active";
+            for (Intent installable : installables) {
+                if (installable instanceof ConnectivityIntent) {
+                    addPathTraffic(paths, type, (ConnectivityIntent) installable);
+                }
+            }
+        }
+
+        return envelope("showTraffic", sid, payload);
+    }
+
+    // Adds the link segments (path or tree) associated with the specified
+    // connectivity intent
+    protected void addPathTraffic(ArrayNode paths, String type,
+                                  ConnectivityIntent installable) {
+        ObjectNode pathNode = mapper.createObjectNode();
+        ArrayNode linksNode = mapper.createArrayNode();
+
+        Iterable<Link> links;
+        if (installable instanceof PathIntent) {
+            links = ((PathIntent) installable).path().links();
+        } else if (installable instanceof LinkCollectionIntent) {
+            links = ((LinkCollectionIntent) installable).links();
+        } else {
+            return;
+        }
+
+        for (Link link : links) {
+            linksNode.add(compactLinkString(link));
+        }
+        pathNode.put("type", type).set("links", linksNode);
+        paths.add(pathNode);
+    }
+
     // Produces compact string representation of a link.
     private static String compactLinkString(Link link) {
         return String.format(COMPACT, link.src().elementId(), link.src().port(),
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
View file @dea45ff
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
View file @dea45ff
--- a/web/gui/src/main/webapp/topo2.js
View file @dea45ff
+++ b/web/gui/src/main/webapp/topo2.js
View file @dea45ff
@@ -130,8 +130,8 @@
         U: unpin,
         W: requestTraffic,  // bag of selections
-        Z: requestPath,     // host-to-host intent (and monitor)
+        X: cancelTraffic,
-        X: cancelMonitor
+        Z: requestPath      // host-to-host intent (and monitor)
     };
     // state variables
@@ -496,7 +496,23 @@
     }
     function showTraffic(data) {
-        network.view.alert("showTraffic() -- TODO")
+        fnTrace('showTraffic', data.payload.id);
+        data.payload.paths.forEach(function () {
+            var links = data.payload.links,
+                s = [ data.event + "\n" + links.length ];
+            links.forEach(function (d, i) {
+                s.push(d);
+            });
+            network.view.alert(s.join('\n'));
+
+            links.forEach(function (d, i) {
+                var link = network.lookup[d];
+                if (link) {
+                    link.el.classed('showPath', true);
+                }
+            });
+        });
+        //network.view.alert("showTraffic() -- TODO")
     }
     // ...............................
@@ -566,9 +582,9 @@
         }
     }
-    function cancelMonitor() {
+    function cancelTraffic() {
         // FIXME: from where do we get the intent id(s) to send to the server?
-        sendMessage('cancelMonitor', {
+        sendMessage('cancelTraffic', {
             ids: ["need_the_intent_id"]
         });
     }