summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-02-19 14:14:39 +0100
committerMorten Tokle <mortent@verizonmedia.com>2020-02-19 14:14:39 +0100
commitcc14dbaf977bce650384e4ee30674e6cf96495ad (patch)
tree0a98e52e2f7369e4cb60ab4e66030e70d7164713 /controller-api
parent1a230786bd0709198dcd8e72ed8d326d26c073d8 (diff)
Add scope and routingMethod
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceInformation.java21
1 files changed, 15 insertions, 6 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 5c279547e17..d33f9a45c82 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
@@ -4,6 +4,7 @@ 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.config.provision.zone.RoutingMethod;
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;
@@ -35,23 +36,31 @@ public class InstanceInformation {
public String cluster;
public boolean tls;
public URI url;
+ public String scope;
+ public RoutingMethod routingMethod;
@JsonCreator
public Endpoint(@JsonProperty("cluster") String cluster ,
@JsonProperty("tls") boolean tls,
- @JsonProperty("url") URI url) {
+ @JsonProperty("url") URI url,
+ @JsonProperty("scope") String scope,
+ @JsonProperty("routingMethod") RoutingMethod routingMethod) {
this.cluster = cluster;
this.tls = tls;
this.url = url;
+ this.scope = scope;
+ this.routingMethod = routingMethod;
}
@Override
public String toString() {
- return "Endpoint {" +
- "cluster=" + cluster+
- ", tls='" + tls + '\'' +
- ", url='" + url+ '\'' +
- '}';
+ return "Endpoint{" +
+ "cluster='" + cluster + '\'' +
+ ", tls=" + tls +
+ ", url=" + url +
+ ", scope='" + scope + '\'' +
+ ", routingMethod=" + routingMethod +
+ '}';
}
}
}