diff options
Diffstat (limited to 'config-model/src/test')
14 files changed, 90 insertions, 101 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java index aa29ebd9825..383446228cc 100644 --- a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java @@ -2,9 +2,9 @@ package com.yahoo.config.model.deploy; import com.yahoo.config.application.api.ApplicationPackage; -import com.yahoo.config.codegen.InnerCNode; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.api.HostProvisioner; +import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; @@ -23,13 +23,11 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; /** * @author Ulf Lilleengen @@ -69,7 +67,7 @@ public class DeployStateTest { ApplicationId customId = new ApplicationId.Builder() .tenant("bar") .applicationName("foo").instanceName("quux").build(); - DeployProperties properties = new DeployProperties.Builder().applicationId(customId).build(); + ModelContext.Properties properties = new TestProperties().setApplicationId(customId); builder.properties(properties); state = builder.build(); assertThat(state.getProperties().applicationId(), is(customId)); 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 3eb1d51a57e..588a722d476 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 @@ -4,13 +4,10 @@ package com.yahoo.config.model.provision; import com.yahoo.cloud.config.log.LogdConfig; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.api.HostInfo; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.provision.ClusterMembership; -import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; -import com.yahoo.config.provision.RegionName; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.config.provisioning.FlavorsConfig; import com.yahoo.container.core.ApplicationMetadataConfig; @@ -1619,7 +1616,7 @@ public class ModelProvisioningTest { VespaModelCreatorWithMockPkg modelCreatorWithMockPkg = new VespaModelCreatorWithMockPkg(hosts, services, ApplicationPackageUtils.generateSearchDefinition("type1")); ApplicationPackage appPkg = modelCreatorWithMockPkg.appPkg; DeployState deployState = new DeployState.Builder().applicationPackage(appPkg). - properties((new DeployProperties.Builder()).multitenant(multitenant).build()). + properties((new TestProperties()).setMultitenant(multitenant)). build(); return modelCreatorWithMockPkg.create(false, deployState); } @@ -1816,9 +1813,8 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.useDedicatedNodeForLogserver(useDedicatedNodeForLogserver); tester.addHosts(numberOfHosts); - Zone zone = new Zone(SystemName.cd, Environment.dev, RegionName.defaultName()); - VespaModel model = tester.createModel(zone, services, true); + VespaModel model = tester.createModel(Zone.defaultZone(), services, true); assertThat(model.getRoot().getHostSystem().getHosts().size(), is(numberOfHosts)); Admin admin = model.getAdmin(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java index 93f87ef033b..795da289569 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java @@ -1,13 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin; +import com.yahoo.cloud.config.SentinelConfig; import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.cloud.config.SlobroksConfig.Slobrok; import com.yahoo.cloud.config.log.LogdConfig; -import com.yahoo.cloud.config.SentinelConfig; import com.yahoo.config.model.ApplicationConfigProducerRoot; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.TestDriver; import com.yahoo.config.model.test.TestRoot; import com.yahoo.config.provision.ApplicationId; @@ -154,13 +154,12 @@ public class AdminTestCase { public void testTenantAndAppInSentinelConfig() { DeployState state = new DeployState.Builder() .zone(new Zone(Environment.dev, RegionName.from("baz"))) - .properties(new DeployProperties.Builder() - .applicationId(new ApplicationId.Builder() - .tenant("quux") - .applicationName("foo") - .instanceName("bim") - .build()) - .build()) + .properties(new TestProperties() + .setApplicationId(new ApplicationId.Builder() + .tenant("quux") + .applicationName("foo") + .instanceName("bim") + .build())) .build(); TestRoot root = new TestDriver().buildModel(state); String localhost = HostName.getLocalhost(); @@ -281,12 +280,11 @@ public class AdminTestCase { DeployState state = new DeployState.Builder() .zone(new Zone(Environment.dev, RegionName.from("baz"))) .properties( - new DeployProperties.Builder(). - applicationId(new ApplicationId.Builder(). + new TestProperties(). + setApplicationId(new ApplicationId.Builder(). tenant("quux"). applicationName("foo").instanceName("bim") - .build()) - .build()) + .build())) .build(); TestRoot root = new TestDriver().buildModel(state); String localhost = HostName.getLocalhost(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java index 0b9aeb9f188..9f68b8b32bd 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java @@ -3,10 +3,10 @@ package com.yahoo.vespa.model.admin; import com.yahoo.cloud.config.LogforwarderConfig; import com.yahoo.cloud.config.SentinelConfig; -import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.application.api.ApplicationPackage; -import com.yahoo.config.model.deploy.DeployProperties; +import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.Hosts; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; @@ -27,7 +27,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen @@ -188,9 +190,7 @@ public class DedicatedAdminV4Test { VespaModel model = createModel(hosts, services, new DeployState.Builder() .zone(new Zone(SystemName.cd, Environment.dev, RegionName.defaultName())) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build())); + .properties(new TestProperties().setHostedVespa(true))); assertEquals(1, model.getHosts().size()); // Should create a container on the same node as logserver assertHostContainsServices(model, "hosts/myhost0", "slobrok", "logd", "logserver", "container"); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java index e4338436076..da81c74fdd2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java @@ -3,8 +3,8 @@ package com.yahoo.vespa.model.application.validation; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.NullConfigModelRegistry; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -82,9 +82,7 @@ public class SecretStoreValidatorTest { DeployState.Builder builder = new DeployState.Builder() .applicationPackage(app) .zone(new Zone(Environment.prod, RegionName.from("foo"))) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build()); + .properties(new TestProperties().setHostedVespa(true)); final DeployState deployState = builder.build(); assertTrue("Test must emulate a hosted deployment.", deployState.isHosted()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java index 7082dec2c78..a95ae1d1706 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java @@ -5,14 +5,12 @@ import com.google.common.collect.ImmutableList; import com.yahoo.collections.Pair; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.api.ConfigChangeAction; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; -import static com.yahoo.config.model.test.MockApplicationPackage.MUSIC_SEARCHDEFINITION; -import static com.yahoo.config.model.test.MockApplicationPackage.BOOK_SEARCHDEFINITION; import java.time.Instant; import java.time.LocalDate; @@ -20,6 +18,9 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.List; +import static com.yahoo.config.model.test.MockApplicationPackage.BOOK_SEARCHDEFINITION; +import static com.yahoo.config.model.test.MockApplicationPackage.MUSIC_SEARCHDEFINITION; + /** * @author bratseth */ @@ -55,7 +56,7 @@ public class ValidationTester { VespaModelCreatorWithMockPkg newModelCreator = new VespaModelCreatorWithMockPkg(newApp); DeployState.Builder deployStateBuilder = new DeployState.Builder() .applicationPackage(newApp) - .properties(new DeployProperties.Builder().hostedVespa(true).build()) + .properties(new TestProperties().setHostedVespa(true)) .modelHostProvisioner(new InMemoryProvisioner(nodeCount)) .now(now); if (previousModel != null) diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java index d3549eb6513..84a5b69c5f2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidatorTest.java @@ -3,8 +3,8 @@ package com.yahoo.vespa.model.application.validation.first; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.NullConfigModelRegistry; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -141,9 +141,7 @@ public class AccessControlValidatorTest { DeployState.Builder builder = new DeployState.Builder() .applicationPackage(app) .zone(new Zone(Environment.prod, RegionName.from("foo")) ) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build()); + .properties(new TestProperties().setHostedVespa(true)); final DeployState deployState = builder.build(); assertTrue("Test must emulate a hosted deployment.", deployState.isHosted()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index a5cf26f4d80..2c3e447533d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -4,25 +4,28 @@ package com.yahoo.vespa.model.builder.xml.dom; import com.yahoo.collections.CollectionUtil; import com.yahoo.config.ConfigInstance; import com.yahoo.config.application.api.ApplicationPackage; -import com.yahoo.config.model.deploy.DeployProperties; +import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; -import com.yahoo.vespa.config.search.core.PartitionsConfig; -import com.yahoo.vespa.config.search.core.ProtonConfig; -import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.text.StringUtilities; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.config.ConfigPayloadBuilder; import com.yahoo.vespa.config.GenericConfig; +import com.yahoo.vespa.config.search.core.PartitionsConfig; +import com.yahoo.vespa.config.search.core.ProtonConfig; import com.yahoo.vespa.model.HostResource; import com.yahoo.vespa.model.Service; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.content.ContentSearchCluster; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.content.engines.ProtonEngine; -import com.yahoo.vespa.model.search.*; +import com.yahoo.vespa.model.search.AbstractSearchCluster; +import com.yahoo.vespa.model.search.Dispatch; +import com.yahoo.vespa.model.search.IndexedSearchCluster; +import com.yahoo.vespa.model.search.SearchNode; +import com.yahoo.vespa.model.search.StreamingSearchCluster; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; - import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -33,7 +36,13 @@ import java.util.List; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author baldersheim @@ -797,10 +806,7 @@ public class ContentBuilderTest extends DomBuilderTest { "</content>" + "</services>"; - DeployState.Builder deployStateBuilder = new DeployState.Builder().properties( - new DeployProperties.Builder() - .hostedVespa(true) - .build()); + DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().setHostedVespa(true)); VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder() .withServices(hostedXml) .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION) diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 121b1cd4f4d..303799d4346 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -5,8 +5,8 @@ import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.cloud.config.RoutingProviderConfig; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockRoot; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -60,7 +60,7 @@ public class ContainerClusterTest { @Test public void requreThatWeCanGetTheZoneConfig() { - DeployState state = new DeployState.Builder().properties(new DeployProperties.Builder().hostedVespa(true).build()) + DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(true)) .zone(new Zone(SystemName.cd, Environment.test, RegionName.from("some-region"))) .build(); MockRoot root = new MockRoot("foo", state); @@ -89,11 +89,11 @@ public class ContainerClusterTest { return createContainerCluster(root, isCombinedCluster, memoryPercentage, Optional.empty()); } private MockRoot createRoot(boolean isHosted) { - DeployState state = new DeployState.Builder().properties(new DeployProperties.Builder().hostedVespa(isHosted).build()).build(); + DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(isHosted)).build(); return new MockRoot("foo", state); } private MockRoot createRoot(boolean isHosted, Zone zone) { - DeployState state = new DeployState.Builder().zone(zone).properties(new DeployProperties.Builder().hostedVespa(isHosted).build()).build(); + DeployState state = new DeployState.Builder().zone(zone).properties(new TestProperties().setHostedVespa(isHosted)).build(); return new MockRoot("foo", state); } private ContainerCluster createContainerCluster(MockRoot root, boolean isCombinedCluster, @@ -252,7 +252,7 @@ public class ContainerClusterTest { @Test public void requireThatRoutingProviderIsDisabledForNonHosted() { - DeployState state = new DeployState.Builder().properties(new DeployProperties.Builder().hostedVespa(false).build()).build(); + DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(false)).build(); MockRoot root = new MockRoot("foo", state); ContainerCluster cluster = new ContainerCluster(root, "container0", "container1", state); RoutingProviderConfig.Builder builder = new RoutingProviderConfig.Builder(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java index bc812e12f43..65866a5e3b8 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java @@ -1,8 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.search; -import com.yahoo.config.model.deploy.DeployProperties; +import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.vespa.model.VespaModel; @@ -49,7 +50,7 @@ public class ImplicitIndexingClusterTest { "</http>\n"; private static VespaModel buildMultiTenantVespaModel(String servicesXml) { - DeployProperties properties = new DeployProperties.Builder().multitenant(true).hostedVespa(true).build(); + ModelContext.Properties properties = new TestProperties().setMultitenant(true).setHostedVespa(true); DeployState.Builder deployStateBuilder = new DeployState.Builder() .properties(properties) .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com", "host2.yahoo.com", "host3.yahoo.com")); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 15c017d86e3..7824149f92d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -7,8 +7,8 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.producer.AbstractConfigProducerRoot; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; @@ -112,9 +112,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { .applicationPackage(applicationPackage) .deployLogger(logger) .zone(new Zone(SystemName.cd, Environment.dev, RegionName.from("here"))) - .properties(new DeployProperties.Builder() - .hostedVespa(isHosted) - .build()) + .properties(new TestProperties().setHostedVespa(isHosted)) .build()); QrStartConfig.Builder qrStartBuilder = new QrStartConfig.Builder(); model.getConfig(qrStartBuilder, "jdisc/container.0"); @@ -142,9 +140,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { .applicationPackage(applicationPackage) .deployLogger(logger) .zone(zone) - .properties(new DeployProperties.Builder() - .hostedVespa(isHosted) - .build()) + .properties(new TestProperties().setHostedVespa(isHosted)) .build()); QrStartConfig.Builder qrStartBuilder = new QrStartConfig.Builder(); model.getConfig(qrStartBuilder, "jdisc/container.0"); @@ -212,9 +208,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder() .applicationPackage(applicationPackage) .deployLogger(logger) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build()) + .properties(new TestProperties().setHostedVespa(true)) .build()); assertFalse(logger.msgs.isEmpty()); assertThat(logger.msgs.get(0).getSecond(), containsString(String.format("You cannot set port to anything else than %d", Container.BASEPORT))); @@ -609,10 +603,9 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder() .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com", "host2.yahoo.com")) .applicationPackage(applicationPackage) - .properties(new DeployProperties.Builder() - .multitenant(true) - .hostedVespa(true) - .build()) + .properties(new TestProperties() + .setMultitenant(true) + .setHostedVespa(true)) .build()); assertEquals(1, model.getHostSystem().getHosts().size()); } @@ -643,9 +636,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { ApplicationPackage applicationPackage = new MockApplicationPackage.Builder().withServices(servicesXml).build(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder() .applicationPackage(applicationPackage) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build()) + .properties(new TestProperties().setHostedVespa(true)) .build()); AbstractConfigProducerRoot modelRoot = model.getRoot(); @@ -673,7 +664,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { .build(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder() .applicationPackage(applicationPackage) - .properties(new DeployProperties.Builder().build()) + .properties(new TestProperties()) .build()); String hostname = HostName.getLocalhost(); // Using the same way of getting hostname as filedistribution model 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 057ef0efbd6..e2337c42cf3 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 @@ -1,21 +1,21 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.content; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockRoot; import com.yahoo.config.model.test.TestDriver; import com.yahoo.config.model.test.TestRoot; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig; -import com.yahoo.vespa.config.content.StorFilestorConfig; -import com.yahoo.vespa.config.content.core.StorServerConfig; +import com.yahoo.metrics.MetricsmanagerConfig; import com.yahoo.vespa.config.content.AllClustersBucketSpacesConfig; import com.yahoo.vespa.config.content.FleetcontrollerConfig; import com.yahoo.vespa.config.content.StorDistributionConfig; -import com.yahoo.metrics.MetricsmanagerConfig; +import com.yahoo.vespa.config.content.StorFilestorConfig; +import com.yahoo.vespa.config.content.core.StorDistributormanagerConfig; +import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.vespa.config.search.core.ProtonConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ContainerCluster; @@ -36,7 +36,13 @@ import java.util.List; import java.util.Optional; import static com.yahoo.test.PatternMatcher.matchesPattern; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class ContentClusterTest extends ContentBaseTest { @@ -768,7 +774,7 @@ public class ContentClusterTest extends ContentBaseTest { private static ContentCluster createOneNodeCluster(String clusterXml, boolean isHostedVespa) throws Exception { DeployState.Builder deployStateBuilder = new DeployState.Builder() - .properties(new DeployProperties.Builder().hostedVespa(isHostedVespa).build()); + .properties(new TestProperties().setHostedVespa(isHostedVespa)); MockRoot root = ContentClusterUtils.createMockRoot(Collections.emptyList(), deployStateBuilder); ContentCluster cluster = ContentClusterUtils.createCluster(clusterXml, root); root.freezeModelTopology(); @@ -866,9 +872,7 @@ public class ContentClusterTest extends ContentBaseTest { private ContentCluster createWithZone(String clusterXml, Zone zone) throws Exception { DeployState.Builder deployStateBuilder = new DeployState.Builder() .zone(zone) - .properties(new DeployProperties.Builder() - .hostedVespa(true) - .build()); + .properties(new TestProperties().setHostedVespa(true)); List<String> searchDefinitions = SearchDefinitionBuilder.createSearchDefinitions("test"); MockRoot root = ContentClusterUtils.createMockRoot(searchDefinitions, deployStateBuilder); ContentCluster cluster = ContentClusterUtils.createCluster(clusterXml, root); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java index 1a5ce0a10f4..5d842c6651c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java @@ -12,14 +12,14 @@ import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.model.api.ValidationParameters; import com.yahoo.config.model.application.provider.FilesApplicationPackage; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.HostsXmlProvisioner; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.model.test.TestDriver; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AllocatedHosts; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.messagebus.MessagebusConfig; import com.yahoo.net.HostName; @@ -279,10 +279,9 @@ public class VespaModelTestCase { DeployState deployState = new DeployState.Builder() .applicationPackage(applicationPackage) .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com")) - .properties(new DeployProperties.Builder() - .configServerSpecs(Arrays.asList(new Configserver.Spec("cfghost", 1234, 1235, 1236))) - .multitenant(true) - .build()) + .properties(new TestProperties() + .setConfigServerSpecs(Arrays.asList(new Configserver.Spec("cfghost", 1234, 1235, 1236))) + .setMultitenant(true)) .build(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); AllocatedHosts info = model.allocatedHosts(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java index 060fe96100d..672e2932ab6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java @@ -2,13 +2,12 @@ package com.yahoo.vespa.model.test; import com.google.common.collect.ImmutableList; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.ConfigModelRegistry; import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.api.HostProvisioner; -import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.Host; import com.yahoo.config.model.provision.Hosts; import com.yahoo.config.model.provision.InMemoryProvisioner; @@ -134,11 +133,11 @@ public class VespaModelTester { new InMemoryProvisioner(hostsByFlavor, failOnOutOfCapacity, startIndexForClusters, retiredHostNames) : new SingleNodeProvisioner(); - DeployProperties properties = new DeployProperties.Builder() - .hostedVespa(hosted) - .applicationId(applicationId) - .useDedicatedNodeForLogserver(useDedicatedNodeForLogserver) - .build(); + TestProperties properties = new TestProperties() + .setMultitenant(true) + .setHostedVespa(hosted) + .setApplicationId(applicationId) + .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver); DeployState deployState = new DeployState.Builder() .applicationPackage(appPkg) |