Merge pull request #3513 from vespa-engine/ldalves/cost-metrics

rename SystemMetrics class/tests and return a Map instead of a List

1 files changed, 3 insertions, 5 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MockMetricsService.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MockMetricsService.java
index 79b4c5f6d6a..b30d90c10f4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MockMetricsService.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/MockMetricsService.java
@@ -5,7 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 
 import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 
 /**
  * @author bratseth
@@ -23,10 +23,8 @@ public class MockMetricsService implements com.yahoo.vespa.hosted.controller.api
     }
 
     @Override
-    public List<ClusterCostMetrics> getClusterCostMetrics(ApplicationId application, Zone zone) {
-        CostMetrics costMetrics = new CostMetrics(55.54, 69.90, 34.59);
-        ClusterCostMetrics clusterCostMetrics = new ClusterCostMetrics("default", costMetrics);
-        return Collections.singletonList(clusterCostMetrics);
+    public Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, Zone zone) {
+        return Collections.emptyMap();
     }
 
 }