Added top-level location object per Simon/Paul spec.
Fixed an NPE in mastership when running optical demo.
Change-Id: I038000d1237b4150db0c722fa96dd9541d83e44e
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
index 83e54b4..212f14d 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyWebSocket.java
@@ -122,7 +122,7 @@
cancelTraffic(event);
}
} catch (Exception e) {
- System.out.println("WTF?! " + data);
+ log.warn("Unable to parse GUI request {} due to {}", data, e);
e.printStackTrace();
}
}
@@ -282,7 +282,8 @@
if (installable != null && !installable.isEmpty()) {
PathIntent pathIntent = (PathIntent) installable.iterator().next();
Path path = pathIntent.path();
- ObjectNode payload = pathMessage(path).put("intentId", intent.id().toString());
+ ObjectNode payload = pathMessage(path, "host")
+ .put("intentId", intent.id().toString());
sendMessage(envelope("showPath", sid, payload));
}
}