diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-03-03 11:56:49 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-03-03 11:56:49 +0100 |
| commit | f61f3594f8f0da9f58b77ea397f5a7be6c4e9804 (patch) | |
| tree | 61a66b5664f4783520f2ae781b23d91720f57fb5 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi | |
| parent | d1a257211a98e1ca80ff7f929dd35262caa40bec (diff) | |
Use architecture in more places in node repo
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java index 1304b85be6b..f05492162db 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java @@ -289,7 +289,8 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { requiredField(resourcesInspector, "diskGb", Inspector::asDouble), requiredField(resourcesInspector, "bandwidthGbps", Inspector::asDouble), optionalString(resourcesInspector.field("diskSpeed")).map(NodeResourcesSerializer::diskSpeedFrom).orElse(NodeResources.DiskSpeed.getDefault()), - optionalString(resourcesInspector.field("storageType")).map(NodeResourcesSerializer::storageTypeFrom).orElse(NodeResources.StorageType.getDefault()))); + optionalString(resourcesInspector.field("storageType")).map(NodeResourcesSerializer::storageTypeFrom).orElse(NodeResources.StorageType.getDefault()), + optionalString(resourcesInspector.field("architecture")).map(NodeResourcesSerializer::architectureFrom).orElse(NodeResources.Architecture.getDefault()))); } Flavor flavor = nodeFlavors.getFlavorOrThrow(flavorInspector.asString()); @@ -306,6 +307,8 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler { flavor = flavor.with(flavor.resources().with(NodeResourcesSerializer.diskSpeedFrom(resourcesInspector.field("diskSpeed").asString()))); if (resourcesInspector.field("storageType").valid()) flavor = flavor.with(flavor.resources().with(NodeResourcesSerializer.storageTypeFrom(resourcesInspector.field("storageType").asString()))); + if (resourcesInspector.field("architecture").valid()) + flavor = flavor.with(flavor.resources().with(NodeResourcesSerializer.architectureFrom(resourcesInspector.field("architecture").asString()))); } return flavor; } |