Added server-side code to create host-to-host intent. Still WIP.

Change-Id: I80626aa9ecb38802ddca4be3bce3def85ccfdb88

Added server-side code to create host-to-host intent. Still WIP.
Change-Id: I80626aa9ecb38802ddca4be3bce3def85ccfdb88
Thomas Vachuska
Commit 4830d390a9b5766f7e3b563f833ff0c8c0db5946 4830d390 1 parent db3695a7
Showing 4 changed files with 157 additions and 34 deletions
core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
web/gui/src/main/webapp/topo2.css
web/gui/src/main/webapp/topo2.js
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
View file @4830d39
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
View file @4830d39
@@ -296,7 +296,7 @@ public class FlowRuleManager
                     post(event);
                 }
             } else {
-                log.info("Removing flow rules....");
+                log.debug("Removing flow rules....");
                 removeFlowRules(flowEntry);
             }
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
View file @4830d39
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
View file @4830d39
@@ -20,12 +20,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.eclipse.jetty.websocket.WebSocket;
+import org.onlab.onos.core.ApplicationId;
+import org.onlab.onos.core.CoreService;
 import org.onlab.onos.mastership.MastershipEvent;
 import org.onlab.onos.mastership.MastershipListener;
 import org.onlab.onos.mastership.MastershipService;
 import org.onlab.onos.net.Annotations;
+import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.DefaultEdgeLink;
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.ElementId;
 import org.onlab.onos.net.Host;
 import org.onlab.onos.net.HostId;
 import org.onlab.onos.net.HostLocation;
@@ -34,28 +39,41 @@ import org.onlab.onos.net.Path;
 import org.onlab.onos.net.device.DeviceEvent;
 import org.onlab.onos.net.device.DeviceListener;
 import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.flow.DefaultTrafficSelector;
+import org.onlab.onos.net.flow.DefaultTrafficTreatment;
 import org.onlab.onos.net.host.HostEvent;
 import org.onlab.onos.net.host.HostListener;
 import org.onlab.onos.net.host.HostService;
+import org.onlab.onos.net.intent.HostToHostIntent;
+import org.onlab.onos.net.intent.Intent;
+import org.onlab.onos.net.intent.IntentEvent;
 import org.onlab.onos.net.intent.IntentId;
+import org.onlab.onos.net.intent.IntentListener;
+import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.intent.PathIntent;
 import org.onlab.onos.net.link.LinkEvent;
 import org.onlab.onos.net.link.LinkListener;
 import org.onlab.onos.net.link.LinkService;
+import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.onos.net.topology.PathService;
 import org.onlab.osgi.ServiceDirectory;
 import org.onlab.packet.IpAddress;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onlab.onos.net.DeviceId.deviceId;
 import static org.onlab.onos.net.HostId.hostId;
+import static org.onlab.onos.net.PortNumber.portNumber;
 import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_ADDED;
 import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_REMOVED;
+import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
+import static org.onlab.onos.net.host.HostEvent.Type.HOST_REMOVED;
 import static org.onlab.onos.net.link.LinkEvent.Type.LINK_ADDED;
 import static org.onlab.onos.net.link.LinkEvent.Type.LINK_REMOVED;
@@ -64,6 +82,10 @@ import static org.onlab.onos.net.link.LinkEvent.Type.LINK_REMOVED;
  */
 public class TopologyWebSocket implements WebSocket.OnTextMessage {
+    private static final String APP_ID = "org.onlab.onos.gui";
+    private static final ProviderId PID = new ProviderId("core", "org.onlab.onos.core", true);
+
+    private final ApplicationId appId;
     private final ServiceDirectory directory;
     private final ObjectMapper mapper = new ObjectMapper();
@@ -74,14 +96,19 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
     private final LinkService linkService;
     private final HostService hostService;
     private final MastershipService mastershipService;
+    private final IntentService intentService;
     private final DeviceListener deviceListener = new InternalDeviceListener();
     private final LinkListener linkListener = new InternalLinkListener();
     private final HostListener hostListener = new InternalHostListener();
     private final MastershipListener mastershipListener = new InternalMastershipListener();
+    private final IntentListener intentListener = new InternalIntentListener();
     // TODO: extract into an external & durable state; good enough for now and demo
-    private static Map<String, ObjectNode> metaUi = new HashMap<>();
+    private static Map<String, ObjectNode> metaUi = new ConcurrentHashMap<>();
+
+    // Intents that are being monitored for the GUI
+    private static Map<IntentId, Long> intentsToMonitor = new ConcurrentHashMap<>();
     private static final String COMPACT = "%s/%s-%s/%s";
@@ -97,6 +124,9 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
         linkService = directory.get(LinkService.class);
         hostService = directory.get(HostService.class);
         mastershipService = directory.get(MastershipService.class);
+        intentService = directory.get(IntentService.class);
+
+        appId = directory.get(CoreService.class).registerApplication(APP_ID);
     }
     @Override
@@ -106,9 +136,17 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
         linkService.addListener(linkListener);
         hostService.addListener(hostListener);
         mastershipService.addListener(mastershipListener);
