diff options
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
8 files changed, 37 insertions, 45 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 3b4c3dda191..8d3fe4dbbfc 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 @@ -103,12 +103,12 @@ public class ControllerTest { tester.notifyJobCompletion(component, app1, true); assertEquals("Application version is currently not known", ApplicationVersion.unknown, - ((Change.ApplicationChange)tester.controller().applications().require(app1.id()).deploying()).version()); + tester.controller().applications().require(app1.id()).deploying().application().get()); tester.deployAndNotify(app1, applicationPackage, true, systemTest); tester.deployAndNotify(app1, applicationPackage, true, stagingTest); assertEquals(4, applications.require(app1.id()).deploymentJobs().jobStatus().size()); - ApplicationVersion applicationVersion = ((Change.ApplicationChange)tester.controller().applications().require(app1.id()).deploying()).version(); + ApplicationVersion applicationVersion = tester.controller().applications().require(app1.id()).deploying().application().get(); assertTrue("Application version has been set during deployment", applicationVersion != ApplicationVersion.unknown); assertStatus(JobStatus.initial(stagingTest) .withTriggering(version1, applicationVersion, false, "", tester.clock().instant().minus(Duration.ofMillis(1))) @@ -221,9 +221,9 @@ public class ControllerTest { tester.artifactRepository().put(app1.id(), applicationPackage, expectedVersionString); tester.notifyJobCompletion(component, app1, Optional.empty(), Optional.of(source), 37); ApplicationVersion expectedVersion = ApplicationVersion.from(source, 37); - assertEquals(expectedVersionString, ((Change.ApplicationChange) tester.controller().applications() - .require(app1.id()) - .deploying()).version().id()); + assertEquals(expectedVersionString, tester.controller().applications() + .require(app1.id()) + .deploying().application().get().id()); // Deploy without application package tester.deployAndNotify(app1, true, systemTest); @@ -380,8 +380,7 @@ public class ControllerTest { assertFalse("Change deployed", app1.deploying().isPresent()); // Version upgrade changes system version - Change.VersionChange change = new Change.VersionChange(newSystemVersion); - applications.deploymentTrigger().triggerChange(app1.id(), change); + applications.deploymentTrigger().triggerChange(app1.id(), Change.of(newSystemVersion)); tester.deployAndNotify(app1, applicationPackage, true, systemTest); tester.deployAndNotify(app1, applicationPackage, true, stagingTest); tester.deployAndNotify(app1, applicationPackage, true, productionUsWest1); @@ -669,13 +668,13 @@ public class ControllerTest { Application app = tester.createApplication(tenant, "app1", "default", 1); tester.controller().applications().lockOrThrow(app.id(), application -> { - application = application.withDeploying(new Change.VersionChange(Version.fromString("6.3"))); + application = application.withDeploying(Change.of(Version.fromString("6.3"))); applications.store(application); try { tester.deploy(app, ZoneId.from("prod", "us-east-3")); fail("Expected exception"); } catch (IllegalArgumentException e) { - assertEquals("Rejecting deployment of application 'tenant1.app1' to zone prod.us-east-3 as version change to 6.3 is not tested", e.getMessage()); + assertEquals("Rejecting deployment of application 'tenant1.app1' to zone prod.us-east-3 as upgrade to 6.3 is not tested", e.getMessage()); } }); } 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 247ec83aff2..dc8bd3e6423 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 @@ -94,12 +94,6 @@ public class DeploymentTester { return controller().applications().require(application); } - public Optional<Change.VersionChange> versionChange(ApplicationId application) { - Change change = application(application).deploying(); - if (change instanceof Change.VersionChange) return Optional.of((Change.VersionChange)change); - return Optional.empty(); - } - public void updateVersionStatus() { controller().updateVersionStatus(VersionStatus.compute(controller(), tester.controller().systemVersion())); } @@ -226,7 +220,7 @@ public class DeploymentTester { public void completeUpgrade(Application application, Version version, ApplicationPackage applicationPackage) { assertTrue(application + " has a deployment", applications().require(application.id()).deploying().isPresent()); - assertEquals(new Change.VersionChange(version), applications().require(application.id()).deploying()); + assertEquals(Change.of(version), applications().require(application.id()).deploying()); completeDeployment(application, applicationPackage, Optional.empty(), true); } @@ -240,7 +234,7 @@ public class DeploymentTester { private void completeUpgradeWithError(Application application, Version version, ApplicationPackage applicationPackage, Optional<JobType> failOnJob) { assertTrue(applications().require(application.id()).deploying().isPresent()); - assertEquals(new Change.VersionChange(version), applications().require(application.id()).deploying()); + assertEquals(Change.of(version), applications().require(application.id()).deploying()); completeDeployment(application, applicationPackage, failOnJob, true); } 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 4bc64a8f213..73c6f1c1126 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 @@ -320,7 +320,7 @@ public class DeploymentTriggerTest { new JobControl(tester.controllerTester().curator())); LockedApplication app = (LockedApplication)tester.createAndDeploy("default0", 3, "default"); // Store that we are upgrading but don't start the system-tests job - tester.controller().applications().store(app.withDeploying(new Change.VersionChange(Version.fromString("6.2")))); + tester.controller().applications().store(app.withDeploying(Change.of(Version.fromString("6.2")))); assertEquals(0, tester.buildSystem().jobs().size()); readyJobsTrigger.run(); assertEquals(1, tester.buildSystem().jobs().size()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java index b200e2d7e18..b89fcec11a5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java @@ -58,7 +58,7 @@ public class FailureRedeployerTest { tester.clock().advance(Duration.ofSeconds(1)); // Advance time so that we can detect jobs in progress tester.deployAndNotify(app, applicationPackage, false, DeploymentJobs.JobType.productionUsEast3); assertEquals("Production job is retried", 1, tester.buildSystem().jobs().size()); - assertEquals("Application has pending upgrade to " + version, version, tester.versionChange(app.id()).get().version()); + assertEquals("Application has pending upgrade to " + version, version, tester.application(app.id()).deploying().platform().get()); // Another version is released, which cancels any pending upgrades to lower versions version = Version.fromString("5.2"); @@ -66,7 +66,7 @@ public class FailureRedeployerTest { tester.deployAndNotify(app, applicationPackage, true, DeploymentJobs.JobType.productionUsEast3); // Finish previous production job. tester.upgrader().maintain(); assertEquals("Application starts upgrading to new version", 1, tester.buildSystem().jobs().size()); - assertEquals("Application has pending upgrade to " + version, version, tester.versionChange(app.id()).get().version()); + assertEquals("Application has pending upgrade to " + version, version, tester.application(app.id()).deploying().platform().get()); // Failure redeployer does not retry failing job for prod.us-east-3 as there's an ongoing deployment tester.clock().advance(Duration.ofMinutes(1)); @@ -150,7 +150,7 @@ public class FailureRedeployerTest { tester.updateVersionStatus(version); assertEquals(version, tester.controller().versionStatus().systemVersion().get().versionNumber()); tester.upgrader().maintain(); - assertEquals("Application has pending upgrade to " + version, version, tester.versionChange(app.id()).get().version()); + assertEquals("Application has pending upgrade to " + version, version, tester.application(app.id()).deploying().platform().get()); // system-test fails and exhausts all immediate retries tester.deployAndNotify(app, applicationPackage, false, DeploymentJobs.JobType.systemTest); @@ -164,7 +164,7 @@ public class FailureRedeployerTest { tester.updateVersionStatus(version); assertEquals(version, tester.controller().versionStatus().systemVersion().get().versionNumber()); tester.upgrader().maintain(); - assertEquals("Application has pending upgrade to " + version, version, tester.versionChange(app.id()).get().version()); + assertEquals("Application has pending upgrade to " + version, version, tester.application(app.id()).deploying().platform().get()); // Consume system-test job for 5.2 tester.buildSystem().takeJobsToRun(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java index d904e1f87c0..690e5c6d512 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OutstandingChangeDeployerTest.java @@ -31,9 +31,9 @@ public class OutstandingChangeDeployerTest { tester.createAndDeploy("app2", 22, "default"); Version version = new Version(6, 2); - tester.deploymentTrigger().triggerChange(tester.application("app1").id(), new Change.VersionChange(version)); + tester.deploymentTrigger().triggerChange(tester.application("app1").id(), Change.of(version)); - assertEquals(new Change.VersionChange(version), tester.application("app1").deploying()); + assertEquals(Change.of(version), tester.application("app1").deploying()); assertFalse(tester.application("app1").hasOutstandingChange()); tester.notifyJobCompletion(DeploymentJobs.JobType.component, tester.application("app1"), true); assertTrue(tester.application("app1").hasOutstandingChange()); 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 63043d39b55..c435aed96ee 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 @@ -9,7 +9,6 @@ import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.ControllerTester; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; -import com.yahoo.vespa.hosted.controller.application.Change; import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs; import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder; @@ -174,11 +173,11 @@ public class UpgraderTest { assertEquals(VespaVersion.Confidence.normal, tester.controller().versionStatus().systemVersion().get().confidence()); tester.upgrader().maintain(); assertEquals("Upgrade of defaults are scheduled", 5, tester.buildSystem().jobs().size()); - assertEquals(version54, ((Change.VersionChange)tester.application(default0.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default1.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default2.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default3.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default4.id()).deploying()).version()); + assertEquals(version54, tester.application(default0.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default1.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default2.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default3.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default4.id()).deploying().platform().get()); tester.completeUpgrade(default0, version54, "default"); // State: Default applications started upgrading to 5.4 (and one completed) Version version55 = Version.fromString("5.5"); @@ -190,11 +189,11 @@ public class UpgraderTest { assertEquals(VespaVersion.Confidence.normal, tester.controller().versionStatus().systemVersion().get().confidence()); tester.upgrader().maintain(); assertEquals("Upgrade of defaults are scheduled", 5, tester.buildSystem().jobs().size()); - assertEquals(version55, ((Change.VersionChange)tester.application(default0.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default1.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default2.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default3.id()).deploying()).version()); - assertEquals(version54, ((Change.VersionChange)tester.application(default4.id()).deploying()).version()); + assertEquals(version55, tester.application(default0.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default1.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default2.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default3.id()).deploying().platform().get()); + assertEquals(version54, tester.application(default4.id()).deploying().platform().get()); tester.completeUpgrade(default1, version54, "default"); tester.completeUpgrade(default2, version54, "default"); tester.completeUpgradeWithError(default3, version54, "default", DeploymentJobs.JobType.stagingTest); @@ -216,7 +215,7 @@ public class UpgraderTest { assertEquals("Upgrade of defaults are scheduled on 5.4 instead, since 5.5 broken: " + "This is default3 since it failed upgrade on both 5.4 and 5.5", 1, tester.buildSystem().jobs().size()); - assertEquals("5.4", ((Change.VersionChange)tester.application(default3.id()).deploying()).version().toString()); + assertEquals("5.4", tester.application(default3.id()).deploying().platform().get().toString()); } @Test diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java index f674e7be02e..46389b288c4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java @@ -82,7 +82,7 @@ public class ApplicationSerializerTest { deploymentSpec, validationOverrides, deployments, deploymentJobs, - new Change.VersionChange(Version.fromString("6.7")), + Change.of(Version.fromString("6.7")), true, Optional.of(IssueId.from("1234")), new MetricsService.ApplicationMetrics(0.5, 0.9), @@ -145,18 +145,18 @@ public class ApplicationSerializerTest { assertEquals(6, serialized.deployments().get(zone2).metrics().writeLatencyMillis(), Double.MIN_VALUE); { // test more deployment serialization cases - Application original2 = writable(original).withDeploying(Change.ApplicationChange.of(ApplicationVersion.from("hash1"))); + Application original2 = writable(original).withDeploying(Change.of(ApplicationVersion.from("hash1"))); Application serialized2 = applicationSerializer.fromSlime(applicationSerializer.toSlime(original2)); assertEquals(original2.deploying(), serialized2.deploying()); - assertEquals(((Change.ApplicationChange)serialized2.deploying()).version().source(), - ((Change.ApplicationChange)original2.deploying()).version().source()); + assertEquals(serialized2.deploying().application().get().source(), + original2.deploying().application().get().source()); - Application original3 = writable(original).withDeploying(Change.ApplicationChange.of(ApplicationVersion.from("hash1", - new SourceRevision("a", "b", "c")))); + Application original3 = writable(original).withDeploying(Change.of(ApplicationVersion.from("hash1", + new SourceRevision("a", "b", "c")))); Application serialized3 = applicationSerializer.fromSlime(applicationSerializer.toSlime(original3)); assertEquals(original3.deploying(), serialized2.deploying()); - assertEquals(((Change.ApplicationChange)serialized3.deploying()).version().source(), - ((Change.ApplicationChange)original3.deploying()).version().source()); + assertEquals(serialized3.deploying().application().get().source(), + original3.deploying().application().get().source()); Application original4 = writable(original).withDeploying(Change.empty()); Application serialized4 = applicationSerializer.fromSlime(applicationSerializer.toSlime(original4)); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json index d1e1ebe94fd..3b6d8ed71e9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-deployment-cancelled.json @@ -1 +1 @@ -{"message":"Cancelled version change to 6.1 for application 'tenant1.application1'"} +{"message":"Cancelled upgrade to 6.1 for application 'tenant1.application1'"} |