diff options
6 files changed, 18 insertions, 24 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 10f44fc5031..71d325adb7d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -331,10 +331,10 @@ public class NodesSpecification { if (architecture == null) return NodeResources.Architecture.getDefault(); switch (architecture) { case "x86_64" : return NodeResources.Architecture.x86_64; - case "aarch64" : return NodeResources.Architecture.aarch64; + case "arm64" : return NodeResources.Architecture.arm64; case "any" : return NodeResources.Architecture.any; default: throw new IllegalArgumentException("Illegal architecture value '" + architecture + - "': Legal values are 'x86_64', 'aarch64' and 'any')"); + "': Legal values are 'x86_64', 'arm64' and 'any')"); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 9852952bacb..65cbd5690c4 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -1381,7 +1381,7 @@ public class ModelProvisioningTest { " </admin>" + " <container version='1.0' id='container'>" + " <nodes count='4'>" + - " <resources vcpu='12' memory='10Gb' disk='30Gb' architecture='aarch64'/>" + + " <resources vcpu='12' memory='10Gb' disk='30Gb' architecture='arm64'/>" + " </nodes>" + " </container>" + " <content version='1.0' id='foo'>" + @@ -1407,7 +1407,7 @@ public class ModelProvisioningTest { tester.addHosts(new NodeResources(0.1, 0.2, 300, 0.3, NodeResources.DiskSpeed.slow), 1);// Logserver tester.addHosts(new NodeResources(0.1, 0.3, 1, 0.5), 2); // Slobrok tester.addHosts(new NodeResources(12, 10, 30, 0.3, - NodeResources.DiskSpeed.fast, NodeResources.StorageType.local, NodeResources.Architecture.aarch64), 4); // Container + NodeResources.DiskSpeed.fast, NodeResources.StorageType.local, NodeResources.Architecture.arm64), 4); // Container tester.addHosts(new NodeResources(8, 200, 1000000, 0.3), 5); // Content-foo tester.addHosts(new NodeResources(10, 64, 200, 0.3), 6); // Content-bar tester.addHosts(new NodeResources(0.5, 2, 10, 0.3), 6); // Cluster-controller diff --git a/config-model/src/test/schema-test-files/services-hosted.xml b/config-model/src/test/schema-test-files/services-hosted.xml index 367e6019389..8ce35f5efbd 100644 --- a/config-model/src/test/schema-test-files/services-hosted.xml +++ b/config-model/src/test/schema-test-files/services-hosted.xml @@ -8,7 +8,7 @@ <container id="container1" version="1.0"> <nodes count="[5,7]" required="true"> - <resources vcpu="1.2" memory="10Gb" disk="0.3 TB" architecture="aarch64"/> + <resources vcpu="1.2" memory="10Gb" disk="0.3 TB" architecture="arm64"/> </nodes> </container> diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 3d87d5f77eb..7be4f7809d5 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -92,15 +92,15 @@ public class NodeResources { public enum Architecture { x86_64, - aarch64, + arm64, any; public static int compare(Architecture a, Architecture b) { if (a == any) a = x86_64; if (b == any) b = x86_64; - if (a == x86_64 && b == aarch64) return -1; - if (a == aarch64 && b == x86_64) return 1; + if (a == x86_64 && b == arm64) return -1; + if (a == arm64 && b == x86_64) return 1; return 0; } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java index 19bdfd0a358..d7d8d9647d3 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java @@ -105,7 +105,7 @@ public class AllocatedHostsSerializer { resourcesObject.setDouble(bandwidthKey, resources.bandwidthGbps()); resourcesObject.setString(diskSpeedKey, diskSpeedToString(resources.diskSpeed())); resourcesObject.setString(storageTypeKey, storageTypeToString(resources.storageType())); - //resourcesObject.setString(architectureKey, architectureToString(resources.architecture())); // TODO: Add when architecture names have been decided + resourcesObject.setString(architectureKey, architectureToString(resources.architecture())); } public static AllocatedHosts fromJson(byte[] json) { @@ -153,8 +153,8 @@ public class AllocatedHostsSerializer { resources.field(diskKey).asDouble(), resources.field(bandwidthKey).asDouble(), diskSpeedFromSlime(resources.field(diskSpeedKey)), - storageTypeFromSlime(resources.field(storageTypeKey))); - //architectureFromSlime(resources.field(architectureKey))); // TODO: Add when architecture names have been decided + storageTypeFromSlime(resources.field(storageTypeKey)), + architectureFromSlime(resources.field(architectureKey))); } private static NodeResources optionalNodeResourcesFromSlime(Inspector resources) { @@ -198,24 +198,20 @@ public class AllocatedHostsSerializer { } } - - /* private static NodeResources.Architecture architectureFromSlime(Inspector architecture) { if ( ! architecture.valid()) return NodeResources.Architecture.x86_64; switch (architecture.asString()) { case "x86_64" : return NodeResources.Architecture.x86_64; - case "aarch64" : return NodeResources.Architecture.aarch64; + case "arm64" : return NodeResources.Architecture.arm64; 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 x86_64: return "x86_64"; - case aarch64: return "aarch64"; + case arm64: return "arm64"; case any : return "any"; default: throw new IllegalStateException("Illegal architecture value '" + architecture + "'"); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java index 3363c920bbd..3867664a3a6 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java @@ -28,7 +28,7 @@ public class AllocatedHostsSerializerTest { private static final NodeResources smallSlowDiskSpeedNode = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow); private static final NodeResources bigSlowDiskSpeedNode = new NodeResources(1.0, 6.2, 8, 2, NodeResources.DiskSpeed.slow); private static final NodeResources anyDiskSpeedNode = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any); - private static final NodeResources aaarch64Node = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any, NodeResources.StorageType.any, NodeResources.Architecture.aarch64); + private static final NodeResources arm64Node = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any, NodeResources.StorageType.any, NodeResources.Architecture.arm64); @Test public void testAllocatedHostsSerialization() throws IOException { @@ -71,18 +71,16 @@ public class AllocatedHostsSerializerTest { Optional.of(new NetworkPorts(List.of(new NetworkPorts.Allocation(1234, "service1", "configId1", "suffix1"), new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), Optional.empty())); - /* - hosts.add(new HostSpec("aaarch64", - aaarch64Node, - aaarch64Node, - aaarch64Node, + hosts.add(new HostSpec("arm64", + arm64Node, + arm64Node, + arm64Node, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.empty()), Optional.empty(), Optional.of(new NetworkPorts(List.of(new NetworkPorts.Allocation(1234, "service1", "configId1", "suffix1"), new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), Optional.empty())); - */ assertAllocatedHosts(AllocatedHosts.withHosts(hosts)); } |