Merge pull request #11473 from vespa-engine/ogronnesby/expose-cost-api-in-controller-api

Expose Cost API in Controller API classes

6 files changed, 124 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/CostResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/CostResource.java
new file mode 100644
index 00000000000..c006a89be50
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/CostResource.java
@@ -0,0 +1,29 @@
+package com.yahoo.vespa.hosted.controller.api.application.v4;
+
+import com.yahoo.vespa.hosted.controller.api.application.v4.model.CostMonths;
+import com.yahoo.vespa.hosted.controller.api.application.v4.model.CostResult;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * @author ogronnesby
+ */
+@Path("")  //Ensures that the produces annotation is inherited
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public interface CostResource {
+    String API_PATH = "cost";
+
+    @GET
+    @Path("/")
+    CostMonths costMonths();
+
+    @GET
+    @Path("/{month}")
+    CostResult cost(@PathParam("month") String month);
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
index 06a8f8371ab..27d63146dba 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
@@ -40,4 +40,6 @@ public interface TenantResource {
     @Path(ApplicationResource.API_PATH)
     ApplicationResource application();
 
+    @Path(CostResource.API_PATH)
+    CostResource cost();
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItem.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItem.java
new file mode 100644
index 00000000000..1d87b2fcfb6
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItem.java
@@ -0,0 +1,37 @@
+package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.zone.ZoneId;
+
+/**
+ * @author ogronnesby
+ */
+public class CostItem {
+    private String applicationId;
+    private String zoneId;
+    private CostItemUsage cpu;
+    private CostItemUsage memory;
+    private CostItemUsage disk;
+
+    public CostItem() {}
+
+    public ApplicationId getApplicationId() {
+        return ApplicationId.fromSerializedForm(applicationId);
+    }
+
+    public ZoneId getZoneId() {
+        return ZoneId.from(zoneId);
+    }
+
+    public CostItemUsage getCpu() {
+        return cpu;
+    }
+
+    public CostItemUsage getMemory() {
+        return memory;
+    }
+
+    public CostItemUsage getDisk() {
+        return disk;
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItemUsage.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItemUsage.java
new file mode 100644
index 00000000000..9b8967bc9d8
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostItemUsage.java
@@ -0,0 +1,21 @@
+package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+
+import java.math.BigDecimal;
+
+/**
+ * @author ogronnesby
+ */
+public class CostItemUsage {
+    private BigDecimal usage;
+    private BigDecimal charge;
+
+    public CostItemUsage() {}
+
+    public BigDecimal getUsage() {
+        return usage;
+    }
+
+    public BigDecimal getCharge() {
+        return charge;
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostMonths.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostMonths.java
new file mode 100644
index 00000000000..2c9470399fa
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostMonths.java
@@ -0,0 +1,14 @@
+package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+
+import java.util.List;
+
+/**
+ * @author ogronnesby
+ */
+public class CostMonths {
+    public List<String> months;
+
+    public List<String> getMonths() {
+        return months;
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostResult.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostResult.java
new file mode 100644
index 00000000000..c0ca5d91d3f
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/CostResult.java
@@ -0,0 +1,21 @@
+package com.yahoo.vespa.hosted.controller.api.application.v4.model;
+
+import java.util.List;
+
+/**
+ * @author ogronnesby
+ */
+public class CostResult {
+    private String month;
+    private List<CostItem> items;
+
+    public CostResult() {}
+
+    public String getMonth() {
+        return month;
+    }
+
+    public List<CostItem> getItems() {
+        return items;
+    }
+}