summaryrefslogtreecommitdiffstats
path: root/controller-api/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-06-04 13:18:11 +0200
committerHarald Musum <musum@verizonmedia.com>2019-06-04 13:18:11 +0200
commit75b1db7b01ecf1f62da466bdf62c6a5b8a95fb1b (patch)
treefb78122738b948fc6f37e6a0f31fe188b0f99b67 /controller-api/src
parent10b558583628c845e219accc9dc1bb42f5d27926 (diff)
Add endpoints to InstanceInformation
Diffstat (limited to 'controller-api/src')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java27
1 files changed, 27 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
index ebcebd994d1..5c279547e17 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java
@@ -1,7 +1,9 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch;
import com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit;
import com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository;
@@ -17,6 +19,7 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class InstanceInformation {
public List<URI> serviceUrls;
+ public List<Endpoint> endpoints;
public URI nodes;
public URI yamasUrl;
public RevisionId revision;
@@ -27,4 +30,28 @@ public class InstanceInformation {
public GitRepository gitRepository;
public GitBranch gitBranch;
public GitCommit gitCommit;
+
+ public static class Endpoint {
+ public String cluster;
+ public boolean tls;
+ public URI url;
+
+ @JsonCreator
+ public Endpoint(@JsonProperty("cluster") String cluster ,
+ @JsonProperty("tls") boolean tls,
+ @JsonProperty("url") URI url) {
+ this.cluster = cluster;
+ this.tls = tls;
+ this.url = url;
+ }
+
+ @Override
+ public String toString() {
+ return "Endpoint {" +
+ "cluster=" + cluster+
+ ", tls='" + tls + '\'' +
+ ", url='" + url+ '\'' +
+ '}';
+ }
+ }
}