Put Instances in Application, and replace ALL THE THINGS!!!

1 files changed, 7 insertions, 7 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
index 7f537c2e4bb..cf33b354139 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
@@ -37,10 +37,10 @@ public class DeploymentMetricsMaintainerTest {
     @Test
     public void updates_metrics() {
         var application = tester.createApplication("app1", "tenant1", 123L, 1L);
-        deploy(application.id(), Version.fromString("7.1"));
+        deploy(application.id().defaultInstance(), Version.fromString("7.1"));
 
         DeploymentMetricsMaintainer maintainer = maintainer(tester.controller());
-        Supplier<Instance> app = () -> tester.instance(application.id());
+        Supplier<Instance> app = () -> tester.defaultInstance(application.id());
         Supplier<Deployment> deployment = () -> app.get().deployments().values().stream().findFirst().get();
 
         // No metrics gathered yet
@@ -51,7 +51,7 @@ public class DeploymentMetricsMaintainerTest {
         assertFalse("Never received any writes", deployment.get().activity().lastWritten().isPresent());
 
         // Only get application metrics for old version
-        deploy(application.id(), Version.fromString("6.3.3"));
+        deploy(application.id().defaultInstance(), Version.fromString("6.3.3"));
         maintainer.maintain();
         assertEquals(0, app.get().metrics().queryServiceQuality(), 0);
         assertEquals(0, deployment.get().metrics().documentCount(), 0);
@@ -60,13 +60,13 @@ public class DeploymentMetricsMaintainerTest {
         assertFalse("Never received any writes", deployment.get().activity().lastWritten().isPresent());
 
         // Metrics are gathered and saved to application
-        deploy(application.id(), Version.fromString("7.5.5"));
+        deploy(application.id().defaultInstance(), Version.fromString("7.5.5"));
         var metrics0 = Map.of(ClusterMetrics.QUERIES_PER_SECOND, 1D,
                               ClusterMetrics.FEED_PER_SECOND, 2D,
                               ClusterMetrics.DOCUMENT_COUNT, 3D,
                               ClusterMetrics.QUERY_LATENCY, 4D,
                               ClusterMetrics.FEED_LATENCY, 5D);
-        setMetrics(application.id(), metrics0);
+        setMetrics(application.id().defaultInstance(), metrics0);
         maintainer.maintain();
         Instant t1 = tester.clock().instant().truncatedTo(MILLIS);
         assertEquals(0.0, app.get().metrics().queryServiceQuality(), Double.MIN_VALUE);
@@ -96,7 +96,7 @@ public class DeploymentMetricsMaintainerTest {
         var metrics1 = new HashMap<>(metrics0);
         metrics1.put(ClusterMetrics.QUERIES_PER_SECOND, 0D);
         metrics1.put(ClusterMetrics.FEED_PER_SECOND, 5D);
-        setMetrics(application.id(), metrics1);
+        setMetrics(application.id().defaultInstance(), metrics1);
         maintainer.maintain();
         assertEquals(t2, deployment.get().activity().lastQueried().get());
         assertEquals(t3, deployment.get().activity().lastWritten().get());
@@ -107,7 +107,7 @@ public class DeploymentMetricsMaintainerTest {
         tester.clock().advance(Duration.ofHours(1));
         var metrics2 = new HashMap<>(metrics1);
         metrics2.put(ClusterMetrics.FEED_PER_SECOND, 0D);
-        setMetrics(application.id(), metrics2);
+        setMetrics(application.id().defaultInstance(), metrics2);
         maintainer.maintain();
         assertEquals(t2, deployment.get().activity().lastQueried().get());
         assertEquals(t3, deployment.get().activity().lastWritten().get());