Rebase master

4 files changed, 10 insertions, 10 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java
index 71557ab2536..95da4efad03 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainer.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.hosted.controller.application.Deployment;
 
 import java.time.Duration;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,13 +30,13 @@ public class ClusterUtilizationMaintainer extends Maintainer {
     }
 
     private Map<ClusterSpec.Id, ClusterUtilization> getUpdatedClusterUtilizations(ApplicationId app, Zone zone) {
-        List<MetricsService.ClusterCostMetrics> systemMetrics = controller.metricsService().getClusterCostMetrics(app, zone);
+        Map<String, MetricsService.SystemMetrics> systemMetrics = controller.metricsService().getSystemMetrics(app, zone);
 
         Map<ClusterSpec.Id, ClusterUtilization> utilizationMap = new HashMap<>();
-        for (MetricsService.ClusterCostMetrics clusterCostMetrics : systemMetrics) {
-            MetricsService.CostMetrics systemMetric = clusterCostMetrics.costMetrics();
+        for (Map.Entry<String, MetricsService.SystemMetrics> metrics : systemMetrics.entrySet()) {
+            MetricsService.SystemMetrics systemMetric = metrics.getValue();
             ClusterUtilization utilization = new ClusterUtilization(systemMetric.memUtil() / 100, systemMetric.cpuUtil() / 100, systemMetric.diskUtil(), 0);
-            utilizationMap.put(new ClusterSpec.Id(clusterCostMetrics.clusterId()), utilization);
+            utilizationMap.put(new ClusterSpec.Id(metrics.getKey()), utilization);
         }
 
         return utilizationMap;
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 b30d90c10f4..2dc6471effb 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
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.integration;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Zone;
 
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -24,7 +24,10 @@ public class MockMetricsService implements com.yahoo.vespa.hosted.controller.api
 
     @Override
     public Map<String, SystemMetrics> getSystemMetrics(ApplicationId application, Zone zone) {
-        return Collections.emptyMap();
+        Map<String, SystemMetrics> result = new HashMap<>();
+        SystemMetrics system = new SystemMetrics(55.54, 69.90, 34.59);
+        result.put("default", system);
+        return result;
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
index 1c5835d373c..da97c1122c3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
@@ -32,7 +32,7 @@ public class ClusterUtilizationMaintainerTest {
 
         deployment = tester.controller().applications().get(app).get().deployments().values().stream().findAny().get();
         Assert.assertEquals(1, deployment.clusterUtils().size());
-        Assert.assertEquals(55.54, deployment.clusterUtils().get(ClusterSpec.Id.from("default")).getCpu(), Double.MIN_VALUE);
+        Assert.assertEquals(0.5554, deployment.clusterUtils().get(ClusterSpec.Id.from("default")).getCpu(), Double.MIN_VALUE);
     }
 
 }
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
index 8b2595c6254..fd07428126a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
@@ -49,8 +49,6 @@ public class ControllerContainerTest {
             "  <component id='com.yahoo.vespa.hosted.controller.ConfigServerClientMock'/>" +
             "  <component id='com.yahoo.vespa.hosted.controller.ZoneRegistryMock'/>" +
             "  <component id='com.yahoo.vespa.hosted.controller.Controller'/>" +
-            "  <component id='com.yahoo.vespa.hosted.controller.cost.MockInsightBackend'/>" +
-            "  <component id='com.yahoo.vespa.hosted.controller.cost.CostMock'/>" +
             "  <component id='com.yahoo.vespa.hosted.controller.integration.MockMetricsService'/>" +
             "  <component id='com.yahoo.vespa.hosted.controller.maintenance.ControllerMaintenance'/>" +
             "  <component id='com.yahoo.vespa.hosted.controller.maintenance.JobControl'/>" +