diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2021-07-29 13:19:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 13:19:52 +0200 |
commit | 8eb4c2dd3aa750c2ebcee4e1736f99e98d89c3bf (patch) | |
tree | 1331cd06c423e88c7a3b057e8bc214b75c21c63b /application-model/src/main/java/com | |
parent | 0ee098ce8f4fa965145849101c28d836a2552f31 (diff) |
Revert "Revert "Pass around orchestration parameters""
Diffstat (limited to 'application-model/src/main/java/com')
3 files changed, 21 insertions, 0 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java index 801213dcf40..ed2b06a18f3 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java @@ -16,6 +16,9 @@ public class ApplicationInstanceId { public boolean isConfigServerHost() { return id.startsWith("configserver-host:"); } public static final ApplicationInstanceId CONTROLLER_HOST = new ApplicationInstanceId("controller-host:prod:default:default"); public boolean isTenantHost() { return id.startsWith("tenant-host:"); } + public boolean isProxyHost() { return id.startsWith("proxy-host:"); } + // Routing application instance ID is of the form: routing:prod:eu-west-1:default + public boolean isProxy() { return id.startsWith("routing:"); } private final String id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java index d7995b41616..40fdbd52a92 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java @@ -14,6 +14,8 @@ public class ClusterId { public static final ClusterId CONTROLLER = new ClusterId("controller"); public static final ClusterId CONFIG_SERVER_HOST = new ClusterId("configserver-host"); public static final ClusterId CONTROLLER_HOST = new ClusterId("controller-host"); + public static final ClusterId PROXY_HOST = new ClusterId("proxy-host"); + public static final ClusterId ROUTING = new ClusterId("routing"); public static final ClusterId TENANT_HOST = new ClusterId("tenant-host"); private final String id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java index baede298896..f7398d0478f 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java @@ -98,12 +98,28 @@ public class ServiceCluster { Objects.equals(serviceType, ServiceType.HOST_ADMIN); } + @JsonIgnore + public boolean isProxy() { + return isHostedVespaApplicationWithPredicate(ApplicationInstanceId::isProxy) && + Objects.equals(clusterId, ClusterId.ROUTING) && + Objects.equals(serviceType, ServiceType.CONTAINER); + } + + @JsonIgnore + public boolean isProxyHost() { + return isHostedVespaApplicationWithPredicate(ApplicationInstanceId::isProxyHost) && + Objects.equals(clusterId, ClusterId.PROXY_HOST) && + Objects.equals(serviceType, ServiceType.HOST_ADMIN); + } + public String nodeDescription(boolean plural) { String pluralSuffix = plural ? "s" : ""; return isConfigServer() ? "config server" + pluralSuffix : isConfigServerHost() ? "config server host" + pluralSuffix : isController() ? "controller" + pluralSuffix : isControllerHost() ? "controller host" + pluralSuffix : + isProxy() ? (plural ? "proxies" : "proxy") : + isProxyHost() ? "proxy host" + pluralSuffix : isTenantHost() ? "tenant host" + pluralSuffix : "node" + pluralSuffix + " of {" + serviceType + "," + clusterId + "}"; } |