summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
diff options
context:
space:
mode:
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
index 450f4481c5f..c168a057bfb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
@@ -160,17 +160,17 @@ public class OsApiHandler extends AuditLoggingRequestHandler {
Set<OsVersion> osVersions = controller.osVersions();
Cursor versions = root.setArray("versions");
- controller.osVersionStatus().versions().forEach((osVersion, nodes) -> {
+ controller.osVersionStatus().versions().forEach((osVersion, nodeVersions) -> {
Cursor currentVersionObject = versions.addObject();
currentVersionObject.setString("version", osVersion.version().toFullString());
currentVersionObject.setBool("targetVersion", osVersions.contains(osVersion));
currentVersionObject.setString("cloud", osVersion.cloud().value());
Cursor nodesArray = currentVersionObject.setArray("nodes");
- nodes.forEach(node -> {
+ nodeVersions.asMap().values().forEach(nodeVersion -> {
Cursor nodeObject = nodesArray.addObject();
- nodeObject.setString("hostname", node.hostname().value());
- nodeObject.setString("environment", node.environment().value());
- nodeObject.setString("region", node.region().value());
+ nodeObject.setString("hostname", nodeVersion.hostname().value());
+ nodeObject.setString("environment", nodeVersion.zone().environment().value());
+ nodeObject.setString("region", nodeVersion.zone().region().value());
});
});