commit f84c3a27df2ec0792ae0e97ca3381d07809e6156
author Thomas Vachuska <tom@onlab.us> Sat Nov 22 11:30:57 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Sat Nov 22 11:31:39 2014 -0800
tree 2fc22f45681b98a24b441cfd9949803db705462b
parent d861def896bdc00e2c4640d5a52be623aa8844ea

ONOS-297 Added sending a few more properties as part of ONOS instance messages.

Change-Id: I818849e6280bf74842ff5c03c6a81e99382543f5

web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java

diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
index 91a820c..b951d0f 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
@@ -145,7 +145,8 @@
         statService = directory.get(StatisticService.class);
         topologyService = directory.get(TopologyService.class);
 
-        version = directory.get(CoreService.class).version().toString();
+        String ver = directory.get(CoreService.class).version().toString();
+        version = ver.replace(".SNAPSHOT", "*").replaceFirst("~.*$", "");
     }
 
     // Retrieves the payload from the specified event.
@@ -280,10 +281,13 @@
     // Produces a cluster instance message to the client.
     protected ObjectNode instanceMessage(ClusterEvent event) {
         ControllerNode node = event.subject();
+        int switchCount = mastershipService.getDevicesOf(node.id()).size();
         ObjectNode payload = mapper.createObjectNode()
                 .put("id", node.id().toString())
+                .put("ip", node.ip().toString())
                 .put("online", clusterService.getState(node.id()) == ACTIVE)
-                .put("uiAttached", event.subject().equals(clusterService.getLocalNode()));
+                .put("uiAttached", event.subject().equals(clusterService.getLocalNode()))
+                .put("switches", switchCount);
 
         ArrayNode labels = mapper.createArrayNode();
         labels.add(node.id().toString());
@@ -440,7 +444,7 @@
                              new Separator(),
                              new Prop("Intents", format(intentService.getIntentCount())),
                              new Prop("Flows", format(flowService.getFlowRuleCount())),
-                             new Prop("Version", version.replace(".SNAPSHOT", "*"))));
+                             new Prop("Version", version)));
     }
 
     // Returns device details response.