diff options
Diffstat (limited to 'config-model/src/test/java')
9 files changed, 40 insertions, 50 deletions
diff --git a/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java b/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java index e920672646f..c959634019d 100644 --- a/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/SchemaTestCase.java @@ -1,17 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.schema; -import com.yahoo.document.Document; import com.yahoo.schema.document.Stemming; import com.yahoo.schema.parser.ParseException; import com.yahoo.schema.processing.ImportedFieldsResolver; import com.yahoo.schema.processing.OnnxModelTypeResolver; import com.yahoo.vespa.documentmodel.DocumentSummary; -import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; -import com.yahoo.vespa.indexinglanguage.expressions.Expression; -import com.yahoo.vespa.indexinglanguage.expressions.InputExpression; -import com.yahoo.vespa.indexinglanguage.expressions.ScriptExpression; -import com.yahoo.vespa.indexinglanguage.expressions.StatementExpression; import com.yahoo.vespa.model.test.utils.DeployLoggerStub; import org.junit.jupiter.api.Test; diff --git a/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java index 423bc0b1798..61d636d911f 100644 --- a/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/VsmFieldsTestCase.java @@ -32,7 +32,8 @@ public class VsmFieldsTestCase { private static VsmfieldsConfig vsmfieldsConfig(Schema schema) { VsmFields vsmFields = new VsmFields(schema); VsmfieldsConfig.Builder cfgBuilder = new VsmfieldsConfig.Builder(); - vsmFields.getConfig(cfgBuilder);return cfgBuilder.build(); + vsmFields.getConfig(cfgBuilder); + return cfgBuilder.build(); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java index af825ca544a..ac431f081ed 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java @@ -6,15 +6,18 @@ import ai.vespa.metricsproxy.metric.dimensions.NodeDimensionsConfig; import ai.vespa.metricsproxy.metric.dimensions.PublicDimensions; import ai.vespa.metricsproxy.rpc.RpcConnectorConfig; import ai.vespa.metricsproxy.service.VespaServicesConfig; +import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.vespa.model.VespaModel; import org.junit.jupiter.api.Test; +import java.util.Iterator; + import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; +import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CLUSTER_CONFIG_ID; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CONTAINER_CONFIG_ID; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.hosted; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted; -import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.containerConfigId; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getModel; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getRpcConnectorConfig; @@ -104,12 +107,22 @@ public class MetricsProxyContainerTest { assertEquals("", container.getPreLoad()); } + String hostedConfigIdForHost(VespaModel model, int index) { + HostInfo hostInfo = null; + for (Iterator<HostInfo> iter = model.getHosts().iterator(); iter.hasNext(); index--) { + hostInfo = iter.next(); + if (index == 0) break; + } + return CLUSTER_CONFIG_ID + "/" + hostInfo.getHostname(); + } + @Test void hosted_application_propagates_node_dimensions() { String services = hostedServicesWithContent(); - VespaModel hostedModel = getModel(services, hosted); - assertEquals(4, hostedModel.getHosts().size()); - String configId = containerConfigId(hostedModel, hosted); + VespaModel hostedModel = getModel(services, hosted, new DeployState.Builder(), 5); + assertEquals(5, hostedModel.getHosts().size()); + String configId = hostedConfigIdForHost(hostedModel, 1); + NodeDimensionsConfig config = getNodeDimensionsConfig(hostedModel, configId); assertEquals("content", config.dimensions(PublicDimensions.INTERNAL_CLUSTER_TYPE)); @@ -120,9 +133,10 @@ public class MetricsProxyContainerTest { @Test void metrics_v2_handler_is_set_up_with_node_info_config() { String services = hostedServicesWithContent(); - VespaModel hostedModel = getModel(services, hosted); + VespaModel hostedModel = getModel(services, hosted, new DeployState.Builder(), 5); - var container = (MetricsProxyContainer) hostedModel.id2producer().get(containerConfigId(hostedModel, hosted)); + String configId = hostedConfigIdForHost(hostedModel, 1); + var container = (MetricsProxyContainer) hostedModel.id2producer().get(configId); var handlers = container.getHandlers().getComponents(); assertEquals(1, handlers.size()); @@ -136,7 +150,7 @@ public class MetricsProxyContainerTest { @Test void vespa_services_config_has_all_services() { VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent()); - assertEquals(9, vespaServicesConfig.service().size()); + assertEquals(10, vespaServicesConfig.service().size()); for (var service : vespaServicesConfig.service()) { if (service.configId().equals("admin/cluster-controllers/0")) { @@ -178,6 +192,9 @@ public class MetricsProxyContainerTest { private static String hostedServicesWithContent() { return String.join("\n", "<services>", + " <container version='1.0' id='foo'>", + " <nodes count='1'/>", + " </container>", " <content version='1.0' id='my-content'>", " <redundancy>1</redundancy>" + " <documents />", diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java index 332426ff9a8..c356db31d15 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java @@ -12,7 +12,6 @@ import ai.vespa.metricsproxy.service.VespaServicesConfig; import com.yahoo.config.model.api.ApplicationClusterEndpoint; import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer; import com.yahoo.vespa.model.test.VespaModelTester; @@ -47,7 +46,7 @@ class MetricsProxyModelTester { } static VespaModel getModel(String servicesXml, TestMode testMode, DeployState.Builder builder) { - return getModel(servicesXml, testMode, new DeployState.Builder(), 4); + return getModel(servicesXml, testMode, builder, 4); } static VespaModel getModel(String servicesXml, TestMode testMode, DeployState.Builder builder, int hostCount) { @@ -62,12 +61,6 @@ class MetricsProxyModelTester { return tester.createModel(servicesXml, true, builder); } - static String containerConfigId(VespaModel model, MetricsProxyModelTester.TestMode mode) { - return (mode == hosted) - ? CLUSTER_CONFIG_ID + "/" + model.getHosts().iterator().next().getHostname() - : CONTAINER_CONFIG_ID; - } - static String servicesWithAdminOnly() { return String.join("\n", "<services>", @@ -112,10 +105,6 @@ class MetricsProxyModelTester { return model.getConfig(ApplicationDimensionsConfig.class, CLUSTER_CONFIG_ID); } - static QrStartConfig getQrStartConfig(VespaModel model, String hostname) { - return model.getConfig(QrStartConfig.class, CLUSTER_CONFIG_ID + "/" + hostname); - } - static NodeDimensionsConfig getNodeDimensionsConfig(VespaModel model, String configId) { return model.getConfig(NodeDimensionsConfig.class, configId); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java index b6484049eaf..61cde1e1c13 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java @@ -42,12 +42,6 @@ public class ContainerInCloudValidatorTest { String servicesXml = """ <services version='1.0'> %s - <content id='foo' version='1.0'> - <redundancy>2</redundancy> - <documents> - </documents> - <nodes count='2' /> - </content> </services> """.formatted(container); ApplicationPackage app = new MockApplicationPackage.Builder() 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 29279635918..42ca2a8001b 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 @@ -24,7 +24,6 @@ import java.time.Instant; import java.time.LocalDate; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; @@ -33,7 +32,6 @@ import java.util.stream.Stream; import static com.yahoo.config.model.test.MockApplicationPackage.BOOK_SCHEMA; import static com.yahoo.config.model.test.MockApplicationPackage.MUSIC_SCHEMA; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; /** 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 43ea0191ca5..f8adb18a2c3 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 @@ -213,7 +213,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertEquals(1, cluster.getRoot().hostSystem().getHosts().size()); HostResource h = cluster.getRoot().hostSystem().getHost("mockhost"); String [] expectedServices = { - "logd", "configproxy", "config-sentinel", "configserver", "logserver", + "logd", "configproxy", "config-sentinel", "configserver", "container", "logserver", "slobrok", "storagenode", "distributor", "searchnode", "transactionlogserver", CLUSTERCONTROLLER_CONTAINER.serviceName, METRICS_PROXY_CONTAINER.serviceName }; 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 d4087c0acf9..a2f68ec8f18 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 @@ -1440,41 +1440,34 @@ public class ContentClusterTest extends ContentBaseTest { assertGroupsAllowedDown(2, 1, 2); } - private void assertIndexingDocprocEnabled(boolean indexed, boolean force, boolean expEnabled) { + private void assertIndexingDocprocEnabled(boolean indexed) { String services = "<?xml version='1.0' encoding='UTF-8' ?>" + "<services version='1.0'>" + " <container id='default' version='1.0'>" + - " <document-processing/>" + + " <search/>" + " </container>" + " <content id='search' version='1.0'>" + " <redundancy>1</redundancy>" + " <documents>" + - " <document-processing cluster='default'" + (force ? " chain='indexing'" : "") + "/>" + " <document type='type1' mode='" + (indexed ? "index" : "streaming") + "'/>" + " </documents>" + " </content>" + "</services>"; VespaModel model = createEnd2EndOneNode(new TestProperties(), services); var searchCluster = model.getContentClusters().get("search").getSearch(); - assertEquals(expEnabled, searchCluster.getIndexingDocproc().isPresent()); + assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); } @Test void testIndexingDocprocEnabledWhenIndexMode() { - assertIndexingDocprocEnabled(true, false, true); + assertIndexingDocprocEnabled(true); } @Test void testIndexingDocprocNotEnabledWhenStreamingMode() { - assertIndexingDocprocEnabled(false, false, false); - } - - @Test - void testIndexingDocprocEnabledWhenStreamingModeAndForced() - { - assertIndexingDocprocEnabled(false, true, true); + assertIndexingDocprocEnabled(false); } private void assertGroupsAllowedDown(int groupCount, double groupsAllowedDown, int expectedGroupsAllowedDown) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java index e37999ded12..3defaad549c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java @@ -65,9 +65,13 @@ public class StorageContentTest extends ContentBaseTest { DocumentProtocol protocol = (DocumentProtocol) routing.getProtocols().get(0); RoutingTableSpec spec = protocol.getRoutingTableSpec(); - assertEquals(1, spec.getNumHops()); - assertEquals("indexing", spec.getHop(0).getName()); - assertEquals("[DocumentRouteSelector]", spec.getHop(0).getSelector()); + assertEquals(3, spec.getNumHops()); + assertEquals("docproc/cluster.bar.indexing/chain.indexing", spec.getHop(0).getName()); + assertEquals("[LoadBalancer:cluster=docproc/cluster.bar.indexing;session=chain.indexing]", spec.getHop(0).getSelector()); + assertEquals("docproc/cluster.zoo.indexing/chain.indexing", spec.getHop(1).getName()); + assertEquals("[LoadBalancer:cluster=docproc/cluster.zoo.indexing;session=chain.indexing]", spec.getHop(1).getSelector()); + assertEquals("indexing", spec.getHop(2).getName()); + assertEquals("[DocumentRouteSelector]", spec.getHop(2).getSelector()); Map<String, RouteSpec> routes = new TreeMap<>(); |