From d602d87a67a940ae4f40133da48e805e35eb0bc8 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Mon, 11 Nov 2019 23:04:07 +0100
Subject: Don't delegate

---
 .../src/main/java/com/yahoo/vespa/model/HostResource.java         | 8 ++------
 config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java  | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'config-model')

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));
     }
 
-- 
cgit v1.2.3