summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa
diff options
context:
space:
mode:
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java10
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-metering.json34
2 files changed, 43 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 29931a1f626..577b8491bd2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -856,7 +856,15 @@ public class ApplicationApiTest extends ControllerContainerTest {
.userIdentity(USER_ID),
new File("application-without-change-multiple-deployments.json"));
}
-
+
+ @Test
+ public void testMeteringResponses() {
+ tester.assertResponse(request("/application/v4/tenant/doesnotexist/application/doesnotexist/metering", GET)
+ .userIdentity(USER_ID)
+ .oktaAccessToken(OKTA_AT),
+ new File("application1-metering.json"));
+ }
+
@Test
public void testErrorResponses() throws Exception {
tester.computeVersionStatus();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-metering.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-metering.json
new file mode 100644
index 00000000000..63e1c1ebbd1
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-metering.json
@@ -0,0 +1,34 @@
+{
+ "currentrate": {
+ "cpu": 0.0,
+ "mem": 0.0,
+ "disk": 0.0
+ },
+ "thismonth": {
+ "cpu": 0.0,
+ "mem": 0.0,
+ "disk": 0.0
+ },
+ "lastmonth": {
+ "cpu": 0.0,
+ "mem": 0.0,
+ "disk": 0.0
+ },
+ "details": {
+ "cpu": {
+ "dummy": {
+ "data": []
+ }
+ },
+ "mem": {
+ "dummy": {
+ "data": []
+ }
+ },
+ "disk": {
+ "dummy": {
+ "data": []
+ }
+ }
+ }
+} \ No newline at end of file