Make it possible specify a cpu speedup factor for a flavor

This allows us to model the speed difference between different
cpu generations.

3 files changed, 9 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
index 077b97d82c0..b300dcfe85e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
@@ -10,12 +10,16 @@ import com.yahoo.search.config.QrStartConfig;
  * @author balder
  */
 public class NodeFlavorTuning implements QrStartConfig.Producer {
+
     private final Flavor flavor;
+
     NodeFlavorTuning(Flavor flavor) {
         this.flavor = flavor;
     }
+
     @Override
     public void getConfig(QrStartConfig.Builder builder) {
-        builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.getMinCpuCores())));
+        builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.resources().vcpu())));
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index c8220071373..8c3dce4d968 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -88,7 +88,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
     public void getConfig(StorFilestorConfig.Builder builder) {
         if (getHostResource() != null && getHostResource().getFlavor().isPresent()) {
             Flavor nodeFlavor = getHostResource().getFlavor().get();
-            builder.num_threads(Math.max(4, (int)nodeFlavor.getMinCpuCores()));
+            builder.num_threads(Math.max(4, (int)nodeFlavor.resources().vcpu()));
         }
         cluster.getConfig(builder);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
index 3260cf3a680..64bb4e964f0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
@@ -56,10 +56,10 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
     }
 
     private void setHwInfo(ProtonConfig.Builder builder) {
-        builder.hwinfo.disk.size((long)nodeFlavor.getMinDiskAvailableGb() * GB);
         builder.hwinfo.disk.shared(nodeFlavor.getType().equals(Flavor.Type.DOCKER_CONTAINER));
-        builder.hwinfo.memory.size((long)nodeFlavor.getMinMainMemoryAvailableGb() * GB);
-        builder.hwinfo.cpu.cores((int)nodeFlavor.getMinCpuCores());
+        builder.hwinfo.cpu.cores((int)nodeFlavor.resources().vcpu());
+        builder.hwinfo.memory.size((long)nodeFlavor.resources().memoryGb() * GB);
+        builder.hwinfo.disk.size((long)nodeFlavor.resources().diskGb() * GB);
     }
 
     private void tuneDiskWriteSpeed(ProtonConfig.Builder builder) {