diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-12 22:50:27 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-12 22:50:27 +0100 |
commit | e82c39d65bd72620a110d9a737ab4305b9d3a5eb (patch) | |
tree | 41398e31046a14beaf46cdd383069403443be748 /config-model/src/main | |
parent | 1f9f2bac2bdac8bd0ea93cca69c2e7585e73b4c2 (diff) |
Carry spec through
Diffstat (limited to 'config-model/src/main')
3 files changed, 6 insertions, 14 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java index 51b41e19a27..a80982fe75b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java @@ -20,10 +20,6 @@ import java.util.logging.Level; */ public class HostPorts { - public HostPorts(String hostname) { - this.hostname = hostname; - } - final String hostname; public final static int BASE_PORT = 19100; final static int MAX_PORTS = 799; @@ -42,6 +38,10 @@ public class HostPorts { private Optional<NetworkPorts> networkPortsList = Optional.empty(); + public HostPorts(String hostname) { + this.hostname = hostname; + } + /** * Get the allocated network ports. * Should be called after allocation is complete and flushPortReservations has been called 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 0d4c0aa28af..099c02e06fe 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 @@ -64,7 +64,7 @@ public class HostResource implements Comparable<HostResource> { public HostPorts ports() { return hostPorts; } - public HostSpec spec() { return spec; } + public HostSpec spec() { return spec.withPorts(hostPorts.networkPorts()); } /** * Adds service and allocates resources for it. diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index 7d986eed877..ad0febd14cd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -177,15 +177,7 @@ public class HostSystem extends AbstractConfigProducer<Host> { } Set<HostSpec> getHostSpecs() { - return getHosts().stream() - .map(host -> new HostSpec(host.getHostname(), - Collections.emptyList(), - host.getFlavor(), - host.primaryClusterMembership(), - host.spec().version(), - host.ports().networkPorts(), - host.spec().requestedResources())) - .collect(Collectors.toCollection(LinkedHashSet::new)); + return getHosts().stream().map(host -> host.spec()).collect(Collectors.toCollection(LinkedHashSet::new)); } /** A provision logger which forwards to a deploy logger */ |