Simplify mock

2 files changed, 8 insertions, 9 deletions

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 0dddcf36762..d6ecba7e551 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
@@ -17,10 +17,10 @@ import java.util.Set;
  */
 public class LoadBalancerServiceMock implements LoadBalancerService {
 
-    private final Map<LoadBalancerId, LoadBalancer> loadBalancers = new HashMap<>();
+    private final Map<LoadBalancerId, LoadBalancerInstance> instances = new HashMap<>();
 
-    public Map<LoadBalancerId, LoadBalancer> loadBalancers() {
-        return Collections.unmodifiableMap(loadBalancers);
+    public Map<LoadBalancerId, LoadBalancerInstance> instances() {
+        return Collections.unmodifiableMap(instances);
     }
 
     @Override
@@ -37,14 +37,13 @@ public class LoadBalancerServiceMock implements LoadBalancerService {
                 Collections.singleton(4443),
                 ImmutableSet.of("10.2.3.0/24", "10.4.5.0/24"),
                 reals);
-        LoadBalancer loadBalancer = new LoadBalancer(id, instance, Set.of(), false);
-        loadBalancers.put(loadBalancer.id(), loadBalancer);
+        instances.put(id, instance);
         return instance;
     }
 
     @Override
     public void remove(ApplicationId application, ClusterSpec.Id cluster) {
-        loadBalancers.remove(new LoadBalancerId(application, cluster));
+        instances.remove(new LoadBalancerId(application, cluster));
     }
 
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
index 5b373c735e4..9870b94a8d5 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
@@ -56,16 +56,16 @@ public class LoadBalancerExpirerTest {
 
         // Expirer defers removal while nodes are still allocated to application
         expirer.maintain();
-        assertEquals(2, tester.loadBalancerService().loadBalancers().size());
+        assertEquals(2, tester.loadBalancerService().instances().size());
 
         // Expirer removes load balancers once nodes are deallocated
         dirtyNodesOf(app1);
         expirer.maintain();
-        assertFalse("Inactive load balancer removed", tester.loadBalancerService().loadBalancers().containsKey(lb1));
+        assertFalse("Inactive load balancer removed", tester.loadBalancerService().instances().containsKey(lb1));
 
         // Active load balancer is left alone
         assertFalse(loadBalancers.get().get(lb2).inactive());
-        assertTrue("Active load balancer is not removed", tester.loadBalancerService().loadBalancers().containsKey(lb2));
+        assertTrue("Active load balancer is not removed", tester.loadBalancerService().instances().containsKey(lb2));
     }
 
     private void dirtyNodesOf(ApplicationId application) {