diff options
Diffstat (limited to 'config-model/src/test')
3 files changed, 30 insertions, 34 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 9126c678171..2f8a8bddf20 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -2379,10 +2379,8 @@ public class ModelProvisioningTest { " </content>" + "</services>"; VespaModelTester tester = new VespaModelTester(); - tester.setModelProperties(new TestProperties().setAllowMoreThanOneContentGroupDown(true)); tester.addHosts(9); - VespaModel model = tester.createModel(servicesXml, true, new DeployState.Builder() - .properties(new TestProperties().setAllowMoreThanOneContentGroupDown(true))); + VespaModel model = tester.createModel(servicesXml, true, new DeployState.Builder().properties(new TestProperties())); var fleetControllerConfigBuilder = new FleetcontrollerConfig.Builder(); model.getConfig(fleetControllerConfigBuilder, "admin/standalone/cluster-controllers/0/components/clustercontroller-content-configurer"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index d9632b62fb2..1360ca259dd 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -1413,32 +1413,32 @@ public class ContentClusterTest extends ContentBaseTest { @Test void testGroupsAllowedToBeDown() { - assertGroupsAllowedsDown(1, 0.5, 1); - assertGroupsAllowedsDown(2, 0.5, 1); - assertGroupsAllowedsDown(3, 0.5, 1); - assertGroupsAllowedsDown(4, 0.5, 2); - assertGroupsAllowedsDown(5, 0.5, 2); - assertGroupsAllowedsDown(6, 0.5, 3); - - assertGroupsAllowedsDown(1, 0.33, 1); - assertGroupsAllowedsDown(2, 0.33, 1); - assertGroupsAllowedsDown(3, 0.33, 1); - assertGroupsAllowedsDown(4, 0.33, 1); - assertGroupsAllowedsDown(5, 0.33, 1); - assertGroupsAllowedsDown(6, 0.33, 1); - - assertGroupsAllowedsDown(1, 0.67, 1); - assertGroupsAllowedsDown(2, 0.67, 1); - assertGroupsAllowedsDown(3, 0.67, 2); - assertGroupsAllowedsDown(4, 0.67, 2); - assertGroupsAllowedsDown(5, 0.67, 3); - assertGroupsAllowedsDown(6, 0.67, 4); - - assertGroupsAllowedsDown(1, 0, 1); - assertGroupsAllowedsDown(2, 0, 1); - - assertGroupsAllowedsDown(1, 1, 1); - assertGroupsAllowedsDown(2, 1, 2); + assertGroupsAllowedDown(1, 0.5, 1); + assertGroupsAllowedDown(2, 0.5, 1); + assertGroupsAllowedDown(3, 0.5, 1); + assertGroupsAllowedDown(4, 0.5, 2); + assertGroupsAllowedDown(5, 0.5, 2); + assertGroupsAllowedDown(6, 0.5, 3); + + assertGroupsAllowedDown(1, 0.33, 1); + assertGroupsAllowedDown(2, 0.33, 1); + assertGroupsAllowedDown(3, 0.33, 1); + assertGroupsAllowedDown(4, 0.33, 1); + assertGroupsAllowedDown(5, 0.33, 1); + assertGroupsAllowedDown(6, 0.33, 1); + + assertGroupsAllowedDown(1, 0.67, 1); + assertGroupsAllowedDown(2, 0.67, 1); + assertGroupsAllowedDown(3, 0.67, 2); + assertGroupsAllowedDown(4, 0.67, 2); + assertGroupsAllowedDown(5, 0.67, 3); + assertGroupsAllowedDown(6, 0.67, 4); + + assertGroupsAllowedDown(1, 0, 1); + assertGroupsAllowedDown(2, 0, 1); + + assertGroupsAllowedDown(1, 1, 1); + assertGroupsAllowedDown(2, 1, 2); } private void assertIndexingDocprocEnabled(boolean indexed, boolean force, boolean expEnabled) { @@ -1478,9 +1478,9 @@ public class ContentClusterTest extends ContentBaseTest { assertIndexingDocprocEnabled(false, true, true); } - private void assertGroupsAllowedsDown(int groupCount, double groupsAllowedDown, int expectedGroupsAllowedDown) { + private void assertGroupsAllowedDown(int groupCount, double groupsAllowedDown, int expectedGroupsAllowedDown) { var services = servicesWithGroups(groupCount, groupsAllowedDown); - var model = createEnd2EndOneNode(new TestProperties().setAllowMoreThanOneContentGroupDown(true), services); + var model = createEnd2EndOneNode(new TestProperties(), services); var fleetControllerConfigBuilder = new FleetcontrollerConfig.Builder(); model.getConfig(fleetControllerConfigBuilder, "admin/cluster-controllers/0/components/clustercontroller-storage-configurer"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java index 2f7ed875226..0d7450aafd5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/FleetControllerClusterTest.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; -import com.yahoo.config.provision.ClusterSpec; import com.yahoo.vespa.config.content.FleetcontrollerConfig; import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; @@ -16,7 +15,6 @@ public class FleetControllerClusterTest { private FleetcontrollerConfig parse(String xml, TestProperties props) { var deployStateBuilder = new DeployState.Builder().properties(props); - props.allowMoreThanOneContentGroupDown(new ClusterSpec.Id("default")); var mockPkg = new VespaModelCreatorWithMockPkg(null, xml, ApplicationPackageUtils.generateSchemas("type1")); var model = mockPkg.create(deployStateBuilder); var builder = new FleetcontrollerConfig.Builder(); @@ -48,7 +46,7 @@ public class FleetControllerClusterTest { </cluster-controller> </tuning> </content>""", - new TestProperties().setAllowMoreThanOneContentGroupDown(true)); + new TestProperties()); assertEquals(13 * 1000, config.init_progress_time()); assertEquals(27 * 1000, config.storage_transition_time()); |