diff options
Diffstat (limited to 'config-model/src/test/java/com')
2 files changed, 30 insertions, 0 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 a388fdd1b3d..15cfcda7605 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,7 +15,10 @@ 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; @@ -39,6 +42,7 @@ 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.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -112,6 +116,25 @@ public class MetricsProxyContainerClusterTest { assertNodeConfig(config.node(1)); } + @Test + void no_access_logging_self_hosted() { + VespaModel hostedModel = getModel(servicesWithTwoNodes(), self_hosted); + assertFalse(hasAccessLogComponent(hostedModel.getAdmin().getMetricsProxyCluster())); + } + + @Test + void access_logging_hosted() { + VespaModel hostedModel = getModel(servicesWithTwoNodes(), hosted); + assertTrue(hasAccessLogComponent(hostedModel.getAdmin().getMetricsProxyCluster())); + } + + private boolean hasAccessLogComponent(ContainerCluster<? extends Container> cluster) { + for (Component<?, ?> component : cluster.getAllComponents()) { + if (component instanceof AccessLogComponent) return true; + } + return false; + } + 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 05e83de9157..332b6481784 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,6 +11,7 @@ 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; @@ -70,6 +71,11 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { return cluster.getComponentsMap().get(ComponentId.fromString((JSONAccessLog.class.getName()))); } + private Component<?, ?> getAccessLog(String clusterName) { + ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName); + return cluster.getComponentsMap().get(ComponentId.fromString((AccessLog.class.getName()))); + } + @Test void access_log_can_be_configured() { Element clusterElem = DomBuilderTest.parse( @@ -84,6 +90,7 @@ 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()); |