Rename Container(Cluster)Impl -> ApplicationContainer(Cluster)

12 files changed, 53 insertions, 69 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
index 1e6812ee2e3..8fa2d1e5e76 100644
--- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
@@ -3,8 +3,7 @@ package com.yahoo.config.model;
 
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerImpl;
+import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -29,7 +28,7 @@ public class QrserverAndGatewayPortAllocationTest {
         String appDir = "src/test/cfg/application/app_qrserverandgw/";
         VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg(appDir);
         VespaModel vespaModel = creator.create();
-        List<ContainerImpl> qrservers = vespaModel.getContainerClusters().get("container").getContainers();
+        List<ApplicationContainer> qrservers = vespaModel.getContainerClusters().get("container").getContainers();
         assertThat(qrservers.size(), is(1));
         assertThat(qrservers.get(0).getSearchPort(), is(Container.BASEPORT));
     }
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 0e9e66a66a7..f395ef680da 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
@@ -25,8 +25,8 @@ import com.yahoo.vespa.model.admin.Slobrok;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
-import com.yahoo.vespa.model.container.ContainerImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.content.ContentSearchCluster;
 import com.yahoo.vespa.model.content.StorageNode;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
@@ -112,8 +112,8 @@ public class ModelProvisioningTest {
                 + "</hosts>";
         VespaModelCreatorWithMockPkg creator = new VespaModelCreatorWithMockPkg(null, services);
         VespaModel model = creator.create(new DeployState.Builder().modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(new StringReader(hosts)), true)));
-        ContainerClusterImpl mydisc = model.getContainerClusters().get("mydisc");
-        ContainerClusterImpl mydisc2 = model.getContainerClusters().get("mydisc2");
+        ApplicationContainerCluster mydisc = model.getContainerClusters().get("mydisc");
+        ApplicationContainerCluster mydisc2 = model.getContainerClusters().get("mydisc2");
         assertThat(mydisc.getContainers().size(), is(3));
         assertThat(mydisc.getContainers().get(0).getConfigId(), is("mydisc/container.0"));
         assertTrue(mydisc.getContainers().get(0).isInitialized());
@@ -1712,17 +1712,17 @@ public class ModelProvisioningTest {
         }
     }
 
