diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-22 15:17:21 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-22 15:17:21 +0200 |
commit | 4d989dd30a3d9e4f0f672a7ec4925290dc28e98a (patch) | |
tree | c1ad39f8bd718d0895290e9101afc15c792bc358 /config-provisioning/src | |
parent | 7450dd228ec177306a6702f583b616481e33435b (diff) |
Access resources directly
Diffstat (limited to 'config-provisioning/src')
2 files changed, 9 insertions, 3 deletions
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 447fc596740..96b189cefe6 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 @@ -142,7 +142,7 @@ public class AllocatedHostsSerializer { return new HostSpec(object.field(hostSpecHostNameKey).asString(), nodeResourcesFromSlime(object.field(realResourcesKey), object, nodeFlavors), nodeResourcesFromSlime(object.field(advertisedResourcesKey), object, nodeFlavors), - nodeResourcesFromSlime(object.field(requestedResourcesKey)), + optionalNodeResourcesFromSlime(object.field(requestedResourcesKey)), // TODO: Make non-optional after June 2020 membershipFromSlime(object), optionalString(object.field(hostSpecCurrentVespaVersionKey)).map(com.yahoo.component.Version::new), NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey)), @@ -178,6 +178,11 @@ public class AllocatedHostsSerializer { storageTypeFromSlime(resources.field(storageTypeKey))); } + private static NodeResources optionalNodeResourcesFromSlime(Inspector resources) { + if ( ! resources.valid()) return NodeResources.unspecified(); + return nodeResourcesFromSlime(resources); + } + private static NodeResources nodeResourcesFromSlime(Inspector resources, Inspector parent, Optional<NodeFlavors> nodeFlavors) { if ( ! resources.valid()) // TODO: Remove the fallback using nodeFlavors after June 2020 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 8e9c2e4407e..30e585ec0de 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 @@ -82,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()); } } |