aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-03-04 13:53:42 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-03-08 09:35:34 +0100
commit030f29a9d6ced07c418bd4948688ca1ddeeec3d0 (patch)
treeb29afe6b7edbe1e4822fa5615c834e8a9031b4ea /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java
parentb85e50a93d0af8537898526f93f1278eda3dfcca (diff)
Follow API change
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java
index 241a797cd1b..8e456fe4703 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java
@@ -1,16 +1,16 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.provision.testutils;
-import com.yahoo.config.provisioning.FlavorsConfig;
import com.yahoo.config.provision.Flavor;
-import com.yahoo.config.provision.NodeFlavors;
+import com.yahoo.config.provision.internal.ConfigNodeFlavors;
+import com.yahoo.config.provisioning.FlavorsConfig;
import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder;
/**
* A mock repository prepopulated with flavors, to avoid having config.
* Instantiated by DI from application package above.
*/
-public class MockNodeFlavors extends NodeFlavors {
+public class MockNodeFlavors extends ConfigNodeFlavors {
public MockNodeFlavors() {
super(createConfig());
@@ -18,14 +18,14 @@ public class MockNodeFlavors extends NodeFlavors {
private static FlavorsConfig createConfig() {
FlavorConfigBuilder b = new FlavorConfigBuilder();
- b.addFlavor("default", 2., 16., 400, Flavor.Type.BARE_METAL);
- b.addFlavor("medium-disk", 6., 12., 56, Flavor.Type.BARE_METAL);
- b.addFlavor("large", 4., 32., 1600, Flavor.Type.BARE_METAL);
- b.addFlavor("docker", 0.2, 0.5, 100, Flavor.Type.DOCKER_CONTAINER);
- b.addFlavor("v-4-8-100", 4.0, 8.0, 100, Flavor.Type.VIRTUAL_MACHINE);
- FlavorsConfig.Flavor.Builder largeVariant = b.addFlavor("large-variant", 64, 128, 2000, Flavor.Type.BARE_METAL);
+ b.addFlavor("default", 2., 16., 400, Flavor.Environment.BARE_METAL);
+ b.addFlavor("medium-disk", 6., 12., 56, Flavor.Environment.BARE_METAL);
+ b.addFlavor("large", 4., 32., 1600, Flavor.Environment.BARE_METAL);
+ b.addFlavor("docker", 0.2, 0.5, 100, Flavor.Environment.DOCKER_CONTAINER);
+ b.addFlavor("v-4-8-100", 4.0, 8.0, 100, Flavor.Environment.VIRTUAL_MACHINE);
+ FlavorsConfig.Flavor.Builder largeVariant = b.addFlavor("large-variant", 64, 128, 2000, Flavor.Environment.BARE_METAL);
b.addReplaces("large", largeVariant);
- FlavorsConfig.Flavor.Builder expensiveFlavor = b.addFlavor("expensive", 6, 12, 500, Flavor.Type.BARE_METAL);
+ FlavorsConfig.Flavor.Builder expensiveFlavor = b.addFlavor("expensive", 6, 12, 500, Flavor.Environment.BARE_METAL);
b.addReplaces("default", expensiveFlavor);
b.addCost(200, expensiveFlavor);