Support architecture in node repository

* Persist architecture for nodes
* Use architecture when talking to node repo

3 files changed, 34 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
index 1c3d3f5c489..f7be2b510c7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
@@ -18,6 +18,7 @@ public class NodeResourcesSerializer {
     private static final String bandwidthKey = "bandwidth";
     private static final String diskSpeedKey = "diskSpeed";
     private static final String storageTypeKey = "storageType";
+    private static final String architectureKey = "architecture";
 
     static void toSlime(NodeResources resources, Cursor resourcesObject) {
         if (resources.isUnspecified()) return;
@@ -27,6 +28,7 @@ public class NodeResourcesSerializer {
         resourcesObject.setDouble(bandwidthKey, resources.bandwidthGbps());
         resourcesObject.setString(diskSpeedKey, diskSpeedToString(resources.diskSpeed()));
         resourcesObject.setString(storageTypeKey, storageTypeToString(resources.storageType()));
+        resourcesObject.setString(architectureKey, architectureToString(resources.architecture()));
     }
 
     static NodeResources resourcesFromSlime(Inspector resources) {
@@ -36,7 +38,8 @@ public class NodeResourcesSerializer {
                                  resources.field(diskKey).asDouble(),
                                  resources.field(bandwidthKey).asDouble(),
                                  diskSpeedFromSlime(resources.field(diskSpeedKey)),
-                                 storageTypeFromSlime(resources.field(storageTypeKey)));
+                                 storageTypeFromSlime(resources.field(storageTypeKey)),
+                                 architectureFromSlime(resources.field(architectureKey)));
     }
 
     static Optional<NodeResources> optionalResourcesFromSlime(Inspector resources) {
@@ -62,7 +65,6 @@ public class NodeResourcesSerializer {
     }
 
     private static NodeResources.StorageType storageTypeFromSlime(Inspector storageType) {
-        if ( ! storageType.valid()) return NodeResources.StorageType.getDefault(); // TODO: Remove this line after December 2019
         switch (storageType.asString()) {
             case "remote" : return NodeResources.StorageType.remote;
             case "local" : return NodeResources.StorageType.local;
@@ -80,4 +82,23 @@ public class NodeResourcesSerializer {
         }
     }
 
+    private static NodeResources.Architecture architectureFromSlime(Inspector architecture) {
+        if ( ! architecture.valid()) return NodeResources.Architecture.getDefault(); // TODO: Remove this line after March 2022
+        switch (architecture.asString()) {
+            case "arm64" : return NodeResources.Architecture.arm64;
+            case "x86_64" : return NodeResources.Architecture.x86_64;
+            case "any" : return NodeResources.Architecture.any;
+            default: throw new IllegalStateException("Illegal architecture value '" + architecture.asString() + "'");
+        }
+    }
+
+    private static String architectureToString(NodeResources.Architecture architecture) {
+        switch (architecture) {
+            case arm64 : return "arm64";
+            case x86_64 : return "x86_64";
+            case any : return "any";
+            default: throw new IllegalStateException("Illegal architecture value '" + architecture + "'");
+        }
+    }
+
 }
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 2994b21f56b..4567d596c35 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
@@ -82,6 +82,8 @@ public class FlavorConfigBuilder {
                 flavorConfigBuilder.addFlavor(flavorName, 48, 128, 1000, 10, Flavor.Type.BARE_METAL);
             else if (flavorName.equals("devhost"))
                 flavorConfigBuilder.addFlavor(flavorName, 4.,  80., 100, 10, Flavor.Type.BARE_METAL);
+            else if (flavorName.equals("arm64"))
+                flavorConfigBuilder.addFlavor(flavorName,2.,  30., 20., 3, Flavor.Type.BARE_METAL, Architecture.arm64);
             else
                 flavorConfigBuilder.addFlavor(flavorName, 1.,  30., 20., 3, Flavor.Type.BARE_METAL);
         }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
index 3de3f4139d1..cc121ba8104 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
@@ -44,6 +44,9 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.yahoo.config.provision.NodeResources.Architecture;
+import static com.yahoo.config.provision.NodeResources.DiskSpeed;
+import static com.yahoo.config.provision.NodeResources.StorageType;
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -55,7 +58,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class NodeSerializerTest {
 
-    private final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default", "large", "ugccloud-container");
+    private final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default", "large", "ugccloud-container", "arm64");
     private final NodeSerializer nodeSerializer = new NodeSerializer(nodeFlavors, 1000);
     private final ManualClock clock = new ManualClock();
 
@@ -74,7 +77,8 @@ public class NodeSerializerTest {
     @Test
     public void reserved_node_serialization() {
         Node node = createNode();
-        NodeResources requestedResources = new NodeResources(1.2, 3.4, 5.6, 7.8, NodeResources.DiskSpeed.any);
+        NodeResources requestedResources = new NodeResources(1.2, 3.4, 5.6, 7.8,
+                                                             DiskSpeed.any, StorageType.any, Architecture.arm64);
 
         clock.advance(Duration.ofMinutes(3));
         assertEquals(0, node.history().events().size());
@@ -87,7 +91,7 @@ public class NodeSerializerTest {
         assertEquals(1, node.history().events().size());
         node = node.withRestart(new Generation(1, 2));
         node = node.withReboot(new Generation(3, 4));
-        node = node.with(FlavorConfigBuilder.createDummies("large").getFlavorOrThrow("large"), Agent.system, clock.instant());
+        node = node.with(FlavorConfigBuilder.createDummies("arm64").getFlavorOrThrow("arm64"), Agent.system, clock.instant());
         node = node.with(node.status().withVespaVersion(Version.fromString("1.2.3")));
         node = node.with(node.status().withIncreasedFailCount().withIncreasedFailCount());
         node = node.with(NodeType.tenant);
@@ -100,7 +104,8 @@ public class NodeSerializerTest {
         assertEquals(2, copy.allocation().get().restartGeneration().current());
         assertEquals(3, copy.status().reboot().wanted());
         assertEquals(4, copy.status().reboot().current());
-        assertEquals("large", copy.flavor().name());
+        assertEquals("arm64", copy.flavor().name());
+        assertEquals(Architecture.arm64.name(), copy.resources().architecture().name());
         assertEquals("1.2.3", copy.status().vespaVersion().get().toString());
         assertEquals(2, copy.status().failCount());
         assertEquals(node.allocation().get().owner(), copy.allocation().get().owner());