Clean up HostSpec constructors

1 files changed, 11 insertions, 5 deletions

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;
     }