Follow API change

6 files changed, 54 insertions, 44 deletions

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 9ea92048f3b..5b8b5c816de 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
@@ -2,11 +2,11 @@
 package com.yahoo.vespa.model.content;
 
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
-import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
@@ -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.cpu().cores()));
         }
         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 da193a17801..0c332f3e164 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
@@ -39,31 +39,31 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
     private void getConfig(ProtonConfig.Documentdb.Builder builder) {
         ProtonConfig.Documentdb dbCfg = builder.build();
         if (dbCfg.mode() != ProtonConfig.Documentdb.Mode.Enum.INDEX) {
-            long numDocs = (long)nodeFlavor.getMinMainMemoryAvailableGb()*GB/64L;
+            long numDocs = (long)nodeFlavor.memory().sizeInGb()*GB/64L;
             builder.allocation.initialnumdocs(numDocs);
         }
     }
 
     private void tuneSummaryCache(ProtonConfig.Summary.Cache.Builder builder) {
-        long memoryLimitBytes = (long) ((nodeFlavor.getMinMainMemoryAvailableGb() * 0.05) * GB);
+        long memoryLimitBytes = (long) ((nodeFlavor.memory().sizeInGb() * 0.05) * GB);
         builder.maxbytes(memoryLimitBytes);
     }
 
     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.disk.size((long)nodeFlavor.disk().sizeInBase10Gb() * GB);
+        builder.hwinfo.disk.shared(nodeFlavor.environment().equals(Flavor.Environment.DOCKER_CONTAINER));
+        builder.hwinfo.memory.size((long)nodeFlavor.memory().sizeInGb() * GB);
+        builder.hwinfo.cpu.cores((int)nodeFlavor.cpu().cores());
     }
 
     private void tuneDiskWriteSpeed(ProtonConfig.Builder builder) {
-        if (!nodeFlavor.hasFastDisk()) {
+        if (!nodeFlavor.disk().isFast()) {
             builder.hwinfo.disk.writespeed(40);
         }
     }
 
     private void tuneDocumentStoreMaxFileSize(ProtonConfig.Summary.Log.Builder builder) {
-        double memoryGb = nodeFlavor.getMinMainMemoryAvailableGb();
+        double memoryGb = nodeFlavor.memory().sizeInGb();
         long fileSizeBytes = 4 * GB;
         if (memoryGb <= 12.0) {
             fileSizeBytes = 256 * MB;
@@ -76,25 +76,25 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
     }
 
     private void tuneFlushStrategyMemoryLimits(ProtonConfig.Flush.Memory.Builder builder) {
-        long memoryLimitBytes = (long) ((nodeFlavor.getMinMainMemoryAvailableGb() / 8) * GB);
+        long memoryLimitBytes = (long) ((nodeFlavor.memory().sizeInGb() / 8) * GB);
         builder.maxmemory(memoryLimitBytes);
         builder.each.maxmemory(memoryLimitBytes);
     }
 
     private void tuneFlushStrategyTlsSize(ProtonConfig.Flush.Memory.Builder builder) {
-        long tlsSizeBytes = (long) ((nodeFlavor.getMinDiskAvailableGb() * 0.07) * GB);
+        long tlsSizeBytes = (long) ((nodeFlavor.disk().sizeInBase10Gb() * 0.07) * GB);
         tlsSizeBytes = min(tlsSizeBytes, 100 * GB);
         builder.maxtlssize(tlsSizeBytes);
     }
 
     private void tuneSummaryReadIo(ProtonConfig.Summary.Read.Builder builder) {
-        if (nodeFlavor.hasFastDisk()) {
+        if (nodeFlavor.disk().isFast()) {
             builder.io(ProtonConfig.Summary.Read.Io.DIRECTIO);
         }
     }
 
     private void tuneSearchReadIo(ProtonConfig.Search.Mmap.Builder builder) {
-        if (nodeFlavor.hasFastDisk()) {
+        if (nodeFlavor.disk().isFast()) {
             builder.advise(ProtonConfig.Search.Mmap.Advise.RANDOM);
         }
     }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 588a722d476..dea4d13d16e 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -9,6 +9,7 @@ import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.internal.ConfigFlavor;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.search.config.QrStartConfig;
@@ -1740,8 +1741,9 @@ public class ModelProvisioningTest {
     }
 
     private static Flavor createFlavorFromDiskSetting(String name, boolean fastDisk) {
-        return new Flavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder().
-                name(name).fastDisk(fastDisk)));
+        return new ConfigFlavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder()
+                .name(name)
+                .disk(new FlavorsConfig.Flavor.Disk.Builder().fast(fastDisk))));
     }
 
     private static ProtonConfig getProtonConfig(ContentSearchCluster cluster, int searchNodeIdx) {
@@ -1796,8 +1798,10 @@ public class ModelProvisioningTest {
     private static long GB = 1024 * 1024 * 1024;
 
     private static Flavor createFlavorFromMemoryAndDisk(String name, int memoryGb, int diskGb) {
-        return new Flavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder().
-                name(name).minMainMemoryAvailableGb(memoryGb).minDiskAvailableGb(diskGb)));
+        return new ConfigFlavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder()
+                .name(name)
+                .memory(new FlavorsConfig.Flavor.Memory.Builder().sizeInGb(memoryGb))
+                .disk(new FlavorsConfig.Flavor.Disk.Builder().sizeInGb(diskGb))));
     }
 
     private static ProtonConfig getProtonConfig(VespaModel model, String configId) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 27f5af52b6c..35f7e72907e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -3,22 +3,22 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.config.model.provision.SingleNodeProvisioner;
 import com.yahoo.config.model.test.MockApplicationPackage;
