diff options
author | Harald Musum <musum@yahooinc.com> | 2022-08-11 09:57:49 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-08-11 09:57:49 +0200 |
commit | ddf7ff3e38488c417822b24739ce598d07bbee64 (patch) | |
tree | 416033ee346c6b28ee0fa3c6e79281e79f089d7d /clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java | |
parent | 8be6039101a0c4006199c2946d8381c86428ec11 (diff) |
Extract method for getting slobrok connection specs
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java | 15 |
1 files changed, 9 insertions, 6 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 5e4b62e0462..d8317c5323d 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 @@ -151,8 +151,7 @@ public abstract class FleetControllerTest implements Waiter { this.options.zooKeeperServerAddress = zooKeeperServer.getAddress(); log.log(Level.FINE, "Set up new zookeeper server at " + this.options.zooKeeperServerAddress); } - this.options.slobrokConnectionSpecs = new String[1]; - this.options.slobrokConnectionSpecs[0] = "tcp/localhost:" + slobrok.port(); + this.options.slobrokConnectionSpecs = getSlobrokConnectionSpecs(slobrok); this.usingFakeTimer = useFakeTimer; } @@ -239,8 +238,7 @@ public abstract class FleetControllerTest implements Waiter { setUpVdsNodes(useFakeTimer, options, startDisconnected, nodeIndexes); } protected void setUpVdsNodes(boolean useFakeTimer, DummyVdsNodeOptions options, boolean startDisconnected, Set<Integer> nodeIndexes) throws Exception { - String[] connectionSpecs = new String[1]; - connectionSpecs[0] = "tcp/localhost:" + slobrok.port(); + String[] connectionSpecs = getSlobrokConnectionSpecs(slobrok); for (int nodeIndex : nodeIndexes) { nodes.add(new DummyVdsNode(useFakeTimer ? timer : new RealTimer(), options, connectionSpecs, this.options.clusterName, true, nodeIndex)); if ( ! startDisconnected) nodes.get(nodes.size() - 1).connect(); @@ -256,8 +254,7 @@ public abstract class FleetControllerTest implements Waiter { * the returned list is twice as large as configuredNodes. */ protected List<DummyVdsNode> setUpVdsNodes(boolean useFakeTimer, DummyVdsNodeOptions options, boolean startDisconnected, List<ConfiguredNode> configuredNodes) throws Exception { - String[] connectionSpecs = new String[1]; - connectionSpecs[0] = "tcp/localhost:" + slobrok.port(); + String[] connectionSpecs = getSlobrokConnectionSpecs(slobrok); nodes = new ArrayList<>(); final boolean distributor = true; for (ConfiguredNode configuredNode : configuredNodes) { @@ -488,4 +485,10 @@ public abstract class FleetControllerTest implements Waiter { } } + static String[] getSlobrokConnectionSpecs(Slobrok slobrok) { + String[] connectionSpecs = new String[1]; + connectionSpecs[0] = "tcp/localhost:" + slobrok.port(); + return connectionSpecs; + } + } |