diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-03-23 13:48:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-23 13:48:18 +0100 |
commit | c7c758dc9cbfb94eeb4208a20152011543973c9b (patch) | |
tree | 23524cce98ea4969d7a822548b89047dea1b70ab /node-repository | |
parent | 96665d22c021eedec9c22fdf022f266900b35561 (diff) | |
parent | 47c7fefe488a9b47a48b0715d01a5ce005c823ea (diff) |
Merge pull request #21770 from vespa-engine/mpolden/remove-unused-lb-service
Remove unused PassthroughLoadBalancerService
Diffstat (limited to 'node-repository')
2 files changed, 0 insertions, 74 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerService.java deleted file mode 100644 index 23ddce3ba9e..00000000000 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerService.java +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.lb; - -import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.NodeType; - -import java.util.Comparator; -import java.util.Optional; -import java.util.Set; - -/** - * Implementation of a load balancer service that returns a real as the load balancer instance. This is intended for - * development purposes. - * - * @author mpolden - */ -public class PassthroughLoadBalancerService implements LoadBalancerService { - - @Override - public LoadBalancerInstance create(LoadBalancerSpec spec, boolean force) { - var real = spec.reals().stream() - .min(Comparator.naturalOrder()) - .orElseThrow(() -> new IllegalArgumentException("No reals given")); - return new LoadBalancerInstance(real.hostname(), Optional.empty(), Set.of(real.port()), - Set.of(real.ipAddress() + "/32"), Set.of()); - } - - @Override - public void remove(ApplicationId application, ClusterSpec.Id cluster) { - // Nothing to remove - } - - @Override - public Protocol protocol() { - return Protocol.ipv4; - } - - @Override - public boolean supports(NodeType nodeType, ClusterSpec.Type clusterType) { - return true; - } - -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerServiceTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerServiceTest.java deleted file mode 100644 index 5fcc2afb85d..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/PassthroughLoadBalancerServiceTest.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.lb; - -import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.HostName; -import org.junit.Test; - -import java.util.Set; - -import static org.junit.Assert.assertEquals; - -/** - * @author mpolden - */ -public class PassthroughLoadBalancerServiceTest { - - @Test - public void create() { - var lbService = new PassthroughLoadBalancerService(); - var real = new Real(HostName.from("host1.example.com"), "192.0.2.10"); - var reals = Set.of(real, new Real(HostName.from("host2.example.com"), "192.0.2.11")); - var instance = lbService.create(new LoadBalancerSpec(ApplicationId.from("tenant1", "app1", "default"), - ClusterSpec.Id.from("c1"), reals), false); - assertEquals(real.hostname(), instance.hostname()); - assertEquals(Set.of(real.port()), instance.ports()); - assertEquals(Set.of(real.ipAddress() + "/32"), instance.networks()); - } - -} |