[SDFAB-753] Improve ONOS cluster event
Main idea of this change is to add an additional parameter
in the event that carries information about the failed instance.
Additionally, prevents several NPE by using hostname as id
when controller hostname cannot be resolved into an ip.
Change-Id: Id9886afe3f1e5ecee0f1414b2722c340680a813e
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 3bd4985..79a335f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -261,10 +261,11 @@
// Produces a cluster instance message to the client.
protected ObjectNode instanceMessage(ClusterEvent event, String msgType) {
ControllerNode node = event.subject();
+ IpAddress nodeIp = node.ip();
int switchCount = services.mastership().getDevicesOf(node.id()).size();
ObjectNode payload = objectNode()
.put("id", node.id().toString())
- .put("ip", node.ip().toString())
+ .put("ip", nodeIp != null ? nodeIp.toString() : node.host())
.put("online", services.cluster().getState(node.id()).isActive())
.put("ready", services.cluster().getState(node.id()).isReady())
.put("uiAttached", node.equals(services.cluster().getLocalNode()))
@@ -272,7 +273,7 @@
ArrayNode labels = arrayNode();
labels.add(node.id().toString());
- labels.add(node.ip().toString());
+ labels.add(nodeIp != null ? nodeIp.toString() : node.host());
// Add labels, props and stuff the payload into envelope.
payload.set("labels", labels);