diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-02-23 13:31:22 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-02-23 13:31:22 +0100 |
| commit | 7eae707c3084ec702f85aa2d27eaae1e11e42ab2 (patch) | |
| tree | f09bc035b4f413512af18adcf84b585e854c7453 /config-provisioning/src/test | |
| parent | 13e5f28849839fc674dbd4b37683e5d7bbff5c57 (diff) | |
Add support for achitecture in node resources
Diffstat (limited to 'config-provisioning/src/test')
2 files changed, 16 insertions, 3 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java index 807c5d0a273..564c53eeff0 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java @@ -15,11 +15,11 @@ public class NodeResourcesTest { @Test public void testToString() { - assertEquals("[vcpu: 1.0, memory: 10.0 Gb, disk 100.0 Gb]", + assertEquals("[vcpu: 1.0, memory: 10.0 Gb, disk 100.0 Gb, architecture: x86_64]", new NodeResources(1., 10., 100., 0).toString()); - assertEquals("[vcpu: 0.3, memory: 3.3 Gb, disk 33.3 Gb, bandwidth: 0.3 Gbps]", + assertEquals("[vcpu: 0.3, memory: 3.3 Gb, disk 33.3 Gb, bandwidth: 0.3 Gbps, architecture: x86_64]", new NodeResources(1/3., 10/3., 100/3., 0.3).toString()); - assertEquals("[vcpu: 0.7, memory: 9.0 Gb, disk 66.7 Gb, bandwidth: 0.7 Gbps]", + assertEquals("[vcpu: 0.7, memory: 9.0 Gb, disk 66.7 Gb, bandwidth: 0.7 Gbps, architecture: x86_64]", new NodeResources(2/3., 8.97, 200/3., 0.67).toString()); } 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 4c5982708fa..3363c920bbd 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,6 +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); @Test public void testAllocatedHostsSerialization() throws IOException { @@ -70,6 +71,18 @@ 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, + 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)); } |