+        intentService.addListener(intentListener);
         sendAllDevices();
         sendAllLinks();
+        sendAllHosts();
+    }
+
+    private void sendAllHosts() {
+        for (Host host : hostService.getHosts()) {
+            sendMessage(hostMessage(new HostEvent(HOST_ADDED, host)));
+        }
     }
     private void sendAllDevices() {
@@ -141,14 +179,15 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
             } else if (type.equals("updateMeta")) {
                 updateMetaInformation(event);
             } else if (type.equals("requestPath")) {
-                sendPath(event);
+                createHostIntent(event);
             } else if (type.equals("requestTraffic")) {
                 sendTraffic(event);
             } else if (type.equals("cancelTraffic")) {
                 cancelTraffic(event);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
-            System.out.println("Received: " + data);
+            System.out.println("WTF?! " + data);
+            e.printStackTrace();
         }
     }
@@ -250,19 +289,19 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
         metaUi.put(string(payload, "id"), payload);
     }
-    // Sends path message.
+    // Creates host-to-host intent.
-    private void sendPath(ObjectNode event) {
+    private void createHostIntent(ObjectNode event) {
         ObjectNode payload = payload(event);
         long id = number(event, "sid");
-        DeviceId one = deviceId(string(payload, "one"));
+        // TODO: add protection against device ids and non-existent hosts.
-        DeviceId two = deviceId(string(payload, "two"));
+        HostId one = hostId(string(payload, "one"));
+        HostId two = hostId(string(payload, "two"));
-        ObjectNode response = findPath(one, two);
+        HostToHostIntent hostIntent = new HostToHostIntent(appId, one, two,
-        if (response != null) {
+                                                           DefaultTrafficSelector.builder().build(),
-            sendMessage(envelope("showPath", id, response));
+                                                           DefaultTrafficTreatment.builder().build());
-        } else {
+        intentsToMonitor.put(hostIntent.id(), number(event, "sid"));
-            sendMessage(message("warn", id, "No path found"));
+        intentService.submit(hostIntent);
-        }
     }
     // Sends traffic message.
@@ -314,8 +353,8 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
      * @return formatted link string
      */
     public static String compactLinkString(Link link) {
-        return String.format(COMPACT, link.src().deviceId(), link.src().port(),
+        return String.format(COMPACT, link.src().elementId(), link.src().port(),
-                             link.dst().deviceId(), link.dst().port());
+                             link.dst().elementId(), link.dst().port());
     }
@@ -337,11 +376,7 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
         // Add labels, props and stuff the payload into envelope.
         payload.set("labels", labels);
         payload.set("props", props(device.annotations()));
-
+        addMetaUi(device.id(), payload);
-        ObjectNode meta = metaUi.get(device.id().toString());
-        if (meta != null) {
-            payload.set("metaUi", meta);
-        }
         String type = (event.type() == DEVICE_ADDED) ? "addDevice" :
                 ((event.type() == DEVICE_REMOVED) ? "removeDevice" : "updateDevice");
@@ -368,11 +403,30 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
     private ObjectNode hostMessage(HostEvent event) {
         Host host = event.subject();
         ObjectNode payload = mapper.createObjectNode()
-                .put("id", host.id().toString());
+                .put("id", host.id().toString())
+                .put("ingress", compactLinkString(edgeLink(host, true)))
+                .put("egress", compactLinkString(edgeLink(host, false)));
         payload.set("cp", location(mapper, host.location()));
         payload.set("labels", labels(mapper, ip(host.ipAddresses()),
                                      host.mac().toString()));
-        return payload;
+        payload.set("props", props(host.annotations()));
+        addMetaUi(host.id(), payload);
+
+        String type = (event.type() == HOST_ADDED) ? "addHost" :
+                ((event.type() == HOST_REMOVED) ? "removeHost" : "updateHost");
+        return envelope(type, 0, payload);
+    }
+
+    private DefaultEdgeLink edgeLink(Host host, boolean ingress) {
+        return new DefaultEdgeLink(PID, new ConnectPoint(host.id(), portNumber(0)),
+                                   host.location(), ingress);
+    }
+
+    private void addMetaUi(ElementId id, ObjectNode payload) {
+        ObjectNode meta = metaUi.get(id.toString());
+        if (meta != null) {
+            payload.set("metaUi", meta);
+        }
     }
@@ -468,5 +522,22 @@ public class TopologyWebSocket implements WebSocket.OnTextMessage {
         }
     }
+
+    private class InternalIntentListener implements IntentListener {
+        @Override
+        public void event(IntentEvent event) {
+            Intent intent = event.subject();
+            Long sid = intentsToMonitor.get(intent.id());
+            if (sid != null) {
+                List<Intent> installable = intentService.getInstallableIntents(intent.id());
+                if (installable != null && !installable.isEmpty()) {
+                    PathIntent pathIntent = (PathIntent) installable.iterator().next();
+                    Path path = pathIntent.path();
+                    ObjectNode payload = pathMessage(path).put("intentId", intent.id().toString());
+                    sendMessage(envelope("showPath", sid, payload));
+                }
+            }
+        }
+    }
 }
