Use enum as parameter type

2 files changed, 17 insertions, 13 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
index 4f224b7cbc2..2994b21f56b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
@@ -5,6 +5,8 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeFlavors;
 import com.yahoo.config.provisioning.FlavorsConfig;
 
+import static com.yahoo.config.provision.NodeResources.Architecture;
+
 /**
  * Simplifies creation of a node-repository config containing flavors.
  * This is needed because the config builder API is inconvenient.
@@ -25,7 +27,7 @@ public class FlavorConfigBuilder {
                                                   double disk,
                                                   double bandwidth,
                                                   Flavor.Type type) {
-        return addFlavor(flavorName, cpu, mem, disk, bandwidth, true, true, type, "x86_64");
+        return addFlavor(flavorName, cpu, mem, disk, bandwidth, true, true, type, Architecture.x86_64);
     }
 
     public FlavorsConfig.Flavor.Builder addFlavor(String flavorName,
@@ -34,7 +36,7 @@ public class FlavorConfigBuilder {
                                                   double disk,
                                                   double bandwidth,
                                                   Flavor.Type type,
-                                                  String architecture) {
+                                                  Architecture architecture) {
         return addFlavor(flavorName, cpu, mem, disk, bandwidth, true, true, type, architecture);
     }
 
@@ -46,7 +48,7 @@ public class FlavorConfigBuilder {
                                                   boolean fastDisk,
                                                   boolean remoteStorage,
                                                   Flavor.Type type,
-                                                  String architecture) {
+                                                  Architecture architecture) {
         FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder();
         flavor.name(flavorName);
         flavor.minDiskAvailableGb(disk);
@@ -56,7 +58,7 @@ public class FlavorConfigBuilder {
         flavor.environment(type.name());
         flavor.fastDisk(fastDisk);
         flavor.remoteStorage(remoteStorage);
-        flavor.architecture(architecture);
+        flavor.architecture(architecture.name());
         builder.flavor(flavor);
         return flavor;
     }
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 b9d1965a4e1..2a78e4081e3 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
@@ -6,6 +6,8 @@ import com.yahoo.config.provision.NodeFlavors;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder;
 
+import static com.yahoo.config.provision.NodeResources.Architecture.*;
+
 /**
  * A mock repository prepopulated with flavors, to avoid having config.
  * Instantiated by DI from application package above.
@@ -18,15 +20,15 @@ public class MockNodeFlavors extends NodeFlavors {
 
     private static FlavorsConfig createConfig() {
         FlavorConfigBuilder b = new FlavorConfigBuilder();
-        b.addFlavor("default", 2., 16., 400, 10, Flavor.Type.BARE_METAL, "x86_64");
-        b.addFlavor("medium-disk", 6., 12., 56, 10, Flavor.Type.BARE_METAL, "x86_64");
-        b.addFlavor("large", 4., 32., 1600, 20, Flavor.Type.BARE_METAL, "x86_64");
-        b.addFlavor("docker", 0.2, 0.5, 100, 1, Flavor.Type.DOCKER_CONTAINER, "x86_64");
-        b.addFlavor("d-2-8-100", 2, 8, 100, 1, Flavor.Type.DOCKER_CONTAINER, "x86_64");
-        b.addFlavor("v-4-8-100", 4.0, 8.0, 100, 5, Flavor.Type.VIRTUAL_MACHINE, "x86_64");
-        b.addFlavor("large-variant", 64, 128, 2000, 15, Flavor.Type.BARE_METAL, "x86_64");
-        b.addFlavor("expensive", 6, 12, 500, 5, Flavor.Type.BARE_METAL, "x86_64");
-        b.addFlavor("arm64", 4, 32., 1600, 20, Flavor.Type.BARE_METAL, "arm64");
+        b.addFlavor("default", 2., 16., 400, 10, Flavor.Type.BARE_METAL, x86_64);
+        b.addFlavor("medium-disk", 6., 12., 56, 10, Flavor.Type.BARE_METAL, x86_64);
+        b.addFlavor("large", 4., 32., 1600, 20, Flavor.Type.BARE_METAL, x86_64);
+        b.addFlavor("docker", 0.2, 0.5, 100, 1, Flavor.Type.DOCKER_CONTAINER, x86_64);
+        b.addFlavor("d-2-8-100", 2, 8, 100, 1, Flavor.Type.DOCKER_CONTAINER, x86_64);
+        b.addFlavor("v-4-8-100", 4.0, 8.0, 100, 5, Flavor.Type.VIRTUAL_MACHINE, x86_64);
+        b.addFlavor("large-variant", 64, 128, 2000, 15, Flavor.Type.BARE_METAL, x86_64);
+        b.addFlavor("expensive", 6, 12, 500, 5, Flavor.Type.BARE_METAL, x86_64);
+        b.addFlavor("arm64", 4, 32., 1600, 20, Flavor.Type.BARE_METAL, arm64);
 
         return b.build();
     }