commit 85897573552a302fe5b6369cfe4cec5ded7dfac1
author Simon Hunt <simon@onlab.us> Tue Oct 20 16:29:51 2015 -0700
committer Simon Hunt <simon@onlab.us> Tue Oct 20 16:32:07 2015 -0700
tree 28ac5b8b19bb173a74beab6fd1c6ebd95c1928b6
parent 83c5b83b76110703b8d01d70a2b5b26ab4d923bf

GUI Topo -- added NodeBadge field to NodeHighlight.
 - updated TopoJson to include device badge in JSON output.

Change-Id: I7fc0ec226c378a0395cd1eec765cb7bc867f9100

core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java

diff --git a/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java b/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
index 8df0316..d4990f3 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
@@ -37,6 +37,8 @@
     static final String ID = "id";
     static final String LABEL = "label";
     static final String CSS = "css";
+    static final String BADGE = "badge";
+    static final String MSG = "msg";
 
     static final String TITLE = "title";
     static final String TYPE = "type";
@@ -103,6 +105,13 @@
         if (dh.subdued()) {
             n.put(SUBDUE, true);
         }
+        NodeBadge badge = dh.badge();
+        if (badge != null) {
+            ObjectNode b = objectNode()
+                    .put(TYPE, badge.type().code())
+                    .put(MSG, badge.message());
+            n.set(BADGE, b);
+        }
         return n;
     }