Pass node-repository to avoid construction cycle

8 files changed, 18 insertions, 14 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
index f6398c04e61..09723d83e3e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerService.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.lb;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.vespa.hosted.provision.NodeRepository;
 
 import java.util.Set;
 
@@ -23,7 +24,8 @@ public interface LoadBalancerService {
      *                    pre-existing load balancer).
      * @return The provisioned load balancer instance
      */
-    LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force);
+    LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force,
+                                NodeRepository nodeRepository);
 
     /** Permanently remove load balancer for given application cluster */
     void remove(ApplicationId application, ClusterSpec.Id cluster);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
index 91f02a31f6b..9bd1189420a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceMock.java
@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableSet;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.vespa.hosted.provision.NodeRepository;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -29,7 +30,8 @@ public class LoadBalancerServiceMock implements LoadBalancerService {
     }
 
     @Override
-    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force) {
+    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force,
+                                       NodeRepository nodeRepository) {
         var id = new LoadBalancerId(application, cluster);
         var oldInstance = instances.get(id);
         if (!force && oldInstance != null && !oldInstance.reals().isEmpty() && reals.isEmpty()) {
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
index 891faceca7a..07074bc45af 100644
--- 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
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.lb;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.vespa.hosted.provision.NodeRepository;
 
 import java.util.Comparator;
 import java.util.Optional;
@@ -17,7 +18,8 @@ import java.util.Set;
 public class PassthroughLoadBalancerService implements LoadBalancerService {
 
     @Override
-    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force) {
+    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force,
+                                       NodeRepository nodeRepository) {
         var real = reals.stream()
                         .min(Comparator.naturalOrder())
                         .orElseThrow(() -> new IllegalArgumentException("No reals given"));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
index f670ff93073..42a52601527 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
@@ -27,15 +27,13 @@ public class SharedLoadBalancerService implements LoadBalancerService {
 
     private static final Comparator<Node> hostnameComparator = Comparator.comparing(Node::hostname);
 
-    private final NodeRepository nodeRepository;
-
     @Inject
-    public SharedLoadBalancerService(NodeRepository nodeRepository) {
-        this.nodeRepository = Objects.requireNonNull(nodeRepository, "nodeRepository must be non-null");
+    public SharedLoadBalancerService() {
     }
 
     @Override
-    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force) {
+    public LoadBalancerInstance create(ApplicationId application, ClusterSpec.Id cluster, Set<Real> reals, boolean force,
+                                       NodeRepository nodeRepository) {
         var proxyNodes = new ArrayList<>(nodeRepository.getNodes(NodeType.proxy));
         proxyNodes.sort(hostnameComparator);
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
index d793874119a..483b4dc8f84 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
@@ -99,7 +99,7 @@ public class LoadBalancerExpirer extends NodeRepositoryMaintainer {
             // Remove any real no longer allocated to this application
             reals.removeIf(real -> !allocatedNodes.contains(real.hostname().value()));
             try {
-                service.create(lb.id().application(), lb.id().cluster(), reals, true);
+                service.create(lb.id().application(), lb.id().cluster(), reals, true, nodeRepository());
                 db.writeLoadBalancer(lb.with(lb.instance().withReals(reals)));
             } catch (Exception e) {
                 failed.add(lb.id());
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index 3532d989d85..026788e9d6c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -169,7 +169,7 @@ public class LoadBalancerProvisioner {
         log.log(Level.FINE, "Creating load balancer for " + cluster + " in " + application.toShortString() +
                                 ", targeting: " + reals);
         try {
-            return service.create(application, cluster, reals, force);
+            return service.create(application, cluster, reals, force, nodeRepository);
         } catch (Exception e) {
             throw new LoadBalancerServiceException("Failed to (re)configure load balancer for " + cluster + " in " +
                                                    application + ", targeting: " + reals + ". The operation will be " +
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
index 402eaf37529..e70fc184b87 100644
--- 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
@@ -21,7 +21,7 @@ public class PassthroughLoadBalancerServiceTest {
         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(ApplicationId.from("tenant1", "app1", "default"),
-                                        ClusterSpec.Id.from("c1"), reals, false);
+                                        ClusterSpec.Id.from("c1"), reals, false, null);
         assertEquals(real.hostname(), instance.hostname());
         assertEquals(Set.of(real.port()), instance.ports());
         assertEquals(Set.of(real.ipAddress() + "/32"), instance.networks());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
index 1829a93c34f..64d189b9111 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 public class SharedLoadBalancerServiceTest {
 
     private final ProvisioningTester tester = new ProvisioningTester.Builder().build();
-    private final SharedLoadBalancerService loadBalancerService = new SharedLoadBalancerService(tester.nodeRepository());
+    private final SharedLoadBalancerService loadBalancerService = new SharedLoadBalancerService();
     private final ApplicationId applicationId = ApplicationId.from("tenant1", "application1", "default");
     private final ClusterSpec.Id clusterId = ClusterSpec.Id.from("qrs1");
     private final Set<Real> reals = Set.of(
@@ -30,7 +30,7 @@ public class SharedLoadBalancerServiceTest {
     @Test
     public void test_create_lb() {
         tester.makeReadyNodes(2, "default", NodeType.proxy);
-        var lb = loadBalancerService.create(applicationId, clusterId, reals, false);
+        var lb = loadBalancerService.create(applicationId, clusterId, reals, false, tester.nodeRepository());
 
         assertEquals(HostName.from("host-1.yahoo.com"), lb.hostname());
         assertEquals(Optional.empty(), lb.dnsZone());
@@ -40,7 +40,7 @@ public class SharedLoadBalancerServiceTest {
 
     @Test(expected = IllegalStateException.class)
     public void test_exception_on_missing_proxies() {
-        loadBalancerService.create(applicationId, clusterId, reals, false);
+        loadBalancerService.create(applicationId, clusterId, reals, false, tester.nodeRepository());
     }
 
     @Test