aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-10-10 12:37:12 +0200
committerHarald Musum <musum@yahooinc.com>2023-10-10 12:37:12 +0200
commit2828b090d0826cf3391741f5046e3b9405e7e7db (patch)
tree7d690b69674e94be70e068747d5e49938162bb50 /controller-server
parentb0bbcfa758db0a03b7385ae2df1ec6885342247f (diff)
Fix text with description of price items
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java10
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandlerTest.java6
2 files changed, 8 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
index 616b128c380..797731f69ee 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandler.java
@@ -155,12 +155,12 @@ public class PricingApiHandler extends ThreadedHttpRequestHandler {
Cursor cursor = slime.setObject();
var array = cursor.setArray("priceInfo");
- addItem(array, "listPrice", priceInfo.listPrice());
- addItem(array, "volumeDiscount", priceInfo.volumeDiscount());
- addItem(array, "committedAmountDiscount", priceInfo.committedAmountDiscount());
- addItem(array, "enclaveDiscount", priceInfo.enclaveDiscount());
+ addItem(array, "List price", priceInfo.listPrice());
+ addItem(array, "Volume discount", priceInfo.volumeDiscount());
+ addItem(array, "Committed spend discount", priceInfo.committedAmountDiscount());
+ addItem(array, "Enclave discount", priceInfo.enclaveDiscount());
- cursor.setString("totalAmount", priceInfo.totalAmount().toPlainString());
+ cursor.setString("Total", priceInfo.totalAmount().toPlainString());
return new SlimeJsonResponse(slime);
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandlerTest.java
index 2d93237159d..d5e9b1f90da 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/pricing/PricingApiHandlerTest.java
@@ -27,10 +27,10 @@ public class PricingApiHandlerTest extends ControllerContainerCloudTest {
tester.assertJsonResponse(request, """
{
"priceInfo": [
- {"description": "listPrice", "amount": "2400.00"},
- {"description": "volumeDiscount", "amount": "5.00"}
+ {"description": "List price", "amount": "2400.00"},
+ {"description": "Volume discount", "amount": "5.00"}
],
- "totalAmount": "2395.00"
+ "Total": "2395.00"
}
""",
200);