diff options
5 files changed, 11 insertions, 42 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java index 1c45e4ba5dd..a91f95d71b1 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java @@ -26,15 +26,13 @@ public class ApplicationClusterEndpoint { private final RoutingMethod routingMethod; private final int weight; private final List<String> hostNames; - private final String clusterId; - private ApplicationClusterEndpoint(DnsName dnsName, Scope scope, RoutingMethod routingMethod, int weight, List<String> hostNames, String clusterId) { - this.dnsName = Objects.requireNonNull(dnsName); - this.scope = Objects.requireNonNull(scope); - this.routingMethod = Objects.requireNonNull(routingMethod); + public ApplicationClusterEndpoint(DnsName dnsName, Scope scope, RoutingMethod routingMethod, int weight, List<String> hostNames) { + this.dnsName = dnsName; + this.scope = scope; + this.routingMethod = routingMethod; this.weight = weight; - this.hostNames = List.copyOf(Objects.requireNonNull(hostNames)); - this.clusterId = Objects.requireNonNull(clusterId); + this.hostNames = List.copyOf(hostNames); } public DnsName dnsName() { @@ -57,10 +55,6 @@ public class ApplicationClusterEndpoint { return hostNames; } - public String clusterId() { - return clusterId; - } - public static Builder builder() { return new Builder(); } @@ -70,9 +64,8 @@ public class ApplicationClusterEndpoint { private DnsName dnsName; private Scope scope; private RoutingMethod routingMethod; - private int weigth = 1; + private int weigth = 0; private List<String> hosts; - private String clusterId; public Builder dnsName(DnsName name) { this.dnsName = name; @@ -109,13 +102,8 @@ public class ApplicationClusterEndpoint { return this; } - public Builder clusterId(String clusterId) { - this.clusterId = clusterId; - return this; - } - public ApplicationClusterEndpoint build() { - return new ApplicationClusterEndpoint(dnsName, scope, routingMethod, weigth, hosts, clusterId); + return new ApplicationClusterEndpoint(dnsName, scope, routingMethod, weigth, hosts); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index f7e8afc2d94..a5dc26e19e3 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -218,7 +218,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat .sharedL4Routing() .dnsName(l4Name) .hosts(hosts) - .clusterId(getName()) .build()); // L7 @@ -231,7 +230,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat .sharedRouting() .dnsName(l7Name) .hosts(hosts) - .clusterId(getName()) .build()); } @@ -245,7 +243,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat .sharedL4Routing() .dnsName(ApplicationClusterEndpoint.DnsName.from(name)) .hosts(hosts) - .clusterId(getName()) .build()) )); endpointList = List.copyOf(endpoints); diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/lb-services.def index 5a277eaed9d..5f33d3120b3 100644 --- a/configdefinitions/src/vespa/lb-services.def +++ b/configdefinitions/src/vespa/lb-services.def @@ -23,7 +23,6 @@ tenants{}.applications{}.hosts{}.services{}.endpointaliases[] string tenants{}.applications{}.endpoints[].dnsName string -tenants{}.applications{}.endpoints[].clusterId string tenants{}.applications{}.endpoints[].scope enum {application, global, zone} tenants{}.applications{}.endpoints[].routingMethod enum {shared, sharedLayer4} tenants{}.applications{}.endpoints[].weight int default=1 diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java index dccabca2858..7ef65bda46d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java @@ -105,8 +105,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer { .scope(LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.valueOf(clusterEndpoints.scope().name())) .routingMethod(LbServicesConfig.Tenants.Applications.Endpoints.RoutingMethod.Enum.valueOf(clusterEndpoints.routingMethod().name())) .weight(clusterEndpoints.weight()) - .hosts(clusterEndpoints.hostNames()) - .clusterId(clusterEndpoints.clusterId()); + .hosts(clusterEndpoints.hostNames()); } private boolean getActiveRotation(ApplicationInfo app) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index fb5fb27cd7a..2163d8738ab 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.RoutingMethod.Enum.sharedLayer4; import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.application; @@ -46,7 +47,6 @@ import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpo import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -54,6 +54,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; /** * @author Ulf Lilleengen @@ -176,19 +177,15 @@ public class LbServicesProducerTest { .filter(e -> e.routingMethod() == sharedLayer4) .map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix")); - assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint1.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); - assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint2.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).collect(Collectors.toList()); assertEquals(2, globalEndpoints.size()); assertThat(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("rotation-1", "rotation-2")); - assertContainsEndpoint(globalEndpoints, "rotation-1", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); - assertContainsEndpoint(globalEndpoints, "rotation-2", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).collect(Collectors.toList()); assertEquals(1, applicationEndpoints.size()); assertThat(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("app-endpoint")); - assertContainsEndpoint(applicationEndpoints, "app-endpoint", "mydisc", application, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); + } @@ -208,17 +205,6 @@ public class LbServicesProducerTest { .applications("baz:prod:default:custom-t")); } - private void assertContainsEndpoint(List<Endpoints> endpoints, String dnsName, String clusterId, Endpoints.Scope.Enum scope, Endpoints.RoutingMethod.Enum routingMethod, int weight, List<String> hosts) { - assertThat(endpoints, hasItem(new Endpoints.Builder() - .dnsName(dnsName) - .clusterId(clusterId) - .scope(scope) - .routingMethod(routingMethod) - .weight(weight) - .hosts(hosts) - .build())); - } - private Map<TenantName, Set<ApplicationInfo>> randomizeApplications(Map<TenantName, Set<ApplicationInfo>> testModel, int seed) { Map<TenantName, Set<ApplicationInfo>> randomizedApplications = new LinkedHashMap<>(); List<TenantName> keys = new ArrayList<>(testModel.keySet()); |