Revert "Remove access logging for container clusters that are internal"

1 files changed, 0 insertions, 23 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 15cfcda7605..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,7 +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.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -116,25 +112,6 @@ 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-"));