Simplify

1 files changed, 23 insertions, 23 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
index af6e2d2b104..18691fc8747 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateChangeTest.java
@@ -105,7 +105,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void testNormalStartup() throws Exception {
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setMaxInitProgressTime(50000);
 
         initialize(options.build());
@@ -177,7 +177,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void testNodeGoingDownAndUp() throws Exception {
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setNodeStateRequestTimeoutMS(60 * 60 * 1000)
                 .setMinTimeBetweenNewSystemStates(0)
                 .setMaxInitProgressTime(50000)
@@ -267,7 +267,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testNodeGoingDownAndUpNotifying() throws Exception {
         // Same test as above, but node manages to notify why it is going down first.
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setNodeStateRequestTimeoutMS(60 * 60 * 1000)
                 .setMaxSlobrokDisconnectGracePeriod(100000);
 
@@ -338,7 +338,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void testNodeGoingDownAndUpFast() throws Exception {
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxSlobrokDisconnectGracePeriod(60 * 1000);
 
         initialize(builder.build());
@@ -379,7 +379,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void testMaintenanceWhileNormalStorageNodeRestart() throws Exception {
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxSlobrokDisconnectGracePeriod(60 * 1000);
 
         initialize(builder.build());
@@ -520,7 +520,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testDownNodeInitializing() throws Exception {
         // Actually report initializing state if node has been down steadily for a while
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxTransitionTime(NodeType.STORAGE, 5000)
                 .setMaxInitProgressTime(5000)
                 .setStableStateTimePeriod(20000)
@@ -583,7 +583,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testNodeInitializationStalled() throws Exception {
         // Node should eventually be marked down, and not become initializing next time, but stay down until up
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxTransitionTime(NodeType.STORAGE, 5000)
                 .setMaxInitProgressTime(5000)
                 .setStableStateTimePeriod(1000000)
@@ -669,7 +669,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testBackwardsInitializationProgress() throws Exception {
         // Same as stalled. Mark down, keep down until up
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder builder = defaultOptions();
         builder.setMaxTransitionTime(NodeType.STORAGE, 5000);
         builder.setMaxInitProgressTime(5000);
         builder.setStableStateTimePeriod(1000000);
@@ -712,7 +712,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testNodeGoingDownWhileInitializing() throws Exception {
         // Same as stalled. Mark down, keep down until up
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxTransitionTime(NodeType.STORAGE, 5000)
                 .setMaxInitProgressTime(5000)
                 .setStableStateTimePeriod(1000000)
@@ -772,7 +772,7 @@ public class StateChangeTest extends FleetControllerTest {
     void testContinuousCrashRightAfterInit() throws Exception {
         startingTest("StateChangeTest::testContinuousCrashRightAfterInit");
         // If node does this too many times, take it out of service
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxTransitionTime(NodeType.STORAGE, 5000)
                 .setMaxInitProgressTime(5000)
                 .setMaxPrematureCrashes(2)
@@ -826,7 +826,7 @@ public class StateChangeTest extends FleetControllerTest {
     void testClusterStateMinNodes() throws Exception {
         startingTest("StateChangeTest::testClusterStateMinNodes");
         // If node does this too many times, take it out of service
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10))
+        FleetControllerOptions.Builder builder = defaultOptions()
                 .setMaxTransitionTime(NodeType.STORAGE, 0)
                 .setMaxInitProgressTime(0)
                 .setMinDistributorNodesUp(6)
@@ -881,7 +881,7 @@ public class StateChangeTest extends FleetControllerTest {
     void testClusterStateMinFactor() throws Exception {
         startingTest("StateChangeTest::testClusterStateMinFactor");
         // If node does this too many times, take it out of service
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setMaxTransitionTime(NodeType.STORAGE, 0);
         options.setMaxInitProgressTime(0);
         options.setMinDistributorNodesUp(0);
@@ -954,8 +954,8 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testNoSystemStateBeforeInitialTimePeriod() throws Exception {
         startingTest("StateChangeTest::testNoSystemStateBeforeInitialTimePeriod()");
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10));
-        builder.setMinTimeBeforeFirstSystemStateBroadcast(3 * 60 * 1000);
+        FleetControllerOptions.Builder builder = defaultOptions()
+                .setMinTimeBeforeFirstSystemStateBroadcast(3 * 60 * 1000);
         setUpSystem(builder);
         boolean useFakeTimer = true;
         setUpVdsNodes(useFakeTimer, true);
@@ -1000,8 +1000,8 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testSystemStateSentWhenNodesReplied() throws Exception {
         startingTest("StateChangeTest::testSystemStateSentWhenNodesReplied()");
-        FleetControllerOptions.Builder builder = defaultOptions("mycluster", createNodes(10));
-        builder.setMinTimeBeforeFirstSystemStateBroadcast(300 * 60 * 1000);
+        FleetControllerOptions.Builder builder = defaultOptions()
+                .setMinTimeBeforeFirstSystemStateBroadcast(300 * 60 * 1000);
 
         boolean useFakeTimer = true;
         setUpSystem(builder);
@@ -1038,7 +1038,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testDontTagFailingSetSystemStateOk() throws Exception {
         startingTest("StateChangeTest::testDontTagFailingSetSystemStateOk()");
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         setUpFleetController(true, options);
         setUpVdsNodes(true);
         waitForStableSystem();
@@ -1069,7 +1069,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testAlteringDistributionSplitCount() throws Exception {
         startingTest("StateChangeTest::testAlteringDistributionSplitCount");
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setDistributionBits(17);
 
         initialize(options.build());
@@ -1116,7 +1116,7 @@ public class StateChangeTest extends FleetControllerTest {
     @Test
     void testSetAllTimestampsAfterDowntime() throws Exception {
         startingTest("StateChangeTest::testSetAllTimestampsAfterDowntime");
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         setUpFleetController(true, options);
         setUpVdsNodes(true);
         waitForStableSystem();
@@ -1165,7 +1165,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void consolidated_cluster_state_reflects_node_changes_when_cluster_is_down() throws Exception {
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setMaxTransitionTime(NodeType.STORAGE, 0);
         options.setMinStorageNodesUp(10);
         options.setMinDistributorNodesUp(10);
@@ -1199,7 +1199,7 @@ public class StateChangeTest extends FleetControllerTest {
     // of previous timer invocations (with subsequent state generation) would not be visible.
     @Test
     void timer_events_during_cluster_down_observe_most_recent_node_changes() throws Exception {
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setMaxTransitionTime(NodeType.STORAGE, 1000);
         options.setMinStorageNodesUp(10);
         options.setMinDistributorNodesUp(10);
@@ -1234,7 +1234,7 @@ public class StateChangeTest extends FleetControllerTest {
 
     @Test
     void do_not_emit_multiple_events_when_node_state_does_not_match_versioned_state() throws Exception {
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         initialize(options.build());
 
         ctrl.tick();
@@ -1409,7 +1409,7 @@ public class StateChangeTest extends FleetControllerTest {
     }
 
     private static FleetControllerOptions.Builder optionsWithZeroTransitionTime() {
-        FleetControllerOptions.Builder options = defaultOptions("mycluster", createNodes(10));
+        FleetControllerOptions.Builder options = defaultOptions();
         options.setMaxTransitionTime(NodeType.STORAGE, 0);
         return options;
     }