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

Change-Id: I818849e6280bf74842ff5c03c6a81e99382543f5

@@ -145,7 +145,8 @@ public abstract class TopologyViewMessages {
         statService = directory.get(StatisticService.class);
         statService = directory.get(StatisticService.class);
         topologyService = directory.get(TopologyService.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.
     // Retrieves the payload from the specified event.
@@ -280,10 +281,13 @@ public abstract class TopologyViewMessages {
     // Produces a cluster instance message to the client.
     // Produces a cluster instance message to the client.
     protected ObjectNode instanceMessage(ClusterEvent event) {
     protected ObjectNode instanceMessage(ClusterEvent event) {
         ControllerNode node = event.subject();
         ControllerNode node = event.subject();
+        int switchCount = mastershipService.getDevicesOf(node.id()).size();
         ObjectNode payload = mapper.createObjectNode()
         ObjectNode payload = mapper.createObjectNode()
                 .put("id", node.id().toString())
                 .put("id", node.id().toString())
+                .put("ip", node.ip().toString())
                 .put("online", clusterService.getState(node.id()) == ACTIVE)
                 .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();
         ArrayNode labels = mapper.createArrayNode();
         labels.add(node.id().toString());
         labels.add(node.id().toString());
@@ -440,7 +444,7 @@ public abstract class TopologyViewMessages {
                              new Separator(),
                              new Separator(),
                              new Prop("Intents", format(intentService.getIntentCount())),
                              new Prop("Intents", format(intentService.getIntentCount())),
                              new Prop("Flows", format(flowService.getFlowRuleCount())),
                              new Prop("Flows", format(flowService.getFlowRuleCount())),
-                             new Prop("Version", version.replace(".SNAPSHOT", "*"))));
+                             new Prop("Version", version)));
     }
     }
 
 
     // Returns device details response.
     // Returns device details response.