Get requested resources from HostResources

3 files changed, 3 insertions, 18 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 f053c3a3fbe..cc9986dd1c6 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
@@ -40,10 +40,6 @@ public class HostResource implements Comparable<HostResource> {
 
     private Set<ClusterMembership> clusterMemberships = new LinkedHashSet<>();
 
-    // Empty for self-hosted
-    private Optional<Flavor> flavor = Optional.empty();
-    private Optional<NodeResources> requestedResources = Optional.empty();
-
     /**
      * Create a new {@link HostResource} bound to a specific {@link com.yahoo.vespa.model.Host}.
      *
@@ -111,17 +107,11 @@ public class HostResource implements Comparable<HostResource> {
                 .collect(Collectors.toSet()));
     }
 
-    public void setFlavor(Optional<Flavor> flavor) { this.flavor = flavor; }
-
     /** Returns the flavor of this resource. Empty for self-hosted Vespa. */
-    public Optional<Flavor> getFlavor() { return flavor; }
-
-    public void setRequestedResources(NodeResources resources) {
-        this.requestedResources = Optional.of(resources);
-    }
+    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 requestedResources; }
+    public Optional<NodeResources> getRequestedResources() { return spec.requestedResources(); }
 
     public void addClusterMembership(ClusterMembership clusterMembership) {
         if (clusterMembership != null)
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 269194b6382..541206310e1 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
@@ -128,12 +128,9 @@ public class HostSystem extends AbstractConfigProducer<Host> {
     private HostResource addNewHost(HostSpec hostSpec) {
         Host host = Host.createHost(this, hostSpec.hostname());
         HostResource hostResource = new HostResource(host, hostSpec);
-        hostResource.setFlavor(hostSpec.flavor());
-        hostSpec.requestedResources().ifPresent(resources -> hostResource.setRequestedResources(resources));
         hostSpec.membership().ifPresent(hostResource::addClusterMembership);
         hostSpec.networkPorts().ifPresent(np -> hostResource.ports().addNetworkPorts(np));
         hostname2host.put(host.getHostname(), hostResource);
-        log.log(DEBUG, () -> "Added new host resource for " + host.getHostname() + " with flavor " + hostResource.getFlavor());
         return hostResource;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index ee4879f2203..2718db46be9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -197,9 +197,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
          * @param hostSystem a {@link HostSystem}
          * @param producerSpec xml element for the service
          */
-        private void allocateHost(final AbstractService service, HostSystem hostSystem,
-                                  Element producerSpec)
-        {
+        private void allocateHost(AbstractService service, HostSystem hostSystem, Element producerSpec) {
             // TODO store service on something else than HostSystem, to not make that overloaded
             service.setHostResource(hostSystem.getHost(producerSpec.getAttribute("hostalias")));
         }