diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-07-29 13:11:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 13:11:07 +0200 |
commit | 0ee098ce8f4fa965145849101c28d836a2552f31 (patch) | |
tree | c285c2aaadd7377c66562e00820fc8563416674d /application-model/src/main/java/com | |
parent | fba423de8235b3b66a6cf6aa5b9502de8607f9e6 (diff) | |
parent | f046f8cf92f4a07183c6d6baa0e22066d7b1fc51 (diff) |
Merge pull request #18653 from vespa-engine/revert-18650-hakonhall/orc-of-proxies
Revert "Pass around orchestration parameters"
Diffstat (limited to 'application-model/src/main/java/com')
3 files changed, 0 insertions, 21 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 ed2b06a18f3..801213dcf40 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,9 +16,6 @@ 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 40fdbd52a92..d7995b41616 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,8 +14,6 @@ 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 f7398d0478f..baede298896 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,28 +98,12 @@ 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 + "}"; } |