summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-07-25 11:29:32 +0200
committerGitHub <noreply@github.com>2022-07-25 11:29:32 +0200
commit8a12e553a4aaad226d7e91eac8f0ba7b063ba328 (patch)
tree0111c7a2e9b80471bf9fff0c3c8bbd529250d135
parent58a7c193360e6aca3da295592f8b5ab5fcf6424e (diff)
parente53835397979b9a8d33e13963b7d216fe1b12971 (diff)
Merge pull request #23534 from vespa-engine/freva/fix-name
Fix cost field name
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java5
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json6
2 files changed, 6 insertions, 5 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 dcfdb32e374..b3fbe124493 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
@@ -44,6 +44,7 @@ import com.yahoo.vespa.hosted.provision.node.filter.ParentHostFilter;
import com.yahoo.vespa.hosted.provision.restapi.NodesResponse.ResponseType;
import com.yahoo.vespa.orchestrator.Orchestrator;
import com.yahoo.yolean.Exceptions;
+
import javax.inject.Inject;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -453,8 +454,8 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler {
Slime slime = new Slime();
Cursor root = slime.setObject();
- root.setDouble("total-cost", stats.totalCost());
- root.setDouble("total-allocated-cost", stats.totalAllocatedCost());
+ root.setDouble("totalCost", stats.totalCost());
+ root.setDouble("totalAllocatedCost", stats.totalAllocatedCost());
toSlime(stats.load(), root.setObject("load"));
toSlime(stats.activeLoad(), root.setObject("activeLoad"));
Cursor applicationsArray = root.setArray("applications");
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
index 017a45d2bbe..38505726def 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/stats.json
@@ -1,6 +1,6 @@
{
- "total-cost" : 8.591999999999999,
- "total-allocated-cost": 5.356,
+ "totalCost": 8.591999999999999,
+ "totalAllocatedCost": 5.356,
"load": {
"cpu": 0.0,
"memory": 0.0,
@@ -53,4 +53,4 @@
"unutilizedCost": 0.0
}
]
-} \ No newline at end of file
+}