GUI -- Reworked sprite definition loading via websocket events.
- includes option to specify sprite definition id: #/topo?sprites=defn_name.
Change-Id: If2ce59384e01bb5f35827a503748e21ab4fb1b31
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
index 5bb46f2..b574b77 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
@@ -86,7 +86,7 @@
@Consumes("application/json")
public Response setSprites(InputStream stream) throws IOException {
JsonNode root = mapper.readTree(stream);
- String name = root.path("defn_id").asText("sprites");
+ String name = root.path("defn_name").asText("sprites");
get(SpriteService.class).put(name, root);
return Response.ok().build();
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index cd8c3c2..3cc12b3 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -581,8 +581,9 @@
// Sends requested sprite data.
private void sendSpriteData(ObjectNode event) {
+ String name = event.path("payload").path("name").asText();
ObjectNode root = mapper.createObjectNode();
- root.set("defn", get(SpriteService.class).get(event.path("payload").path("name").asText()));
+ root.set("data", get(SpriteService.class).get(name));
sendMessage(envelope("spriteDataResponse", number(event, "sid"), root));
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index 66138e7..408a85a 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -130,7 +130,7 @@
@Override
public void put(String name, JsonNode spriteData) {
- log.info("Registered sprite definition {}", name);
+ log.info("Registered sprite definition [{}]", name);
sprites.put(name, spriteData);
}