+import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.config.provision.Flavor;
+import com.yahoo.config.provision.internal.ConfigFlavor;
 import com.yahoo.config.provisioning.FlavorsConfig;
-import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
-import com.yahoo.vespa.config.content.core.StorVisitorConfig;
+import com.yahoo.documentmodel.NewDocumentType;
+import com.yahoo.vespa.config.content.PersistenceConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
+import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
-import com.yahoo.vespa.config.content.PersistenceConfig;
-import com.yahoo.config.model.test.MockRoot;
-import com.yahoo.documentmodel.NewDocumentType;
-import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import org.junit.Test;
 
-
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -122,7 +122,10 @@ public class StorageClusterTest {
                 "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
                 "  </group>" +
                 "</cluster>",
-                new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
+                new ConfigFlavor(new FlavorsConfig.Flavor.Builder()
+                        .name("test-flavor")
+                        .cpu(new FlavorsConfig.Flavor.Cpu.Builder().cores(9))
+                        .build())
         );
 
         {
@@ -154,7 +157,10 @@ public class StorageClusterTest {
                         "     <node distribution-key=\"0\" hostalias=\"mockhost\"/>" +
                         "  </group>" +
                         "</cluster>",
-                new Flavor(new FlavorsConfig.Flavor.Builder().name("test-flavor").minCpuCores(9).build())
+                new ConfigFlavor(new FlavorsConfig.Flavor.Builder()
+                        .name("test-flavor")
+                        .cpu(new FlavorsConfig.Flavor.Cpu.Builder().cores(9))
+                        .build())
         );
 
         {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
index 7aadca4a1af..4036a9a1d78 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.model.search;
 
 import com.yahoo.collections.Pair;
-import com.yahoo.config.provision.Flavor;
+import com.yahoo.config.provision.internal.ConfigFlavor;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import org.junit.Test;
@@ -10,10 +10,9 @@ import org.junit.Test;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static com.yahoo.vespa.model.search.NodeFlavorTuning.MB;
 import static com.yahoo.vespa.model.search.NodeFlavorTuning.GB;
+import static com.yahoo.vespa.model.search.NodeFlavorTuning.MB;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author geirst
@@ -157,44 +156,45 @@ public class NodeFlavorTuningTest {
     }
 
     private static ProtonConfig configFromDiskSetting(boolean fastDisk) {
-        return getConfig(new FlavorsConfig.Flavor.Builder().
-                fastDisk(fastDisk));
+        return getConfig(new FlavorsConfig.Flavor.Builder()
+                .disk(new FlavorsConfig.Flavor.Disk.Builder().fast(fastDisk)));
     }
 
     private static ProtonConfig configFromDiskSetting(int diskGb) {
-        return getConfig(new FlavorsConfig.Flavor.Builder().
-                minDiskAvailableGb(diskGb));
+        return getConfig(new FlavorsConfig.Flavor.Builder()
+                .disk(new FlavorsConfig.Flavor.Disk.Builder().sizeInGb(diskGb)));
     }
 
     private static ProtonConfig configFromMemorySetting(int memoryGb) {
-        return getConfig(new FlavorsConfig.Flavor.Builder().
-                minMainMemoryAvailableGb(memoryGb));
+        return getConfig(new FlavorsConfig.Flavor.Builder()
+                .memory(new FlavorsConfig.Flavor.Memory.Builder().sizeInGb(memoryGb)));
     }
     private static ProtonConfig configFromMemorySetting(int memoryGb, ProtonConfig.Builder builder) {
-        return getConfig(new FlavorsConfig.Flavor.Builder().
-                minMainMemoryAvailableGb(memoryGb), builder);
+        return getConfig(new FlavorsConfig.Flavor.Builder()
+                .memory(new FlavorsConfig.Flavor.Memory.Builder().sizeInGb(memoryGb)), builder);
     }
 
     private static ProtonConfig configFromNumCoresSetting(double numCores) {
-        return getConfig(new FlavorsConfig.Flavor.Builder().minCpuCores(numCores));
+        return getConfig(new FlavorsConfig.Flavor.Builder()
+                .cpu(new FlavorsConfig.Flavor.Cpu.Builder().cores(numCores)));
     }
 
     private static ProtonConfig configFromEnvironmentType(boolean docker) {
-        String environment = (docker ? "DOCKER_CONTAINER" : "undefined");
+        String environment = (docker ? "DOCKER_CONTAINER" : "BARE_METAL");
         return getConfig(new FlavorsConfig.Flavor.Builder().environment(environment));
     }
 
     private static ProtonConfig getConfig(FlavorsConfig.Flavor.Builder flavorBuilder) {
         getConfig(flavorBuilder, new ProtonConfig.Builder());
         flavorBuilder.name("my_flavor");
-        NodeFlavorTuning tuning = new NodeFlavorTuning(new Flavor(new FlavorsConfig.Flavor(flavorBuilder)));
+        NodeFlavorTuning tuning = new NodeFlavorTuning(new ConfigFlavor(new FlavorsConfig.Flavor(flavorBuilder)));
         ProtonConfig.Builder protonBuilder = new ProtonConfig.Builder();
         tuning.getConfig(protonBuilder);
         return new ProtonConfig(protonBuilder);
     }
     private static ProtonConfig getConfig(FlavorsConfig.Flavor.Builder flavorBuilder, ProtonConfig.Builder protonBuilder) {
         flavorBuilder.name("my_flavor");
-        NodeFlavorTuning tuning = new NodeFlavorTuning(new Flavor(new FlavorsConfig.Flavor(flavorBuilder)));
+        NodeFlavorTuning tuning = new NodeFlavorTuning(new ConfigFlavor(new FlavorsConfig.Flavor(flavorBuilder)));
         tuning.getConfig(protonBuilder);
         return new ProtonConfig(protonBuilder);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 672e2932ab6..010ff41ad1b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -65,7 +65,7 @@ public class VespaModelTester {
     }
 
     public void addHosts(Flavor flavor, int count) {
-        addHosts(Optional.of(flavor), flavor.name(), count);
+        addHosts(Optional.of(flavor), flavor.flavorName(), count);
     }
 
     private Hosts addHosts(Optional<Flavor> flavor, String flavorName, int count) {