diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-30 12:35:34 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-30 12:35:34 +0100 |
commit | e06a6964a293de546dde991a98fb8b2426ca54e1 (patch) | |
tree | 0e59cebf8b16573c79d22355e5e5fcaf35d14411 /config-provisioning/src/test | |
parent | df12f4734894f1a5e37f97f9d8457f58b1481001 (diff) |
Remember requested resources on nodes
This may be different from assigned resources e.g in that requested
resources may specify DiskSpeed.any while assigned resources
always have a definite disk speed.
Diffstat (limited to 'config-provisioning/src/test')
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 a5af9aa0cb5..afec242de0b 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 @@ -42,7 +42,12 @@ public class AllocatedHostsSerializerTest { hosts.add(new HostSpec("flavor-from-resources-1", Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4, 1)))); hosts.add(new HostSpec("flavor-from-resources-2", - Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any)))); + Collections.emptyList(), + Optional.of(new Flavor(new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow))), + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.of(new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any)))); hosts.add(new HostSpec("configured-flavor", Collections.emptyList(), configuredFlavors.getFlavorOrThrow("C/12/45/100"))); hosts.add(new HostSpec("with-version", @@ -67,6 +72,7 @@ public class AllocatedHostsSerializerTest { assertEquals(expectedHost.version(), deserializedHost.version()); assertEquals(expectedHost.networkPorts(), deserializedHost.networkPorts()); assertEquals(expectedHost.aliases(), deserializedHost.aliases()); + assertEquals(expectedHost.requestedResources(), deserializedHost.requestedResources()); } } |