Fix missing wiring and enable test

3 files changed, 15 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 75f70d03fcc..2af9b297e9e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -156,6 +156,7 @@ public class VespaModelFactory implements ModelFactory {
                 .vespaVersion(getVersion())
                 .isBootstrap(properties.isBootstrap())
                 .isFirstTimeDeployment(properties.isFirstTimeDeployment())
+                .useDedicatedNodeForLogserver(properties.useDedicatedNodeForLogserver())
                 .build();
     }
 
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 dd28d45ef4d..32a881633b8 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
@@ -48,6 +48,7 @@ import java.util.stream.Collectors;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+import static org.hamcrest.CoreMatchers.both;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsIn.isIn;
 import static org.hamcrest.core.Every.everyItem;
@@ -947,11 +948,11 @@ public class ModelProvisioningTest {
                         "     <nodes count='1'/>" +
                         "  </container>" +
                         "</services>";
-        testContainerOnLogserverHost(services);
+        boolean useDedicatedNodeForLogserver = false;
+        testContainerOnLogserverHost(services, useDedicatedNodeForLogserver);
     }
 
     @Test
-    @Ignore // Ignore until we create container on logserver implicitly
     public void testImplicitLogserverContainer() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
@@ -960,7 +961,8 @@ public class ModelProvisioningTest {
                         "     <nodes count='1'/>" +
                         "  </container>" +
                         "</services>";
-        testContainerOnLogserverHost(services);
+        boolean useDedicatedNodeForLogserver = true;
+        testContainerOnLogserverHost(services, useDedicatedNodeForLogserver);
     }
 
     @Test
@@ -1751,9 +1753,10 @@ public class ModelProvisioningTest {
 
     // Tests that a container is allocated on logserver host and that
     // it is able to get config
-    private void testContainerOnLogserverHost(String services) {
+    private void testContainerOnLogserverHost(String services, boolean useDedicatedNodeForLogserver) {
         int numberOfHosts = 2;
         VespaModelTester tester = new VespaModelTester();
+        tester.useDedicatedNodeForLogserver(useDedicatedNodeForLogserver);
         tester.addHosts(numberOfHosts);
         Zone zone = new Zone(SystemName.cd, Environment.prod, RegionName.defaultName());
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 1023733a652..060fe96100d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.model.test;
 
 import com.google.common.collect.ImmutableList;
+import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.ConfigModelRegistry;
 import com.yahoo.config.model.NullConfigModelRegistry;
@@ -46,6 +47,7 @@ public class VespaModelTester {
     private boolean hosted = true;
     private Map<String, Collection<Host>> hostsByFlavor = new HashMap<>();
     private ApplicationId applicationId = ApplicationId.defaultId();
+    private boolean useDedicatedNodeForLogserver = false;
 
     public VespaModelTester() {
         this(new NullConfigModelRegistry());
@@ -92,6 +94,10 @@ public class VespaModelTester {
         applicationId = ApplicationId.from(tenant, applicationName, instanceName);
     }
 
+    public void useDedicatedNodeForLogserver(boolean useDedicatedNodeForLogserver) {
+        this.useDedicatedNodeForLogserver = useDedicatedNodeForLogserver;
+    }
+
     /** Creates a model which uses 0 as start index and fails on out of capacity */
     public VespaModel createModel(String services, String ... retiredHostNames) {
         return createModel(Zone.defaultZone(), services, true, retiredHostNames);
@@ -131,6 +137,7 @@ public class VespaModelTester {
         DeployProperties properties = new DeployProperties.Builder()
                 .hostedVespa(hosted)
                 .applicationId(applicationId)
+                .useDedicatedNodeForLogserver(useDedicatedNodeForLogserver)
                 .build();
 
         DeployState deployState = new DeployState.Builder()