Added a number of demo-related artifacts. Enhanced GUI a bit.
Change-Id: I4501cb338f9eab07420fb60e347167deda5074be
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java
index 7477e60..9e46da3 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java
@@ -263,15 +263,31 @@
// Sends all devices to the client as device-added messages.
private void sendAllDevices() {
+ // Send optical first, others later for layered rendering
for (Device device : deviceService.getDevices()) {
- sendMessage(deviceMessage(new DeviceEvent(DEVICE_ADDED, device)));
+ if (device.type() == Device.Type.ROADM) {
+ sendMessage(deviceMessage(new DeviceEvent(DEVICE_ADDED, device)));
+ }
+ }
+ for (Device device : deviceService.getDevices()) {
+ if (device.type() != Device.Type.ROADM) {
+ sendMessage(deviceMessage(new DeviceEvent(DEVICE_ADDED, device)));
+ }
}
}
// Sends all links to the client as link-added messages.
private void sendAllLinks() {
+ // Send optical first, others later for layered rendering
for (Link link : linkService.getLinks()) {
- sendMessage(linkMessage(new LinkEvent(LINK_ADDED, link)));
+ if (link.type() == Link.Type.OPTICAL) {
+ sendMessage(linkMessage(new LinkEvent(LINK_ADDED, link)));
+ }
+ }
+ for (Link link : linkService.getLinks()) {
+ if (link.type() != Link.Type.OPTICAL) {
+ sendMessage(linkMessage(new LinkEvent(LINK_ADDED, link)));
+ }
}
}
@@ -564,6 +580,7 @@
}
} catch (Exception e) {
log.warn("Unable to handle traffic request due to {}", e.getMessage());
+ log.warn("Boom!", e);
}
}
}