diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-11 23:04:07 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-11 23:04:07 +0100 |
commit | d602d87a67a940ae4f40133da48e805e35eb0bc8 (patch) | |
tree | d25153bd8b60b3125b392cf67525b4d0f5bbf3f1 | |
parent | 851e15093c270c19c6c0cea4ec77a8c5f488713b (diff) |
Don't delegate
3 files changed, 4 insertions, 10 deletions
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 cc9986dd1c6..0d4c0aa28af 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 @@ -62,11 +62,10 @@ public class HostResource implements Comparable<HostResource> { */ public Host getHost() { return host; } - /** Returns the current Vespa version running on this node, or null if not known */ - public Optional<Version> version() { return spec.version(); } - public HostPorts ports() { return hostPorts; } + public HostSpec spec() { return spec; } + /** * Adds service and allocates resources for it. * @@ -110,9 +109,6 @@ public class HostResource implements Comparable<HostResource> { /** Returns the flavor of this resource. Empty for self-hosted Vespa. */ public Optional<Flavor> getFlavor() { return spec.flavor(); } - /** Returns the ressource requested which led to these host resources being allocated, if known */ - public Optional<NodeResources> getRequestedResources() { return spec.requestedResources(); } - public void addClusterMembership(ClusterMembership clusterMembership) { if (clusterMembership != null) clusterMemberships.add(clusterMembership); 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 541206310e1..7d986eed877 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 @@ -182,9 +182,9 @@ public class HostSystem extends AbstractConfigProducer<Host> { Collections.emptyList(), host.getFlavor(), host.primaryClusterMembership(), - host.version(), + host.spec().version(), host.ports().networkPorts(), - host.getRequestedResources())) + host.spec().requestedResources())) .collect(Collectors.toCollection(LinkedHashSet::new)); } 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 a046df1ac9a..691107f4649 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 @@ -70,8 +70,6 @@ public class HostSpec implements Comparable<HostSpec> { Optional<ClusterMembership> membership, Optional<com.yahoo.component.Version> version, Optional<NetworkPorts> networkPorts, Optional<NodeResources> requestedResources) { if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified"); - - this.hostname = hostname; this.aliases = List.copyOf(aliases); this.flavor = flavor; |