Add host info to orchestrator REST API

2 files changed, 49 insertions, 1 deletions

diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/GetHostResponse.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/GetHostResponse.java
index 3f14579dfba..2a582020bb3 100644
--- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/GetHostResponse.java
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/GetHostResponse.java
@@ -18,6 +18,7 @@ public class GetHostResponse {
 
     public static final String FIELD_NAME_HOSTNAME = "hostname";
     public static final String FIELD_NAME_STATE = "state";
+    public static final String FIELD_NAME_SUSPENDED_SINCE = "suspendedSince";
     public static final String FIELD_NAME_APPLICATION_URL = "applicationUrl";
     public static final String FIELD_NAME_SERVICES = "services";
 
@@ -25,15 +26,18 @@ public class GetHostResponse {
     private final String state;
     private final String applicationUrl;
     private final List<HostService> services;
+    private final String suspendedSince;
 
     @JsonCreator
     public GetHostResponse(
             @JsonProperty(FIELD_NAME_HOSTNAME) String hostname,
             @JsonProperty(FIELD_NAME_STATE) String state,
+            @JsonProperty(FIELD_NAME_SUSPENDED_SINCE) String suspendedSince,
             @JsonProperty(FIELD_NAME_APPLICATION_URL) String applicationUrl,
             @JsonProperty(FIELD_NAME_SERVICES) List<HostService> services) {
         this.hostname = hostname;
         this.state = state;
+        this.suspendedSince = suspendedSince;
         this.applicationUrl = applicationUrl;
         this.services = services;
     }
@@ -48,6 +52,11 @@ public class GetHostResponse {
         return state;
     }
 
+    @JsonProperty(FIELD_NAME_SUSPENDED_SINCE)
+    public String suspendedSince() {
+        return suspendedSince;
+    }
+
     @JsonProperty(FIELD_NAME_APPLICATION_URL)
     public String applicationUrl() {
         return applicationUrl;
@@ -65,12 +74,13 @@ public class GetHostResponse {
         GetHostResponse that = (GetHostResponse) o;
         return Objects.equals(hostname, that.hostname) &&
                 Objects.equals(state, that.state) &&
+                Objects.equals(suspendedSince, that.suspendedSince) &&
                 Objects.equals(applicationUrl, that.applicationUrl) &&
                 Objects.equals(services, that.services);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(hostname, state, applicationUrl, services);
+        return Objects.hash(hostname, state, suspendedSince, applicationUrl, services);
     }
 }
diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/WireHostInfo.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/WireHostInfo.java
new file mode 100644
index 00000000000..39c93291bad
--- /dev/null
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/WireHostInfo.java
@@ -0,0 +1,38 @@
+package com.yahoo.vespa.orchestrator.restapi.wire;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.time.Instant;
+import java.util.Objects;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class WireHostInfo {
+    private static final String HOST_STATUS_FIELD = "hostStatus";
+    private static final String SUSPENDED_SINCE_FIELD = "suspendedSince";
+
+    private final String hostStatus;
+    private final String suspendedSinceUtcOrNull;
+
+    /**
+     * @param hostStatus              The host status, e.g. NO_REMARKS.
+     * @param suspendedSinceUtcOrNull The time the host was suspended in the format
+     *                                {@link Instant#toString()}, or null if not suspended
+     *                                (NO_REMARKS).
+     */
+    @JsonCreator
+    public WireHostInfo(@JsonProperty(HOST_STATUS_FIELD) String hostStatus,
+                        @JsonProperty(SUSPENDED_SINCE_FIELD) String suspendedSinceUtcOrNull) {
+        this.hostStatus = Objects.requireNonNull(hostStatus);
+        this.suspendedSinceUtcOrNull = suspendedSinceUtcOrNull;
+    }
+
+    @JsonProperty(HOST_STATUS_FIELD)
+    public String hostStatus() { return hostStatus; }
+
+    @JsonProperty(SUSPENDED_SINCE_FIELD)
+    public String getSuspendedSinceUtcOrNull() { return suspendedSinceUtcOrNull; }
+}