Clean up HostSpec constructors

5 files changed, 22 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
index e55686accca..ab2e0f632e4 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.model.container.Container;
 
 import java.io.Reader;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * A host provisioner based on a hosts.xml file.
@@ -38,7 +39,7 @@ public class HostsXmlProvisioner implements HostProvisioner {
         }
         for (Host host : hosts.asCollection()) {
             if (host.aliases().contains(alias)) {
-                return new HostSpec(host.hostname(), host.aliases());
+                return new HostSpec(host.hostname(), host.aliases(), Optional.empty());
             }
         }
         throw new IllegalArgumentException("Unable to find host for alias '" + alias + "'");
@@ -50,7 +51,7 @@ public class HostsXmlProvisioner implements HostProvisioner {
     }
 
     private HostSpec host2HostSpec(Host host) {
-        return new HostSpec(host.hostname(), host.aliases());
+        return new HostSpec(host.hostname(), host.aliases(), Optional.empty());
     }
 
     private Host getFirstHost() {
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index 6e21d0688ad..b38001d1267 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -118,7 +118,7 @@ public class InMemoryProvisioner implements HostProvisioner {
         List<Host> defaultHosts = freeNodes.get(defaultResources);
         if (defaultHosts.isEmpty()) throw new IllegalArgumentException("No more hosts with default resources available");
         Host newHost = freeNodes.removeValue(defaultResources, 0);
-        return new HostSpec(newHost.hostname(), List.of(alias));
+        return new HostSpec(newHost.hostname(), List.of(alias), Optional.empty());
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
index 212ad9e5a96..507010cf767 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.provision;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterMembership;
@@ -31,15 +32,21 @@ public class SingleNodeProvisioner implements HostProvisioner {
 
     public SingleNodeProvisioner() {
         host = new Host(HostName.getLocalhost());
-        this.hostSpec = new HostSpec(host.hostname(), host.aliases());
+        this.hostSpec = new HostSpec(host.hostname(), host.aliases(), Optional.empty());
     }
 
     public SingleNodeProvisioner(Flavor flavor) {
         host = new Host(HostName.getLocalhost());
+        /*
         this.hostSpec = new HostSpec(host.hostname(),
                                      List.of(),
                                      flavor.resources(), flavor.resources(),
                                      Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+         */
+        this.hostSpec = new HostSpec(host.hostname(),
+                                     flavor.resources(), flavor.resources(), flavor.resources(),
+                                     ClusterMembership.from(ClusterSpec.specification(ClusterSpec.Type.content, ClusterSpec.Id.from("test")).group(ClusterSpec.Group.from(0)).vespaVersion("1").build(), 0),
+                                     Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     @Override
@@ -52,10 +59,9 @@ public class SingleNodeProvisioner implements HostProvisioner {
         // TODO: This should fail if capacity requested is more than 1
         List<HostSpec> hosts = new ArrayList<>();
         hosts.add(new HostSpec(host.hostname(),
-                               List.of(),
-                               NodeResources.unspecified(), NodeResources.unspecified(),
-                               Optional.of(ClusterMembership.from(cluster, counter++)),
-                               Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()));
+                               NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),
+                               ClusterMembership.from(cluster, counter++),
+                               Optional.empty(), Optional.empty(), Optional.empty()));
         return hosts;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index 2390ad68aa2..0cc3f390db4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -37,7 +37,7 @@ public class HostResource implements Comparable<HostResource> {
      * @param host {@link com.yahoo.vespa.model.Host} object to bind to.
      */
     public HostResource(Host host) {
-        this(host, new HostSpec(host.getHostname(), List.of()));
+        this(host, new HostSpec(host.getHostname(), List.of(), Optional.empty()));
     }
 
     public HostResource(Host host, HostSpec spec) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
index 51b039a7532..91f5fdc5f11 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
@@ -6,6 +6,8 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -17,10 +19,10 @@ public class HostSpecTest {
 
     @Test
     public void testEquals() {
-        HostSpec h1 = new HostSpec("foo", Collections.<String>emptyList());
-        HostSpec h2 = new HostSpec("foo", Collections.<String>emptyList());
-        HostSpec h3 = new HostSpec("foo", Arrays.asList("my", "alias"));
-        HostSpec h4 = new HostSpec("bar", Collections.<String>emptyList());
+        HostSpec h1 = new HostSpec("foo", List.of(), Optional.empty());
+        HostSpec h2 = new HostSpec("foo", List.of(), Optional.empty());
+        HostSpec h3 = new HostSpec("foo", List.of("my", "alias"), Optional.empty());
+        HostSpec h4 = new HostSpec("bar", List.of(), Optional.empty());
 
         assertTrue(h1.equals(h1));
         assertTrue(h1.equals(h2));