summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-02-06 13:50:15 +0100
committerMartin Polden <mpolden@mpolden.no>2019-02-06 14:39:33 +0100
commit8adc7d48476437d33c910e46a6da85d36acedebe (patch)
tree64058aa054bfdb0844a5998f4d7e1a64611c8472 /controller-api
parent245a9611bce4d9d214ccb76016b67b6ca441dd24 (diff)
Rename LoadBalancerAlias -> RoutingPolicy
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java18
1 files changed, 2 insertions, 16 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java
index b77b63cab8a..012cc3df7f1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java
@@ -1,11 +1,9 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.api.integration.configserver;
+import com.yahoo.config.provision.ApplicationId;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.HostName;
-import com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId;
-import com.yahoo.vespa.hosted.controller.api.identifiers.InstanceId;
-import com.yahoo.vespa.hosted.controller.api.identifiers.TenantId;
import java.util.Objects;
@@ -17,17 +15,13 @@ import java.util.Objects;
public class LoadBalancer {
private final String id;
- private final TenantId tenant;
private final ApplicationId application;
- private final InstanceId instance;
private final ClusterSpec.Id cluster;
private final HostName hostname;
- public LoadBalancer(String id, TenantId tenant, ApplicationId application, InstanceId instance, ClusterSpec.Id cluster, HostName hostname) {
+ public LoadBalancer(String id, ApplicationId application, ClusterSpec.Id cluster, HostName hostname) {
this.id = Objects.requireNonNull(id, "id must be non-null");
- this.tenant = Objects.requireNonNull(tenant, "tenant must be non-null");
this.application = Objects.requireNonNull(application, "application must be non-null");
- this.instance = Objects.requireNonNull(instance, "instance must be non-null");
this.cluster = Objects.requireNonNull(cluster, "cluster must be non-null");
this.hostname = Objects.requireNonNull(hostname, "hostname must be non-null");
}
@@ -36,18 +30,10 @@ public class LoadBalancer {
return id;
}
- public TenantId tenant() {
- return tenant;
- }
-
public ApplicationId application() {
return application;
}
- public InstanceId instance() {
- return instance;
- }
-
public ClusterSpec.Id cluster() {
return cluster;
}