--- a/web/gui/src/main/webapp/topo2.css
View file @4830d39
+++ b/web/gui/src/main/webapp/topo2.css
View file @4830d39
@@ -71,6 +71,11 @@
     opacity: .7;
 }
+#topo svg .link.showPath {
+    stroke: #f00;
+    stroke-width: 4px;
+}
+
 /* for debugging */
 #topo svg .node circle.debug {
     fill: white;
--- a/web/gui/src/main/webapp/topo2.js
View file @4830d39
+++ b/web/gui/src/main/webapp/topo2.js
View file @4830d39
@@ -383,6 +383,7 @@
             note('addLink', lnk.id);
             network.links.push(lnk);
+            network.lookup[lnk.id] = lnk;
             updateLinks();
             network.force.start();
         }
@@ -401,13 +402,29 @@
         lnk = createHostLink(host);
         if (lnk) {
             network.links.push(lnk);
+            network.lookup[host.ingress] = lnk;
+            network.lookup[host.egress] = lnk;
             updateLinks();
         }
         network.force.start();
     }
     function showPath(data) {
-        network.view.alert(data.event + "\n" + data.payload.links.length);
+        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) {
+                d3.select('#' + link.svgId).classed('showPath', true);
+            }
+        });
+
+        // TODO: add selection-highlite lines to links
     }
     // ...............................
@@ -415,7 +432,7 @@
     function stillToImplement(data) {
         var p = data.payload;
         note(data.event, p.id);
-        network.view.alert('Not yet implemented: "' + data.event + '"');
+        //network.view.alert('Not yet implemented: "' + data.event + '"');
     }
     function unknownEvent(data) {
@@ -437,6 +454,7 @@
     function createHostLink(host) {
         var src = host.id,
             dst = host.cp.device,
+            id = host.id,
             srcNode = network.lookup[src],
             dstNode = network.lookup[dst],
             lnk;
@@ -449,7 +467,8 @@
         }
         lnk = {
-            id: safeId(src) + '~' + safeId(dst),
+            svgId: safeId(src) + '-' + safeId(dst),
+            id: id,
             source: srcNode,
             target: dstNode,
             class: 'link',
@@ -467,6 +486,7 @@
         var type = link.type,
             src = link.src,
             dst = link.dst,
+            id = link.id,
             w = link.linkWidth,
             srcNode = network.lookup[src],
             dstNode = network.lookup[dst],
@@ -480,7 +500,8 @@
         }
         lnk = {
-                id: safeId(src) + '~' + safeId(dst),
+                svgId: safeId(src) + '-' + safeId(dst),
+                id: id,
                 source: srcNode,
                 target: dstNode,
                 class: 'link',
@@ -511,7 +532,7 @@
         var entering = link.enter()
             .append('line')
             .attr({
-                id: function (d) { return d.id; },
+                id: function (d) { return d.svgId; },
                 class: function (d) { return d.svgClass; },
                 x1: function (d) { return d.x1; },
                 y1: function (d) { return d.y1; },
@@ -529,6 +550,19 @@
         // augment links
         // TODO: add src/dst port labels etc.
+
+        // operate on both existing and new links, if necessary
+        //link .foo() .bar() ...
+
+        // operate on exiting links:
+        // TODO: figure out how to remove the node 'g' AND its children
+        link.exit()
+            .transition()
+            .duration(750)
+            .attr({
+                opacity: 0
+            })
+            .remove();
     }
     function createDeviceNode(device) {
@@ -756,7 +790,6 @@
             webSock.ws = new WebSocket(webSockUrl());
             webSock.ws.onopen = function() {
-                webSock._send("Hi there!");
             };
             webSock.ws.onmessage = function(m) {
@@ -932,10 +965,12 @@
         node = nodeG.selectAll('.node');
         function ldist(d) {
-            return fcfg.linkDistance[d.class] || 150;
+            return 2 * 30;
+            //return fcfg.linkDistance[d.class] || 150;
         }
         function lstrg(d) {
-            return fcfg.linkStrength[d.class] || 1;
+            return 2 * 0.6;
+            //return fcfg.linkStrength[d.class] || 1;
         }
         function lchrg(d) {
             return fcfg.charge[d.class] || -200;
@@ -968,11 +1003,23 @@
             .size(forceDim)
             .nodes(network.nodes)
             .links(network.links)
-            .charge(lchrg)
+            .gravity(0.3)
+            .charge(-15000)
+            .friction(0.1)
+            //.charge(lchrg)
             .linkDistance(ldist)
             .linkStrength(lstrg)
             .on('tick', tick);
+            // TVUE
+            //.gravity(0.3)
+            //.charge(-15000)
+            //.friction(0.1)
+            //.linkDistance(function(d) { return d.value * 30; })
+            //.linkStrength(function(d) { return d.value * 0.6; })
+            //.size([w, h])
+            //.start();
+
         network.drag = d3u.createDragBehavior(network.force, selectCb, atDragEnd);
     }