-    private void checkThatTldAndContainerRunningOnSameHostHaveSameId(Collection<ContainerClusterImpl> containerClusters,
+    private void checkThatTldAndContainerRunningOnSameHostHaveSameId(Collection<ApplicationContainerCluster> containerClusters,
                                                                      Collection<ContentCluster> contentClusters,
                                                                      int startIndexForContainerIds) {
         for (ContentCluster contentCluster : contentClusters) {
             String contentClusterName = contentCluster.getName();
             int i = 0;
-            for (ContainerClusterImpl containerCluster : containerClusters) {
+            for (ApplicationContainerCluster containerCluster : containerClusters) {
                 String containerClusterName = containerCluster.getName();
                 for (int j = 0; j < 2; j++) {
                     Dispatch tld = contentCluster.getSearch().getIndexed().getTLDs().get(2 * i + j);
-                    ContainerImpl container = containerCluster.getContainers().get(j);
+                    ApplicationContainer container = containerCluster.getContainers().get(j);
                     int containerConfigIdIndex = j + startIndexForContainerIds;
 
                     assertEquals(container.getHostName(), tld.getHostname());
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 95da485c822..2c8887b0247 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
@@ -19,8 +19,7 @@ import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.vespa.config.core.StateserverConfig;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.StatisticsComponent;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
@@ -218,7 +217,7 @@ public class AdminTestCase {
     public void testContainerMetricsSnapshotInterval() {
         VespaModel vespaModel = getVespaModel(TESTDIR + "metricconfig");
 
-        ContainerClusterImpl qrCluster = vespaModel.getContainerClusters().get("container");
+        ApplicationContainerCluster qrCluster = vespaModel.getContainerClusters().get("container");
         HealthMonitorConfig.Builder builder = new HealthMonitorConfig.Builder();
         qrCluster.getConfig(builder);
         HealthMonitorConfig qrClusterConfig = new HealthMonitorConfig(builder);
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 eae7e099c35..ba7fbef439c 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
@@ -37,7 +37,7 @@ public class ContainerClusterTest {
 
     @Test
     public void requireThatClusterInfoIsPopulated() {
-        ContainerClusterImpl cluster = newContainerCluster();
+        ApplicationContainerCluster cluster = newContainerCluster();
         ClusterInfoConfig config = getClusterInfoConfig(cluster);
         assertEquals("name", config.clusterId());
         assertEquals(2, config.nodeCount());
@@ -61,7 +61,7 @@ public class ContainerClusterTest {
                                                      .zone(new Zone(SystemName.cd, Environment.test, RegionName.from("some-region")))
                                                      .build();
         MockRoot root = new MockRoot("foo", state);
-        ContainerCluster cluster = new ContainerClusterImpl(root, "container0", "container1", state);
+        ContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state);
         ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder();
         cluster.getConfig(builder);
         ConfigserverConfig config = new ConfigserverConfig(builder);
@@ -70,11 +70,11 @@ public class ContainerClusterTest {
         assertEquals("cd", config.system());
     }
 
-    private ContainerClusterImpl createContainerCluster(MockRoot root, boolean isCombinedCluster) {
+    private ApplicationContainerCluster createContainerCluster(MockRoot root, boolean isCombinedCluster) {
         return createContainerCluster(root, isCombinedCluster, null);
     }
-    private ContainerClusterImpl createContainerCluster(MockRoot root, boolean isCombinedCluster, Integer memoryPercentage) {
-        ContainerClusterImpl cluster = new ContainerClusterImpl(root, "container0", "container1", root.getDeployState());
+    private ApplicationContainerCluster createContainerCluster(MockRoot root, boolean isCombinedCluster, Integer memoryPercentage) {
+        ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", root.getDeployState());
         if (isCombinedCluster)
             cluster.setHostClusterId("test-content-cluster");
         cluster.setMemoryPercentage(memoryPercentage);
@@ -127,13 +127,13 @@ public class ContainerClusterTest {
 
     private void verifyJvmArgs(boolean isHosted, boolean hasDocProc) {
         MockRoot root = createRoot(isHosted);
-        ContainerClusterImpl cluster = createContainerCluster(root, false);
+        ApplicationContainerCluster cluster = createContainerCluster(root, false);
         if (hasDocProc) {
             cluster.setDocproc(new ContainerDocproc(cluster, null));
         }
         addContainer(root.deployLogger(), cluster, "c1", "host-c1");
         assertEquals(1, cluster.getContainers().size());
-        ContainerImpl container = cluster.getContainers().get(0);
+        ApplicationContainer container = cluster.getContainers().get(0);
         verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions());
         container.setJvmOptions("initial");
         verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions());
@@ -189,7 +189,7 @@ public class ContainerClusterTest {
     @Test
     public void requireThatWeCanhandleNull() {
         MockRoot root = createRoot(false);
-        ContainerClusterImpl cluster = createContainerCluster(root, false);
+        ApplicationContainerCluster cluster = createContainerCluster(root, false);
         addContainer(root.deployLogger(), cluster, "c1", "host-c1");
         Container container = cluster.getContainers().get(0);
         container.setJvmOptions("");
@@ -202,7 +202,7 @@ public class ContainerClusterTest {
     public void requireThatRoutingProviderIsDisabledForNonHosted() {
         DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(false)).build();
         MockRoot root = new MockRoot("foo", state);
-        ContainerClusterImpl cluster = new ContainerClusterImpl(root, "container0", "container1", state);
+        ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state);
         RoutingProviderConfig.Builder builder = new RoutingProviderConfig.Builder();
         cluster.getConfig(builder);
         RoutingProviderConfig config = new RoutingProviderConfig(builder);
@@ -211,8 +211,8 @@ public class ContainerClusterTest {
     }
 
 
-    private static void addContainer(DeployLogger deployLogger, ContainerClusterImpl cluster, String name, String hostName) {
-        ContainerImpl container = new ContainerImpl(cluster, name, 0, cluster.isHostedVespa());
+    private static void addContainer(DeployLogger deployLogger, ApplicationContainerCluster cluster, String name, String hostName) {
+        ApplicationContainer container = new ApplicationContainer(cluster, name, 0, cluster.isHostedVespa());
         container.setHostResource(new HostResource(new Host(null, hostName)));
         container.initService(deployLogger);
         cluster.addContainer(container);
@@ -225,10 +225,10 @@ public class ContainerClusterTest {
         cluster.addContainer(container);
     }
 
-    private static ContainerClusterImpl newContainerCluster() {
+    private static ApplicationContainerCluster newContainerCluster() {
         DeployState deployState = DeployState.createTestState();
         MockRoot root = new MockRoot("foo", deployState);
-        ContainerClusterImpl cluster = new ContainerClusterImpl(root, "subId", "name", deployState);
+        ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "subId", "name", deployState);
         addContainer(deployState.getDeployLogger(), cluster, "c1", "host-c1");
         addContainer(deployState.getDeployLogger(), cluster, "c2", "host-c2");
         return cluster;
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 7d7a664447d..183df4ce471 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
@@ -6,8 +6,7 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.container.core.AccessLogConfig;
 import com.yahoo.container.logging.JSONAccessLog;
 import com.yahoo.container.logging.VespaAccessLog;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import org.junit.Test;
 import org.w3c.dom.Element;
@@ -61,11 +60,11 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     }
 
     private Component<?, ?> getVespaAccessLog(String clusterName) {
-        ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get(clusterName);
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName);
         return cluster.getComponentsMap().get(ComponentId.fromString((VespaAccessLog.class.getName())));
     }
     private Component<?, ?> getJsonAccessLog(String clusterName) {
-        ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get(clusterName);
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName);
         return cluster.getComponentsMap().get(ComponentId.fromString((JSONAccessLog.class.getName())));
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index 15d49ef8873..1c971307fb3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -7,16 +7,14 @@ import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.container.ComponentsConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
 import com.yahoo.vespa.model.search.AbstractSearchCluster;
 import org.junit.Before;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.Collections;
 
 /**
@@ -70,8 +68,8 @@ public abstract class ContainerModelBuilderTestBase {
         return null;
     }
 
-    public ContainerClusterImpl getContainerCluster(String clusterId) {
-        return (ContainerClusterImpl) root.getChildren().get(clusterId);
+    public ApplicationContainerCluster getContainerCluster(String clusterId) {
+        return (ApplicationContainerCluster) root.getChildren().get(clusterId);
     }
 
     public Component<?, ?> getContainerComponent(String clusterId, String componentId) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
index 192acbda65d..a3aeeff6ca7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java
@@ -12,10 +12,8 @@ import com.yahoo.container.jdisc.ContainerMbusConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.HostPorts;
-import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
-import com.yahoo.vespa.model.container.ContainerImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.docproc.DocprocChain;
 import com.yahoo.vespa.model.container.docproc.DocumentProcessor;
@@ -39,7 +37,7 @@ import static org.junit.Assert.*;
  */
 public class DocprocBuilderTest extends DomBuilderTest {
 
-    private ContainerClusterImpl cluster;
+    private ApplicationContainerCluster cluster;
     private DocumentmanagerConfig documentmanagerConfig;
     private ContainerMbusConfig containerMbusConfig;
     private ComponentsConfig componentsConfig;
@@ -52,7 +50,7 @@ public class DocprocBuilderTest extends DomBuilderTest {
     @Before
     public void setupCluster() {
         ContainerModel model = new ContainerModelBuilder(false, Networking.disable).build(DeployState.createTestState(), null, null, root, servicesXml());
-        cluster = (ContainerClusterImpl) model.getCluster();
+        cluster = (ApplicationContainerCluster) model.getCluster();
         cluster.getDocproc().getChains().addServersAndClientsForChains();
         root.freezeModelTopology();
 
@@ -90,9 +88,9 @@ public class DocprocBuilderTest extends DomBuilderTest {
         assertThat(cluster.getDocproc().isCompressDocuments(), is(true));
         //assertThat(cluster.getContainerDocproc().isPreferLocalNode(), is(true));
         //assertThat(cluster.getContainerDocproc().getNumNodesPerClient(), is(2));
-        List<ContainerImpl> services = cluster.getContainers();
+        List<ApplicationContainer> services = cluster.getContainers();
         assertThat(services.size(), is(1));
-        ContainerImpl service = services.get(0);
+        ApplicationContainer service = services.get(0);
         assertThat(service, notNullValue());
 
         Map<String, DocprocChain> chains = new HashMap<>();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index bfed20a22c5..03e115f0608 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -6,7 +6,7 @@ import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.jdisc.FilterBindingsProvider;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
 import com.yahoo.vespa.model.container.http.ConnectorFactory;
 import com.yahoo.vespa.model.container.http.JettyHttpServer;
@@ -270,7 +270,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     private ComponentsConfig containerComponentsConfig() {
-        final ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get("default");
+        final ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get("default");
         return root.getConfig(
                 ComponentsConfig.class,
                 cluster.getContainers().get(0).getConfigId());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
index 791369b5312..2e5d2dc914c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
@@ -9,10 +9,8 @@ import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
-import com.yahoo.vespa.model.container.ContainerImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+import com.yahoo.vespa.model.container.ApplicationContainer;
 import org.junit.Test;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -48,24 +46,24 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase {
                 .build();
         //root = new MockRoot("root", applicationPackage);
         for (String region : Arrays.asList("us-north-1", "us-north-3")) {
-            ContainerImpl container = getContainer(applicationPackage, region, clusterElem);
+            ApplicationContainer container = getContainer(applicationPackage, region, clusterElem);
 
             assertEquals("Region " + region + " is active", "true",
                          container.getServicePropertyString("activeRotation"));
         }
         for (String region : Arrays.asList("us-north-2", "us-north-4")) {
-            ContainerImpl container = getContainer(applicationPackage, region, clusterElem);
+            ApplicationContainer container = getContainer(applicationPackage, region, clusterElem);
 
             assertEquals("Region " + region + " is inactive", "false",
                          container.getServicePropertyString("activeRotation"));
         }
-        ContainerImpl container = getContainer(applicationPackage, "unknown", clusterElem);
+        ApplicationContainer container = getContainer(applicationPackage, "unknown", clusterElem);
         assertEquals("Unknown region is inactive", "false",
                      container.getServicePropertyString("activeRotation"));
     }
 
 
-    private ContainerImpl getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException {
+    private ApplicationContainer getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException {
         DeployState deployState = new DeployState.Builder()
                 .applicationPackage(applicationPackage)
                 .zone(new Zone(Environment.prod, RegionName.from(region)))
@@ -73,7 +71,7 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase {
 
         root = new MockRoot("root", deployState);
         createModel(root, deployState, null, clusterElem);
-        ContainerClusterImpl cluster = getContainerCluster("default");
+        ApplicationContainerCluster cluster = getContainerCluster("default");
         return cluster.getContainers().get(0);
 
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 524e98b3f6d..4862c747742 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -4,20 +4,15 @@ package com.yahoo.vespa.model.container.xml;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.search.GUIHandler;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
 import static com.yahoo.test.Matchers.hasItemWithMethod;
@@ -48,7 +43,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
         assertThat(discBindingsConfig, containsString(GUIHandler.BINDING));
 
-        ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default");
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
 
         GUIHandler guiHandler = null;
         for (Handler<?> handler : cluster.getHandlers()) {
@@ -100,7 +95,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void cluster_with_only_search_gets_qrserver_as_service_name() throws Exception {
         createClusterWithOnlyDefaultChains();
-        ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default");
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
         assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName));
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index 97540f09b41..bf8e2a353cf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -9,8 +9,7 @@ import com.yahoo.messagebus.routing.RoutingTableSpec;
 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;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.routing.DocumentProtocol;
 import com.yahoo.vespa.model.routing.Routing;
@@ -278,7 +277,7 @@ public class IndexedTest extends ContentBaseTest {
     @Test
     public void requireThatIndexingDocprocGetsConfigIdBasedOnDistributionKey() {
         VespaModel model = getIndexedVespaModel();
-        ContainerClusterImpl cluster = model.getContainerClusters().get("jdisc");
+        ApplicationContainerCluster cluster = model.getContainerClusters().get("jdisc");
         assertEquals("jdisc/container.0", cluster.getContainers().get(0).getConfigId());
     }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
index c0ba932534f..216f90240f7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java
@@ -17,8 +17,7 @@ import com.yahoo.tensor.TensorType;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerClusterImpl;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -44,7 +43,7 @@ public class ModelEvaluationTest {
         try {
             ImportedModelTester tester = new ImportedModelTester("ml_serving", appDir);
             VespaModel model = tester.createVespaModel();
-            ContainerClusterImpl cluster = model.getContainerClusters().get("container");
+            ApplicationContainerCluster cluster = model.getContainerClusters().get("container");
             assertNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluator.class.getName())));
 
             RankProfilesConfig.Builder b = new RankProfilesConfig.Builder();
@@ -81,7 +80,7 @@ public class ModelEvaluationTest {
     }
 
     private void assertHasMlModels(VespaModel model) {
-        ContainerClusterImpl cluster = model.getContainerClusters().get("container");
+        ApplicationContainerCluster cluster = model.getContainerClusters().get("container");
         assertNotNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluator.class.getName())));
 
         assertNotNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluationHandler.class.getName())));