Rename deploymentContext() to newDeploymentContext()

9 files changed, 45 insertions, 43 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 4015ac0452b..dbe451fd433 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -80,7 +80,7 @@ public class ControllerTest {
 
         // staging job - succeeding
         Version version1 = tester.configServer().initialVersion();
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         context.submit(applicationPackage);
         assertEquals("Application version is known from completion of initial job",
                      ApplicationVersion.from(DeploymentContext.defaultSourceRevision, 1, "a@b", new Version("6.1"), Instant.ofEpochSecond(1)),
@@ -501,7 +501,7 @@ public class ControllerTest {
 
     @Test
     public void testUnassignRotations() {
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
                 .endpoint("default", "qrs", "us-west-1", "us-central-1")
@@ -633,7 +633,7 @@ public class ControllerTest {
                 .build();
 
         // Create application
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
 
         // Direct deploy is allowed when deployDirectly is true
         ZoneId zone = ZoneId.from("prod", "cd-us-central-1");
@@ -664,7 +664,7 @@ public class ControllerTest {
                 .build();
 
         // Create application
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         ZoneId zone = ZoneId.from("dev", "us-east-1");
 
         // Deploy
@@ -678,7 +678,7 @@ public class ControllerTest {
 
     @Test
     public void testSuspension() {
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                                                         .environment(Environment.prod)
                                                         .region("us-west-1")
@@ -702,7 +702,7 @@ public class ControllerTest {
     // second time will not fail
     @Test
     public void testDeletingApplicationThatHasAlreadyBeenDeleted() {
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
                 .region("us-east-3")
@@ -721,12 +721,12 @@ public class ControllerTest {
                 .environment(Environment.prod)
                 .region("us-west-1")
                 .build(true);
-        tester.deploymentContext().submit(applicationPackage);
+        tester.newDeploymentContext().submit(applicationPackage);
     }
 
     @Test
     public void testDeployApplicationWithWarnings() {
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
                 .region("us-west-1")
@@ -788,7 +788,7 @@ public class ControllerTest {
                 ZoneApiMock.fromId("prod.us-west-1"),
                 ZoneApiMock.newBuilder().with(CloudName.from("aws")).withId("prod.aws-us-east-1").build()
         );
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         var applicationPackage = new ApplicationPackageBuilder()
                 .region("aws-us-east-1")
                 .region("us-west-1")
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
index a5840cea3bd..5bbce118b1a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
@@ -57,12 +57,13 @@ import static org.junit.Assert.assertTrue;
  * A deployment context for an application. This allows fine-grained control of the deployment of an application's
  * instances.
  *
- * References to this should be acquired through {@link DeploymentTester#deploymentContext}.
+ * References to this should be acquired through {@link DeploymentTester#newDeploymentContext}.
  *
  * Tester code that is not specific to deployments should be added to either {@link ControllerTester} or
  * {@link DeploymentTester} instead of this class.
  *
  * @author mpolden
+ * @author jonmv
  */
 public class DeploymentContext {
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index 0ca035b85b2..c9e2b2c0954 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -140,8 +140,8 @@ public class DeploymentTester {
     }
 
     /** Returns the default deployment context owned by this */
-    public DeploymentContext deploymentContext() {
-        return defaultContext;
+    public DeploymentContext newDeploymentContext() {
+        return newDeploymentContext(instanceId);
     }
 
     /** Create a new deployment context for given application */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 07cddbe2c7e..754065225ae 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -59,7 +59,7 @@ public class DeploymentTriggerTest {
                 .build();
 
         // Deploy completely once
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // New version is released
         Version version = Version.fromString("6.3");
@@ -141,7 +141,7 @@ public class DeploymentTriggerTest {
 
     @Test
     public void abortsJobsOnNewApplicationChange() {
-        var app = tester.deploymentContext();
+        var app = tester.newDeploymentContext();
         app.submit()
            .runJob(systemTest)
            .runJob(stagingTest);
@@ -188,7 +188,7 @@ public class DeploymentTriggerTest {
                 .region("us-central-1")
                 .delay(Duration.ofMinutes(10)) // Delays after last region are valid, but have no effect
                 .build();
-        var app = tester.deploymentContext().submit(applicationPackage);
+        var app = tester.newDeploymentContext().submit(applicationPackage);
 
         // Test jobs pass
         app.runJob(systemTest).runJob(stagingTest);
@@ -242,7 +242,7 @@ public class DeploymentTriggerTest {
                 .region("eu-west-1")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage);
+        var app = tester.newDeploymentContext().submit(applicationPackage);
 
         // Test jobs pass
         app.runJob(systemTest).runJob(stagingTest);
@@ -279,7 +279,7 @@ public class DeploymentTriggerTest {
                                                         .region("us-central-1")
                                                         .parallel("us-west-1", "us-east-3")
                                                         .build();
-        var application = tester.deploymentContext().submit().deploy();
+        var application = tester.newDeploymentContext().submit().deploy();
 
         // The first production zone is suspended:
         tester.configServer().setSuspended(application.deploymentIdIn(ZoneId.from("prod", "us-central-1")), true);
@@ -317,7 +317,7 @@ public class DeploymentTriggerTest {
                 .region("us-east-3")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         tester.clock().advance(Duration.ofHours(1)); // --------------- Enter block window: 18:30
 
@@ -352,7 +352,7 @@ public class DeploymentTriggerTest {
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // Application on (6.1, 1.0.1)
         Version v1 = Version.fromString("6.1");
@@ -399,7 +399,7 @@ public class DeploymentTriggerTest {
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
         tester.controllerTester().upgradeSystem(new Version("9.8.7"));
         tester.upgrader().maintain();
 
@@ -441,7 +441,7 @@ public class DeploymentTriggerTest {
                 .region("us-central-1")
                 .region("eu-west-1")
                 .build();
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // productionUsCentral1 fails after deployment, causing a mismatch between deployed and successful state.
         app.submit(applicationPackage)
@@ -561,7 +561,7 @@ public class DeploymentTriggerTest {
                 .parallel("eu-west-1", "us-east-3")
                 .build();
         // Application version 1 and platform version 6.1.
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // Success in first prod zone, change cancelled between triggering and completion of eu west job.
         // One of the parallel zones get a deployment, but both fail their jobs.
@@ -613,7 +613,7 @@ public class DeploymentTriggerTest {
                 .build();
 
         // Deploy completely on default application and platform versions
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // New application change is deployed and fails in system-test for a while
         app.submit(applicationPackage).runJob(stagingTest).failDeployment(systemTest);
@@ -666,7 +666,7 @@ public class DeploymentTriggerTest {
 
         // Initial failure
         Instant initialFailure = tester.clock().instant().truncatedTo(MILLIS);
-        var app = tester.deploymentContext().submit(applicationPackage);
+        var app = tester.newDeploymentContext().submit(applicationPackage);
         app.failDeployment(systemTest);
         assertEquals("Failure age is right at initial failure",
                      initialFailure, app.instance().deploymentJobs().jobStatus().get(systemTest).firstFailing().get().at());
@@ -710,7 +710,7 @@ public class DeploymentTriggerTest {
                 .region("us-west-1")
                 .build();
         Version version1 = tester.controller().versionStatus().systemVersion().get().versionNumber();
-        var app1 = tester.deploymentContext();
+        var app1 = tester.newDeploymentContext();
 
         // First deployment: An application change
         app1.submit(applicationPackage).deploy();
@@ -855,7 +855,7 @@ public class DeploymentTriggerTest {
 
     @Test
     public void testUserInstancesNotInDeploymentSpec() {
-        var app = tester.deploymentContext();
+        var app = tester.newDeploymentContext();
         tester.controller().applications().createInstance(app.application().id().instance("user"));
         app.submit().deploy();
     }
@@ -868,7 +868,7 @@ public class DeploymentTriggerTest {
                 .environment(Environment.prod)
                 .region("us-east-3")
                 .build();
-        var app = tester.deploymentContext().submit(applicationPackage); // TODO jonmv: support instances in deployment context>
+        var app = tester.newDeploymentContext().submit(applicationPackage); // TODO jonmv: support instances in deployment context>
         app.deploy();
         assertEquals(2, app.application().instances().size());
         assertEquals(2, app.application().productionDeployments().values().stream()
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 7be2b6a9797..e0f11a0b925 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -74,6 +74,7 @@ public class InternalStepRunnerTest {
     @Before
     public void setup() {
         tester = new DeploymentTester();
+        app = tester.newDeploymentContext();
     }
 
     private SystemName system() {
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 4e4fbe00bb7..06a815819f4 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
@@ -35,7 +35,7 @@ public class DeploymentMetricsMaintainerTest {
 
     @Test
     public void updates_metrics() {
-        var application = tester.deploymentContext();
+        var application = tester.newDeploymentContext();
         application.runJob(JobType.devUsEast1, new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
 
         DeploymentMetricsMaintainer maintainer = maintainer(tester.controller());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 31f55be92a9..7c87cbf3610 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -78,7 +78,7 @@ public class MetricsReporterTest {
 
         MetricsReporter reporter = createReporter(tester.controller());
 
-        var context = tester.deploymentContext()
+        var context = tester.newDeploymentContext()
                             .submit(applicationPackage)
                             .deploy();
         reporter.maintain();
@@ -122,7 +122,7 @@ public class MetricsReporterTest {
                 .build();
 
         MetricsReporter reporter = createReporter(tester.controller());
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
 
         // Initial deployment without failures
         context.submit(applicationPackage).deploy();
@@ -174,7 +174,7 @@ public class MetricsReporterTest {
                 .region("us-east-3")
                 .build();
         MetricsReporter reporter = createReporter(tester.controller());
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         tester.configServer().generateWarnings(context.deploymentIdIn(ZoneId.from("prod", "us-west-1")), 3);
         tester.configServer().generateWarnings(context.deploymentIdIn(ZoneId.from("prod", "us-west-1")), 4);
         context.submit(applicationPackage).deploy();
@@ -186,7 +186,7 @@ public class MetricsReporterTest {
     public void build_time_reporting() {
         var tester = new DeploymentTester();
         var applicationPackage = new ApplicationPackageBuilder().region("us-west-1").build();
-        var context = tester.deploymentContext()
+        var context = tester.newDeploymentContext()
                             .submit(applicationPackage)
                             .deploy();
         assertEquals(1000, context.lastSubmission().get().buildTime().get().toEpochMilli());
@@ -207,7 +207,7 @@ public class MetricsReporterTest {
                 .region("us-east-3")
                 .build();
         MetricsReporter reporter = createReporter(tester.controller());
-        var context = tester.deploymentContext()
+        var context = tester.newDeploymentContext()
                             .deferDnsUpdates();
         reporter.maintain();
         assertEquals("Queue is empty initially", 0, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
index 58a49307733..36039c47025 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
@@ -461,7 +461,7 @@ public class UpgraderTest {
                 .region("us-west-1")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // New version is released
         version = Version.fromString("6.3");
@@ -504,7 +504,7 @@ public class UpgraderTest {
                 .region("us-east-3")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // New version is released
         version = Version.fromString("6.3");
@@ -541,7 +541,7 @@ public class UpgraderTest {
                 .region("us-east-3")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // New version is released
         version = Version.fromString("6.3");
@@ -662,7 +662,7 @@ public class UpgraderTest {
 
         // Setup applications
         var canary0 = createAndDeploy("canary0", "canary");
-        var default0 = tester.deploymentContext().submit(version6ApplicationPackage).deploy();
+        var default0 = tester.newDeploymentContext().submit(version6ApplicationPackage).deploy();
 
         // New major version is released
         version = Version.fromString("7.0");
@@ -690,7 +690,7 @@ public class UpgraderTest {
 
         // Setup applications
         var canary0 = createAndDeploy("canary", "canary");
-        var default0 = tester.deploymentContext().submit().deploy();
+        var default0 = tester.newDeploymentContext().submit().deploy();
         tester.applications().lockApplicationOrThrow(default0.application().id(),
                                                      a -> tester.applications().store(a.withMajorVersion(6)));
         assertEquals(OptionalInt.of(6), default0.application().majorVersion());
@@ -819,7 +819,7 @@ public class UpgraderTest {
                 .region("us-east-3")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // Application upgrade starts.
         app.submit(applicationPackage);
@@ -861,7 +861,7 @@ public class UpgraderTest {
                 .region("us-east-3")
                 .build();
 
-        var app = tester.deploymentContext().submit(applicationPackage).deploy();
+        var app = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
 
         // Application revision starts rolling out.
@@ -895,7 +895,7 @@ public class UpgraderTest {
         tester.controllerTester().upgradeSystem(version0);
 
         // Create an application with pinned platform version.
-        var context = tester.deploymentContext();
+        var context = tester.newDeploymentContext();
         tester.deploymentTrigger().forceChange(context.application().id(), Change.empty().withPin());
 
         context.submit().deploy();
@@ -993,7 +993,7 @@ public class UpgraderTest {
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
-        var application = tester.deploymentContext().submit(applicationPackage).deploy();
+        var application = tester.newDeploymentContext().submit(applicationPackage).deploy();
 
         // Next version is released and 2/3 deployments upgrade
         Version v2 = Version.fromString("6.2");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index 5c68fd2e370..06260da833f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -401,7 +401,7 @@ public class VersionStatusTest {
         assertEquals(commitDate0, tester.controller().versionStatus().systemVersion().get().committedAt());
 
         // Deploy app on version0 to keep computing statistics for that version
-        tester.deploymentContext().submit().deploy();
+        tester.newDeploymentContext().submit().deploy();
 
         // Commit details are updated for new version
         var version1 = tester.controllerTester().nextVersion();