Require non-null zooKeeperServerAddress in FleetControllerOptions

1 files changed, 12 insertions, 7 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index 238a64459ca..7bc6f18b887 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -25,6 +25,8 @@ import com.yahoo.vespa.clustercontroller.core.testutils.WaitTask;
 import com.yahoo.vespa.clustercontroller.core.testutils.Waiter;
 import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter;
 import org.junit.jupiter.api.AfterEach;
+
+import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -85,20 +87,23 @@ public abstract class FleetControllerTest implements Waiter {
         var builder = new FleetControllerOptions.Builder(clusterName, nodes);
         builder.enableTwoPhaseClusterStateActivation(true); // Enable by default, tests can explicitly disable.
         builder.setStorageDistribution(DistributionBuilder.forFlatCluster(builder.nodes().size()));
+        builder.setZooKeeperServerAddress("localhost:2181");
         return builder;
     }
 
-    private void setUpSystem(FleetControllerOptions.Builder builder) throws Exception {
+    protected void setUpSystem(FleetControllerOptions.Builder builder) throws Exception {
         log.log(Level.FINE, "Setting up system");
-        if (builder.zooKeeperServerAddress() != null) {
-            zooKeeperServer = new ZooKeeperTestServer();
-            // Need to set zookeeper address again, as port number is not known until ZooKeeperTestServer has been created
-            builder.setZooKeeperServerAddress(zooKeeperServer.getAddress());
-            log.log(Level.FINE, "Set up new zookeeper server at " + zooKeeperServer.getAddress());
-        }
+        setUpZooKeeperServer(builder);
         builder.setSlobrokConnectionSpecs(getSlobrokConnectionSpecs(slobrok));
     }
 
+    protected void setUpZooKeeperServer(FleetControllerOptions.Builder builder) throws IOException {
+        zooKeeperServer = new ZooKeeperTestServer();
+        // Need to set zookeeper address again, as port number is not known until ZooKeeperTestServer has been created
+        builder.setZooKeeperServerAddress(zooKeeperServer.getAddress());
+        log.log(Level.FINE, "Set up new zookeeper server at " + zooKeeperServer.getAddress());
+    }
+
     FleetController createFleetController(Timer timer, FleetControllerOptions options) {
         var context = new TestFleetControllerContext(options);
         var communicator = new RPCCommunicator(