Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 23 insertions, 1 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
index 89226d3309e..5af4d0cff29 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PlanRegistryMock.java
@@ -1,3 +1,4 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.NodeResources;
@@ -134,7 +135,8 @@ public class PlanRegistryMock implements PlanRegistry {
                     dgbCost,
                     gpuCost,
                     usage.getArchitecture(),
-                    usage.getMajorVersion()
+                    usage.getMajorVersion(),
+                    usage.getCloudAccount()
             );
         }
 
@@ -142,5 +144,25 @@ public class PlanRegistryMock implements PlanRegistry {
         public double calculate(NodeResources resources) {
             return resources.cost();
         }
+
+        @Override
+        public BigDecimal getCpuPrice() {
+            return cpuHourCost;
+        }
+
+        @Override
+        public BigDecimal getMemoryPrice() {
+            return memHourCost;
+        }
+
+        @Override
+        public BigDecimal getDiskPrice() {
+            return dgbHourCost;
+        }
+
+        @Override
+        public BigDecimal getGpuPrice() {
+            return gpuHourCost;
+        }
     }
 }