Clean up HostSpec constructors

3 files changed, 98 insertions, 82 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
index c8c8a349fee..52a2008b658 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
@@ -23,8 +23,8 @@ public class HostSpec implements Comparable<HostSpec> {
     private final List<String> aliases;
 
     private final NodeResources realResources;
-
     private final NodeResources advertisedResources;
+    private final NodeResources requestedResources;
 
     /** The current membership role of this host in the cluster it belongs to */
     private final Optional<ClusterMembership> membership;
@@ -35,47 +35,93 @@ public class HostSpec implements Comparable<HostSpec> {
 
     private final Optional<NetworkPorts> networkPorts;
 
-    private final Optional<NodeResources> requestedResources;
+    /** Create a host in a non-cloud system, where hosts are specified in config */
+    public HostSpec(String hostname, List<String> aliases, Optional<NetworkPorts> networkPorts) {
+        this(hostname, aliases,
+             NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),
+             Optional.empty(), Optional.empty(), networkPorts, Optional.empty());
+    }
+
+    /** Create a host in a hosted system */
+    public HostSpec(String hostname,
+                    NodeResources realResources,
+                    NodeResources advertisedResurces,
+                    NodeResources requestedResources,
+                    ClusterMembership membership,
+                    Optional<Version> version,
+                    Optional<NetworkPorts> networkPorts,
+                    Optional<DockerImage> dockerImageRepo) {
+        this(hostname, List.of(),
+             realResources,
+             advertisedResurces,
+             requestedResources,
+             Optional.of(membership),
+             version,
+             networkPorts,
+             dockerImageRepo);
+    }
+
+    private HostSpec(String hostname,
+                     List<String> aliases,
+                     NodeResources realResources,
+                     NodeResources advertisedResurces,
+                     NodeResources requestedResources,
+                     Optional<ClusterMembership> membership,
+                     Optional<Version> version,
+                     Optional<NetworkPorts> networkPorts,
+                     Optional<DockerImage> dockerImageRepo) {
+        if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified");
+        this.hostname = hostname;
+        this.aliases = List.copyOf(aliases);
+        this.realResources = Objects.requireNonNull(realResources);
+        this.advertisedResources = Objects.requireNonNull(advertisedResurces);
+        this.requestedResources = Objects.requireNonNull(requestedResources, "RequestedResources cannot be null");
+        this.membership = Objects.requireNonNull(membership);
+        this.version = Objects.requireNonNull(version, "Version cannot be null but can be empty");
+        this.networkPorts = Objects.requireNonNull(networkPorts, "Network ports cannot be null but can be empty");
+        this.dockerImageRepo = Objects.requireNonNull(dockerImageRepo, "Docker image repo cannot be null but can be empty");
+    }
 
     // TODO: Remove after June 2020
     @Deprecated
     public HostSpec(String hostname, Optional<ClusterMembership> membership) {
         this(hostname, new ArrayList<>(),
-             NodeResources.unspecified(), NodeResources.unspecified(),
+             NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),
              membership,
-             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+             Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
     @Deprecated
     public HostSpec(String hostname, ClusterMembership membership, Flavor flavor, Optional<Version> version) {
         this(hostname, new ArrayList<>(),
-             flavor.resources(), flavor.resources(),
-             Optional.of(membership), version, Optional.empty(), Optional.empty(), Optional.empty());
+             flavor.resources(), flavor.resources(), NodeResources.unspecified(),
+             Optional.of(membership), version, Optional.empty(), Optional.empty());
     }
 
-    /** Create a host in a non-cloud system, where hosts are specified in config */
+    // TODO: Remove after June 2020
+    @Deprecated
     public HostSpec(String hostname, List<String> aliases) {
         this(hostname, aliases,
-             NodeResources.unspecified(), NodeResources.unspecified(),
-             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+             NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),
+             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
     @Deprecated
     public HostSpec(String hostname, List<String> aliases, Flavor flavor) {
         this(hostname, aliases,
-             flavor.resources(), flavor.resources(),
-             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+             flavor.resources(), flavor.resources(), NodeResources.unspecified(),
+             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
     @Deprecated
     public HostSpec(String hostname, List<String> aliases, ClusterMembership membership) {
         this(hostname, aliases,
-             NodeResources.unspecified(), NodeResources.unspecified(),
+             NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),
              Optional.of(membership),
-             Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+             Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
@@ -84,7 +130,8 @@ public class HostSpec implements Comparable<HostSpec> {
         this(hostname, aliases,
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
-             membership, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+             NodeResources.unspecified(),
+             membership, Optional.empty(), Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
@@ -94,8 +141,9 @@ public class HostSpec implements Comparable<HostSpec> {
         this(hostname, aliases,
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
+             NodeResources.unspecified(),
              membership, version,
-             Optional.empty(), Optional.empty(), Optional.empty());
+             Optional.empty(), Optional.empty());
     }
 
     // TODO: Remove after June 2020
@@ -106,8 +154,8 @@ public class HostSpec implements Comparable<HostSpec> {
         this(hostname, aliases,
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
+             NodeResources.unspecified(),
              membership, version, networkPorts,
-             Optional.empty(),
              Optional.empty());
     }
 
@@ -120,7 +168,8 @@ public class HostSpec implements Comparable<HostSpec> {
         this(hostname, aliases,
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
-             membership, version, networkPorts, requestedResources, Optional.empty());
+             requestedResources.orElse(NodeResources.unspecified()),
+             membership, version, networkPorts, Optional.empty());
     }
 
     // TODO: Remove after June 2020
@@ -132,40 +181,8 @@ public class HostSpec implements Comparable<HostSpec> {
         this(hostname, aliases,
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
              flavor.map(f -> f.resources()).orElse(NodeResources.unspecified()),
-             membership, version, networkPorts, requestedResources, dockerImageRepo);
-    }
-
-    /** Create a host in a hosted system */
-    public HostSpec(String hostname,
-                    NodeResources realResources,
-                    NodeResources advertisedResurces,
-                    NodeResources requestedResources,
-                    ClusterMembership membership,
-                    Optional<Version> version,
-                    Optional<NetworkPorts> networkPorts,
-                    Optional<DockerImage> dockerImageRepo) {
-        this(hostname, List.of(),
-             realResources, advertisedResurces,
-             Optional.of(membership),
-             version, networkPorts, requestedResources.asOptional(), dockerImageRepo);
-    }
-
-    /** Create a fully specified host for any system */
-    public HostSpec(String hostname, List<String> aliases,
-                    NodeResources realResources, NodeResources advertisedResurces,
-                    Optional<ClusterMembership> membership, Optional<Version> version,
-                    Optional<NetworkPorts> networkPorts, Optional<NodeResources> requestedResources,
-                    Optional<DockerImage> dockerImageRepo) {
-        if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified");
-        this.hostname = hostname;
-        this.aliases = List.copyOf(aliases);
-        this.realResources = realResources;
-        this.advertisedResources = advertisedResurces;
-        this.membership = membership;
-        this.version = Objects.requireNonNull(version, "Version cannot be null but can be empty");
-        this.networkPorts = Objects.requireNonNull(networkPorts, "Network ports cannot be null but can be empty");
-        this.requestedResources = Objects.requireNonNull(requestedResources, "RequestedResources cannot be null");
-        this.dockerImageRepo = Objects.requireNonNull(dockerImageRepo, "Docker image repo cannot be null but can be empty");
+             requestedResources.orElse(NodeResources.unspecified()),
+             membership, version, networkPorts, dockerImageRepo);
     }
 
     /** Returns the name identifying this host */
@@ -196,12 +213,12 @@ public class HostSpec implements Comparable<HostSpec> {
     public Optional<NetworkPorts> networkPorts() { return networkPorts; }
 
     /** Returns the requested resources leading to this host being provisioned, or empty if unspecified */
-    public Optional<NodeResources> requestedResources() { return requestedResources; }
+    public Optional<NodeResources> requestedResources() { return requestedResources.asOptional(); }
 
     public Optional<DockerImage> dockerImageRepo() { return dockerImageRepo; }
 
     public HostSpec withPorts(Optional<NetworkPorts> ports) {
-        return new HostSpec(hostname, aliases, realResources, advertisedResources, membership, version, ports, requestedResources, dockerImageRepo);
+        return new HostSpec(hostname, aliases, realResources, advertisedResources, requestedResources, membership, version, ports, dockerImageRepo);
     }
 
     @Override
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
index 4ce9aa2d599..447fc596740 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
@@ -138,15 +138,21 @@ public class AllocatedHostsSerializer {
     }
 
     private static HostSpec hostFromSlime(Inspector object, Optional<NodeFlavors> nodeFlavors) {
-        return new HostSpec(object.field(hostSpecHostNameKey).asString(),
-                            aliasesFromSlime(object),
-                            nodeResourcesFromSlime(object.field(realResourcesKey), object, nodeFlavors),
-                            nodeResourcesFromSlime(object.field(advertisedResourcesKey), object, nodeFlavors),
-                            object.field(hostSpecMembershipKey).valid() ? Optional.of(membershipFromSlime(object)) : Optional.empty(),
-                            optionalString(object.field(hostSpecCurrentVespaVersionKey)).map(com.yahoo.component.Version::new),
-                            NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey)),
-                            nodeResourcesFromSlime(object.field(requestedResourcesKey)),
-                            optionalDockerImage(object.field(hostSpecDockerImageRepoKey)));
+        if (object.field(hostSpecMembershipKey).valid()) { // Hosted
+            return new HostSpec(object.field(hostSpecHostNameKey).asString(),
+                                nodeResourcesFromSlime(object.field(realResourcesKey), object, nodeFlavors),
+                                nodeResourcesFromSlime(object.field(advertisedResourcesKey), object, nodeFlavors),
+                                nodeResourcesFromSlime(object.field(requestedResourcesKey)),
+                                membershipFromSlime(object),
+                                optionalString(object.field(hostSpecCurrentVespaVersionKey)).map(com.yahoo.component.Version::new),
+                                NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey)),
+                                optionalDockerImage(object.field(hostSpecDockerImageRepoKey)));
+        }
+        else {
+            return new HostSpec(object.field(hostSpecHostNameKey).asString(),
+                                aliasesFromSlime(object),
+                                NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey)));
+        }
     }
 
     private static List<String> aliasesFromSlime(Inspector object) {
@@ -160,23 +166,10 @@ public class AllocatedHostsSerializer {
         if (object.field(flavorKey).valid() && nodeFlavors.isPresent() && nodeFlavors.get().exists(object.field(flavorKey).asString()))
             return nodeFlavors.get().getFlavor(object.field(flavorKey).asString());
         else
-            return nodeResourcesFromSlime(object.field(resourcesKey)).map(resources -> new Flavor(resources));
-    }
-
-    private static Optional<NodeResources> nodeResourcesFromSlime(Inspector resources) {
-        if ( ! resources.valid()) return Optional.empty();
-        return Optional.of(new NodeResources(resources.field(vcpuKey).asDouble(),
-                                             resources.field(memoryKey).asDouble(),
-                                             resources.field(diskKey).asDouble(),
-                                             resources.field(bandwidthKey).asDouble(),
-                                             diskSpeedFromSlime(resources.field(diskSpeedKey)),
-                                             storageTypeFromSlime(resources.field(storageTypeKey))));
+            return Optional.empty();
     }
 
-    private static NodeResources nodeResourcesFromSlime(Inspector resources, Inspector parent,
-                                                        Optional<NodeFlavors> nodeFlavors) {
-        if ( ! resources.valid()) // TODO: Remove the fallback using nodeFlavors after June 2020
-            return flavorFromSlime(parent, nodeFlavors).map(f -> f.resources()).orElse(NodeResources.unspecified);
+    private static NodeResources nodeResourcesFromSlime(Inspector resources) {
         return new NodeResources(resources.field(vcpuKey).asDouble(),
                                  resources.field(memoryKey).asDouble(),
                                  resources.field(diskKey).asDouble(),
@@ -185,6 +178,13 @@ public class AllocatedHostsSerializer {
                                  storageTypeFromSlime(resources.field(storageTypeKey)));
     }
 
+    private static NodeResources nodeResourcesFromSlime(Inspector resources, Inspector parent,
+                                                        Optional<NodeFlavors> nodeFlavors) {
+        if ( ! resources.valid()) // TODO: Remove the fallback using nodeFlavors after June 2020
+            return flavorFromSlime(parent, nodeFlavors).map(f -> f.resources()).orElse(NodeResources.unspecified);
+        return nodeResourcesFromSlime(resources);
+    }
+
     private static NodeResources.DiskSpeed diskSpeedFromSlime(Inspector diskSpeed) {
         switch (diskSpeed.asString()) {
             case "fast" : return NodeResources.DiskSpeed.fast;
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
index a7e62f762e7..8e9c2e4407e 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
@@ -32,17 +32,16 @@ public class AllocatedHostsSerializerTest {
     public void testAllocatedHostsSerialization() throws IOException {
         NodeFlavors configuredFlavors = configuredFlavorsFrom("C/12/45/100", 12, 45, 100, 50, Flavor.Type.BARE_METAL);
         Set<HostSpec> hosts = new LinkedHashSet<>();
-        hosts.add(new HostSpec("empty",
-                               List.of()));
-        hosts.add(new HostSpec("with-aliases",
-                               List.of("alias1", "alias2")));
+        hosts.add(new HostSpec("empty", List.of(), Optional.empty()));
+        hosts.add(new HostSpec("with-aliases", List.of("alias1", "alias2"), Optional.empty()));
         hosts.add(new HostSpec("allocated",
                                NodeResources.unspecified(),
                                NodeResources.unspecified(),
                                NodeResources.unspecified(),
                                ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
                                                       Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))),
-                               Optional.empty(), Optional.empty(),
+                               Optional.empty(),
+                               Optional.empty(),
                                Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))));
         hosts.add(new HostSpec("flavor-from-resources-2",
                                new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow),