Add uptimes to device and cluster REST APIs
Change-Id: I0ccdf4e33135be4bcfd1674a76ff4b39e992268b
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/ControllerNodeCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ControllerNodeCodec.java
index f6206b9..07d8e45 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/ControllerNodeCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/ControllerNodeCodec.java
@@ -40,7 +40,9 @@
.put("id", node.id().toString())
.put("ip", node.ip().toString())
.put("tcpPort", node.tcpPort())
- .put("status", service.getState(node.id()).toString());
+ .put("status", service.getState(node.id()).toString())
+ .put("lastUpdate", Long.toString(service.getLastUpdatedInstant(node.id()).toEpochMilli()))
+ .put("humanReadableLastUpdate", service.localStatus(node.id()));
}
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
index 029549e..d34092a 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
@@ -47,7 +47,8 @@
private static final String SERIAL = "serial";
private static final String CHASSIS_ID = "chassisId";
private static final String DRIVER = "driver";
-
+ private static final String LAST_UPDATE = "lastUpdate";
+ private static final String HUMAN_READABLE_LAST_UPDATE = "humanReadableLastUpdate";
@Override
public ObjectNode encode(Device device, CodecContext context) {
@@ -64,7 +65,9 @@
.put(SW, device.swVersion())
.put(SERIAL, device.serialNumber())
.put(DRIVER, driveService.getDriver(device.id()).name())
- .put(CHASSIS_ID, device.chassisId().toString());
+ .put(CHASSIS_ID, device.chassisId().toString())
+ .put(LAST_UPDATE, Long.toString(service.getLastUpdatedInstant(device.id())))
+ .put(HUMAN_READABLE_LAST_UPDATE, service.localStatus(device.id()));
return annotate(result, device, context);
}