Stop reading rotations prepare parameter

3 files changed, 4 insertions, 77 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index a21e12a5d42..5b75371a13e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.config.server.session;
 
 import com.yahoo.component.Version;
+import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.TenantName;
@@ -10,12 +11,10 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.config.server.TimeoutBudget;
 import com.yahoo.vespa.config.server.http.SessionHandler;
-import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.vespa.config.server.tenant.ContainerEndpointSerializer;
 
 import java.time.Clock;
 import java.time.Duration;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -33,7 +32,6 @@ public final class PrepareParams {
     static final String DRY_RUN_PARAM_NAME = "dryRun";
     static final String VERBOSE_PARAM_NAME = "verbose";
     static final String VESPA_VERSION_PARAM_NAME = "vespaVersion";
-    static final String ROTATIONS_PARAM_NAME = "rotations";
     static final String CONTAINER_ENDPOINTS_PARAM_NAME = "containerEndpoints";
     static final String TLS_SECRETS_KEY_NAME_PARAM_NAME = "tlsSecretsKeyName";
 
@@ -76,7 +74,6 @@ public final class PrepareParams {
         private ApplicationId applicationId = ApplicationId.defaultId();
         private TimeoutBudget timeoutBudget = new TimeoutBudget(Clock.systemUTC(), Duration.ofSeconds(30));
         private Optional<Version> vespaVersion = Optional.empty();
-        private Set<Rotation> rotations;
         private List<ContainerEndpoint> containerEndpoints = List.of();
         private Optional<String> tlsSecretsKeyName = Optional.empty();
 
@@ -126,17 +123,6 @@ public final class PrepareParams {
             return this;
         }
 
-        public Builder rotations(String rotationsString) {
-            this.rotations = new LinkedHashSet<>();
-            if (rotationsString != null && !rotationsString.isEmpty()) {
-                String[] rotations = rotationsString.split(",");
-                for (String s : rotations) {
-                    this.rotations.add(new Rotation(s));
-                }
-            }
-            return this;
-        }
-
         public Builder containerEndpoints(String serialized) {
             if (serialized == null) return this;
             Slime slime = SlimeUtils.jsonToSlime(serialized);
@@ -152,7 +138,7 @@ public final class PrepareParams {
 
         public PrepareParams build() {
             return new PrepareParams(applicationId, timeoutBudget, ignoreValidationErrors, dryRun, 
-                                     verbose, isBootstrap, vespaVersion, rotations, containerEndpoints, tlsSecretsKeyName);
+                                     verbose, isBootstrap, vespaVersion, Set.of(), containerEndpoints, tlsSecretsKeyName);
         }
 
     }
@@ -164,7 +150,6 @@ public final class PrepareParams {
                             .timeoutBudget(SessionHandler.getTimeoutBudget(request, barrierTimeout))
                             .applicationId(createApplicationId(request, tenant))
                             .vespaVersion(request.getProperty(VESPA_VERSION_PARAM_NAME))
-                            .rotations(request.getProperty(ROTATIONS_PARAM_NAME))
                             .containerEndpoints(request.getProperty(CONTAINER_ENDPOINTS_PARAM_NAME))
                             .tlsSecretsKeyName(request.getProperty(TLS_SECRETS_KEY_NAME_PARAM_NAME))
                             .build();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index f5fd6053b07..3f5d06b7071 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -1,12 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
-import com.yahoo.component.Version;
+import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
-import com.yahoo.config.model.api.ContainerEndpoint;
 import org.junit.Test;
 
 import java.net.URLEncoder;
@@ -14,12 +12,8 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -30,7 +24,6 @@ import static org.junit.Assert.assertTrue;
  */
 public class PrepareParamsTest {
 
-    private static final String rotation = "rotation-042.vespa.a02.yahoodns.net";
     private static final String vespaVersion = "6.37.49";
     private static final String request = "http://foo:19071/application/v2/tenant/foo/application/bar?" +
                                           PrepareParams.DRY_RUN_PARAM_NAME + "=true&" +
@@ -49,36 +42,7 @@ public class PrepareParamsTest {
         assertFalse(prepareParams.ignoreValidationErrors());
         assertThat(prepareParams.vespaVersion(), is(Optional.<String>empty()));
         assertTrue(prepareParams.getTimeoutBudget().hasTimeLeft());
-        assertThat(prepareParams.rotations().size(), is(0));
-    }
-   
-    @Test
-    public void testCorrectParsingWithRotation() {
-        PrepareParams prepareParams = createParams(request + "&" +
-                                                   PrepareParams.ROTATIONS_PARAM_NAME + "=" + rotation,
-                                                   TenantName.from("foo"));
-
-        assertThat(prepareParams.getApplicationId().serializedForm(), is("foo:baz:default"));
-        assertTrue(prepareParams.isDryRun());
-        assertTrue(prepareParams.isVerbose());
-        assertFalse(prepareParams.ignoreValidationErrors());
-        Version expectedVersion = Version.fromString(vespaVersion);
-        assertThat(prepareParams.vespaVersion().get(), is(expectedVersion));
-        assertTrue(prepareParams.getTimeoutBudget().hasTimeLeft());
-        Set<Rotation> rotations = prepareParams.rotations();
-        assertThat(rotations.size(), is(1));
-        assertThat(rotations, contains(equalTo(new Rotation(rotation))));
-    }
-
-    @Test
-    public void testCorrectParsingWithSeveralRotations() {
-        String rotationTwo = "rotation-043.vespa.a02.yahoodns.net";
-        String twoRotations = rotation + "," + rotationTwo;
-        PrepareParams prepareParams = createParams(request + "&" +
-                                      PrepareParams.ROTATIONS_PARAM_NAME + "=" + twoRotations,
-                                      TenantName.from("foo"));
-        Set<Rotation> rotations = prepareParams.rotations();
-        assertThat(rotations, containsInAnyOrder(new Rotation(rotation), new Rotation(rotationTwo)));
+        assertThat(prepareParams.containerEndpoints().size(), is(0));
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index e219c516f95..fbc36d37769 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -194,15 +194,6 @@ public class SessionPreparerTest {
     }
 
     @Test
-    public void require_that_rotations_are_written_in_prepare() throws IOException {
-        final String rotations = "mediasearch.msbe.global.vespa.yahooapis.com";
-        final ApplicationId applicationId = applicationId("test");
-        PrepareParams params = new PrepareParams.Builder().applicationId(applicationId).rotations(rotations).build();
-        prepare(new File("src/test/resources/deploy/app"), params);
-        assertThat(readRotationsFromZK(applicationId), contains(new Rotation(rotations)));
-    }
-
-    @Test
     public void require_that_rotations_are_read_from_zookeeper_and_used() throws IOException {
         final TestModelFactory modelFactory = new TestModelFactory(version123);
         preparer = createPreparer(new ModelFactoryRegistry(Collections.singletonList(modelFactory)),
@@ -225,19 +216,6 @@ public class SessionPreparerTest {
     }
 
     @Test
-    public void require_that_rotations_are_written_as_container_endpoints() throws Exception {
-        var rotations = "app1.tenant1.global.vespa.example.com,rotation-042.vespa.global.routing";
-        var applicationId = applicationId("test");
-        var params = new PrepareParams.Builder().applicationId(applicationId).rotations(rotations).build();
-        prepare(new File("src/test/resources/deploy/hosted-app"), params);
-
-        var expected = List.of(new ContainerEndpoint("qrs",
-                                                     List.of("app1.tenant1.global.vespa.example.com",
-                                                             "rotation-042.vespa.global.routing")));
-        assertEquals(expected, readContainerEndpoints(applicationId));
-    }
-
-    @Test
     public void require_that_container_endpoints_are_written() throws Exception {
         var endpoints = "[\n" +
                         "  {\n" +