summaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java')
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java54
1 files changed, 32 insertions, 22 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 33157a01c07..30810b79104 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
@@ -14,7 +14,6 @@ import com.yahoo.config.provisioning.FlavorsConfig;
import org.junit.Test;
import java.io.IOException;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
@@ -33,34 +32,44 @@ public class AllocatedHostsSerializerTest {
public void testAllocatedHostsSerialization() throws IOException {
NodeFlavors configuredFlavors = configuredFlavorsFrom("C/12/45/100", 12, 45, 100, 50, Flavor.Type.BARE_METAL);
Set<HostSpec> hosts = new LinkedHashSet<>();
- hosts.add(new HostSpec("empty",
- Optional.empty()));
- hosts.add(new HostSpec("with-aliases",
- List.of("alias1", "alias2")));
+ hosts.add(new HostSpec("empty", List.of(), Optional.empty()));
+ hosts.add(new HostSpec("with-aliases", List.of("alias1", "alias2"), Optional.empty()));
hosts.add(new HostSpec("allocated",
- List.of(),
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
+ Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))),
+ Optional.empty(),
Optional.empty(),
- Optional.of(ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
- Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar")))),
- Optional.empty(), Optional.empty(), Optional.empty(),
Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))));
- 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(),
- Optional.of(new Flavor(new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow))),
+ new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow),
+ new NodeResources(1.0, 6.2, 8, 2, NodeResources.DiskSpeed.slow),
+ new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any),
+ ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
+ Optional.empty()),
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")));
+ Optional.empty()));
hosts.add(new HostSpec("with-version",
- Collections.emptyList(), Optional.empty(), Optional.empty(), Optional.of(Version.fromString("3.4.5"))));
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
+ Optional.empty()),
+ Optional.of(Version.fromString("3.4.5")),
+ Optional.empty(), Optional.empty()));
hosts.add(new HostSpec("with-ports",
- Collections.emptyList(), Optional.empty(), Optional.empty(), Optional.empty(),
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ NodeResources.unspecified(),
+ 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"))))));
+ new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))),
+ Optional.empty()));
assertAllocatedHosts(AllocatedHosts.withHosts(hosts), configuredFlavors);
}
@@ -73,11 +82,12 @@ public class AllocatedHostsSerializerTest {
HostSpec deserializedHost = requireHost(expectedHost.hostname(), deserializedHosts);
assertEquals(expectedHost.hostname(), deserializedHost.hostname());
assertEquals(expectedHost.membership(), deserializedHost.membership());
- assertEquals(expectedHost.flavor(), deserializedHost.flavor());
+ assertEquals(expectedHost.realResources(), deserializedHost.realResources());
+ assertEquals(expectedHost.advertisedResources(), deserializedHost.advertisedResources());
+ assertEquals(expectedHost.requestedResources(), deserializedHost.requestedResources());
assertEquals(expectedHost.version(), deserializedHost.version());
assertEquals(expectedHost.networkPorts(), deserializedHost.networkPorts());
assertEquals(expectedHost.aliases(), deserializedHost.aliases());
- assertEquals(expectedHost.requestedResources(), deserializedHost.requestedResources());
assertEquals(expectedHost.dockerImageRepo(), deserializedHost.dockerImageRepo());
}
}