Access resources directly

2 files changed, 7 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
index 1ce989dad08..ebe9327967e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.ParentHostUnavailableException;
 import com.yahoo.transaction.Mutex;
@@ -183,8 +184,8 @@ class Activator {
         for (Node node : nodes) {
             HostSpec hostSpec = getHost(node.hostname(), hosts);
             node = hostSpec.membership().get().retired() ? node.retire(nodeRepository.clock().instant()) : node.unretire();
-            if (hostSpec.flavor().isPresent() && ! hostSpec.flavor().get().resources().equals(node.flavor().resources())) // A resized node
-                node = node.with(hostSpec.flavor().get());
+            if (! hostSpec.advertisedResources().equals(node.flavor().resources())) // A resized node
+                node = node.with(new Flavor(hostSpec.advertisedResources()));
             Allocation allocation = node.allocation().get()
                                         .with(hostSpec.membership().get())
                                         .withRequestedResources(hostSpec.requestedResources()
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
index 24c1b0b5d2f..7350df40718 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java
@@ -346,8 +346,8 @@ public class DynamicDockerAllocationTest {
 
         List<HostSpec> hosts = tester.prepare(application, cluster, 2, 1, resources);
         assertEquals(2, hosts.size());
-        assertEquals(NodeResources.DiskSpeed.slow, hosts.get(0).flavor().get().resources().diskSpeed());
-        assertEquals(NodeResources.DiskSpeed.slow, hosts.get(1).flavor().get().resources().diskSpeed());
+        assertEquals(NodeResources.DiskSpeed.slow, hosts.get(0).advertisedResources().diskSpeed());
+        assertEquals(NodeResources.DiskSpeed.slow, hosts.get(1).advertisedResources().diskSpeed());
         tester.activate(application, hosts);
     }
 
@@ -386,9 +386,9 @@ public class DynamicDockerAllocationTest {
         List<HostSpec> hosts = tester.prepare(application, cluster, 4, 1, resources);
         assertEquals(1, hosts.size());
         tester.activate(application, hosts);
-        assertEquals(0.1, hosts.get(0).flavor().get().resources().vcpu(), 0.000001);
+        assertEquals(0.1, hosts.get(0).advertisedResources().vcpu(), 0.000001);
         assertEquals("Slow nodes are allowed in dev and preferred because they are cheaper",
-                     NodeResources.DiskSpeed.slow, hosts.get(0).flavor().get().resources().diskSpeed());
+                     NodeResources.DiskSpeed.slow, hosts.get(0).advertisedResources().diskSpeed());
     }
 
     @Test