diff options
Diffstat (limited to 'config-model/src/test')
3 files changed, 0 insertions, 41 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index 0390ea14fa4..a388fdd1b3d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -15,10 +15,7 @@ import com.yahoo.container.core.ApplicationMetadataConfig; import com.yahoo.container.di.config.PlatformBundlesConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster.AppDimensionNames; -import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.PlatformBundles; -import com.yahoo.vespa.model.container.component.AccessLogComponent; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.Handler; import org.junit.jupiter.api.Test; @@ -42,8 +39,6 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.servicesWithAdminOnly; import static java.util.stream.Collectors.toSet; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -117,29 +112,6 @@ public class MetricsProxyContainerClusterTest { assertNodeConfig(config.node(1)); } - @Test - void no_access_logging_self_hosted() { - VespaModel hostedModel = getModel(servicesWithTwoNodes(), self_hosted); - assertNull(getAccessLogComponent(hostedModel.getAdmin().getMetricsProxyCluster())); - } - - @Test - void access_logging_hosted() { - VespaModel hostedModel = getModel(servicesWithTwoNodes(), hosted); - var accessLog = getAccessLogComponent(hostedModel.getAdmin().getMetricsProxyCluster()); - assertNotNull(accessLog); - assertEquals("logs/vespa/access/JsonAccessLog.metrics-proxy.%Y%m%d%H%M%S", accessLog.getFileNamePattern()); - } - - private AccessLogComponent getAccessLogComponent(ContainerCluster<? extends Container> cluster) { - for (Component<?, ?> component : cluster.getAllComponents()) { - if (component instanceof AccessLogComponent) - return (AccessLogComponent) component; - } - return null; - } - - private void assertNodeConfig(MetricsNodesConfig.Node node) { assertTrue(node.role().startsWith("container/foo/0/")); assertTrue(node.hostname().startsWith("node-1-3-50-")); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java index fbf7454de50..05e83de9157 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java @@ -11,7 +11,6 @@ import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; import com.yahoo.container.core.AccessLogConfig; -import com.yahoo.container.logging.AccessLog; import com.yahoo.container.logging.ConnectionLogConfig; import com.yahoo.container.logging.FileConnectionLog; import com.yahoo.container.logging.JSONAccessLog; @@ -85,7 +84,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); assertNotNull(getJsonAccessLog("default")); assertNotNull(getVespaAccessLog("default")); - assertNotNull(getAccessLog("default")); { // vespa Component<?, ?> accessLogComponent = getComponent("default", VespaAccessLog.class.getName()); @@ -176,9 +174,4 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { logger.msgs.get(0).getSecond()); } - private Component<?, ?> getAccessLog(String clusterName) { - ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName); - return cluster.getComponentsMap().get(ComponentId.fromString((AccessLog.class.getName()))); - } - } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java index 4476e128196..430628238d9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java @@ -1,9 +1,6 @@ // Copyright Yahoo. 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.component.ComponentId; -import com.yahoo.container.logging.AccessLog; -import com.yahoo.container.logging.JSONAccessLog; import com.yahoo.messagebus.routing.Hop; import com.yahoo.messagebus.routing.HopBlueprint; import com.yahoo.messagebus.routing.PolicyDirective; @@ -246,9 +243,6 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest { } assertTrue(actualDocprocChains.containsAll(expectedDocprocChainStrings)); - - assertNotNull(docprocCluster.getComponentsMap().get(ComponentId.fromString(AccessLog.class.getName()))); - assertNotNull(docprocCluster.getComponentsMap().get(ComponentId.fromString(JSONAccessLog.class.getName()))); } } |