diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2022-02-24 14:52:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 14:52:39 +0100 |
| commit | cb834d70452739bd88429671c87e02e18d644a4f (patch) | |
| tree | 9f397057c8ce69b870a4e2322f5d87626737df53 /config-model | |
| parent | c23bc766b78769f2fbfb09452d3bbdde2b55e4e9 (diff) | |
| parent | a98992913056dda35c44558b9cc3fd865296ecc3 (diff) | |
Merge pull request #21370 from vespa-engine/hmusum/use-arm64
Use arm64 as architecture name
Diffstat (limited to 'config-model')
3 files changed, 5 insertions, 5 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 1977ec0687d..97a27c92617 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> |