summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2020-07-21 12:49:14 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2020-07-21 12:49:14 +0200
commitecd871806391296801f5475c991c1a2d0820c7f9 (patch)
tree4e0b9a83bd03e878b6edfbf92926b1e638969a7c /controller-server/src/test/java/com
parent4d5ddc879354e898b458150dbd7da69fecaddc0a (diff)
Create application package to remove all deployments
Diffstat (limited to 'controller-server/src/test/java/com')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java33
1 files changed, 30 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 388ca65dc40..0b26b66ccef 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -70,11 +70,9 @@ import org.junit.Before;
import org.junit.Test;
import java.io.File;
-import java.math.BigDecimal;
import java.net.URI;
import java.time.Duration;
import java.time.Instant;
-import java.time.YearMonth;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Base64;
@@ -84,7 +82,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.TreeSet;
import java.util.function.Supplier;
import static com.yahoo.application.container.handler.Request.Method.DELETE;
@@ -975,6 +972,36 @@ public class ApplicationApiTest extends ControllerContainerTest {
}
@Test
+ public void testRemovingAllDeployments() {
+ createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID);
+ ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+ .instances("instance1")
+ .region("us-west-1")
+ .region("us-east-3")
+ .region("eu-west-1")
+ .endpoint("eu", "default", "eu-west-1")
+ .endpoint("default", "default", "us-west-1", "us-east-3")
+ .build();
+
+ deploymentTester.controllerTester().createTenant("tenant1", ATHENZ_TENANT_DOMAIN.getName(), 432L);
+
+ // Create tenant and deploy
+ var app = deploymentTester.newDeploymentContext("tenant1", "application1", "instance1");
+ app.submit(applicationPackage).deploy();
+ tester.controller().jobController().deploy(app.instanceId(), JobType.devUsEast1, Optional.empty(), applicationPackage);
+
+ assertEquals(Set.of(ZoneId.from("prod.us-west-1"), ZoneId.from("prod.us-east-3"), ZoneId.from("prod.eu-west-1"), ZoneId.from("dev.us-east-1")),
+ app.instance().deployments().keySet());
+
+ tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/deployment", DELETE)
+ .userIdentity(USER_ID)
+ .oktaAccessToken(OKTA_AT).oktaIdentityToken(OKTA_IT),
+ "{\"message\":\"Application package version: 1.0.2-unknown\"}");
+
+ assertEquals(Set.of(ZoneId.from("dev.us-east-1")), app.instance().deployments().keySet());
+ }
+
+ @Test
public void testErrorResponses() throws Exception {
createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID);