Add class for LogserverContainerCluster

3 files changed, 25 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index c6a2e0f52b1..fe3e5960446 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -70,7 +70,7 @@ public class Admin extends AbstractConfigProducer implements Serializable {
     /**
      * Cluster for container that might be running on logserver hosts
      */
-    private Optional<ContainerCluster> logServerContainerCluster = Optional.empty();
+    private Optional<LogserverContainerCluster> logServerContainerCluster = Optional.empty();
 
     private ZooKeepersConfigProvider zooKeepersConfigProvider;
     private FileDistributionConfigProducer fileDistribution;
@@ -133,9 +133,9 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         this.clusterControllers = clusterControllers;
     }
 
-    public Optional<ContainerCluster> getLogServerContainerCluster() { return logServerContainerCluster; }
+    public Optional<LogserverContainerCluster> getLogServerContainerCluster() { return logServerContainerCluster; }
 
-    public void setLogserverContainerCluster(ContainerCluster logServerContainerCluster) {
+    public void setLogserverContainerCluster(LogserverContainerCluster logServerContainerCluster) {
         this.logServerContainerCluster = Optional.of(logServerContainerCluster);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
new file mode 100644
index 00000000000..2dd852e5d97
--- /dev/null
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
@@ -0,0 +1,20 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.admin;
+
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.vespa.model.container.ContainerCluster;
+
+/**
+ * @author gjoranv
+ */
+public class LogserverContainerCluster extends ContainerCluster<LogserverContainer> {
+
+    public LogserverContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
+        super(parent, subId, name, deployState);
+    }
+
+    @Override
+    protected void myPrepare(DeployState deployState) { }
+
+}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 948f7677096..cd36b307270 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.model.HostSystem;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.admin.Logserver;
 import com.yahoo.vespa.model.admin.LogserverContainer;
+import com.yahoo.vespa.model.admin.LogserverContainerCluster;
 import com.yahoo.vespa.model.admin.Slobrok;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
@@ -106,7 +107,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     // Creates a container cluster 'logs' with a container on the logserver host
     // that has a handler for getting logs
     private void createContainerOnLogserverHost(DeployState deployState, Admin admin, HostResource hostResource) {
-        ContainerCluster logServerCluster = new ContainerClusterImpl(admin, "logs", "logs", deployState);
+        LogserverContainerCluster logServerCluster = new LogserverContainerCluster(admin, "logs", "logs", deployState);
         ContainerModel logserverClusterModel = new ContainerModel(context.withParent(admin).withId(logServerCluster.getSubId()));
         logserverClusterModel.setCluster(logServerCluster);