Make Flavor interface

1 files changed, 7 insertions, 14 deletions

diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def
index 1e40f6f8f36..d46f49b728d 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def
@@ -26,29 +26,22 @@ flavor[].cost int default=0
 flavor[].stock bool default=true
 
 # The type of node: BARE_METAL, VIRTUAL_MACHINE or DOCKER_CONTAINER
-flavor[].environment string default="undefined"
+flavor[].environment string default="BARE_METAL"
 
 # The minimum number of CPU cores available.
-flavor[].minCpuCores double default=0.0
+flavor[].cpu.cores double default=0.0
 
 # The minimum amount of main memory available.
-flavor[].minMainMemoryAvailableGb double default=0.0
+flavor[].memory.sizeInGb double default=0.0
 
-# The minimum amount of disk available.
-flavor[].minDiskAvailableGb double default=0.0
+# The minimum amount of disk available in GB in base 10 (1GB = 10^9 bytes)
+flavor[].disk.sizeInGb double default=0.0
 
 # Whether the disk is fast (typically SSD) or slow (typically spinning HDD).
-flavor[].fastDisk bool default=true
+flavor[].disk.fast bool default=true
 
 # Expected network interface bandwidth available for this flavor, in Mbit/s.
-flavor[].bandwidth double default=0.0
-
-# Human readable free text for description of node.
-flavor[].description string default=""
+flavor[].bandwidth.mbits double default=0.0
 
 # The flavor is retired and should no longer be used.
 flavor[].retired bool default=false
-
-# The free capacity we would like to preserve for this flavor
-# Note: Not used after Vespa 6.282
-flavor[].idealHeadroom int default=0