aboutsummaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/test/java/com
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-11-06 10:30:58 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2019-11-06 10:30:58 +0100
commitd0586ad37ac7c87279ba26fb5756bb588952b985 (patch)
tree79cff8aae05e5721765fc2c3eb86e5adc7758bdf /config-provisioning/src/test/java/com
parentc63608db287878a831af237612918cafd0c600e3 (diff)
Keep minCpuCores without speed adjustment
Diffstat (limited to 'config-provisioning/src/test/java/com')
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
index ec3f73a8194..920455222bb 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
@@ -11,6 +11,8 @@ import static org.junit.Assert.assertEquals;
public class NodeFlavorsTest {
+ private static final double delta = 0.00001;
+
@Test
public void testConfigParsing() {
FlavorsConfig.Builder builder = new FlavorsConfig.Builder();
@@ -22,13 +24,18 @@ public class NodeFlavorsTest {
}
{
FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder();
+ flavorBuilder.minCpuCores(10);
+ flavorBuilder.cpuCoreSpeedup(1.3);
flavorBuilder.name("banana").cost(3);
flavorBuilderList.add(flavorBuilder);
}
builder.flavor(flavorBuilderList);
FlavorsConfig config = new FlavorsConfig(builder);
NodeFlavors nodeFlavors = new NodeFlavors(config);
- assertEquals(3, nodeFlavors.getFlavor("banana").get().cost());
+ Flavor banana = nodeFlavors.getFlavor("banana").get();
+ assertEquals(3, banana.cost());
+ assertEquals(10, banana.getMinCpuCores(), delta);
+ assertEquals("10 * (1 + (1.3 - 1)/3", 11, banana.resources().vcpu(), delta);
}
}