1 files changed, 1 insertions, 44 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index af846f10ffe..d9c151480fe 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -18,15 +18,14 @@ import com.yahoo.container.jdisc.config.MetricDefaultsConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.Host;
 import com.yahoo.vespa.model.HostResource;
-import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerClusterVerifier;
+import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.docproc.ContainerDocproc;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Optional;
@@ -266,48 +265,6 @@ public class ContainerClusterTest {
         assertEquals(0, cluster.getAllComponents().stream().map(c -> c.getClassId().getName()).filter(c -> c.equals("com.yahoo.jdisc.http.filter.security.RoutingConfigProvider")).count());
     }
 
-    @Test
-    public void setsRotationActiveAccordingToDeploymentSpec() {
-        String deploymentSpec = "<deployment>\n" +
-                                "  <prod>    \n" +
-                                "    <region active='true'>us-north-1</region>\n" +
-                                "    <parallel>\n" +
-                                "      <region active='false'>us-north-2</region>\n" +
-                                "      <region active='true'>us-north-3</region>\n" +
-                                "    </parallel>\n" +
-                                "    <region active='false'>us-north-4</region>\n" +
-                                "  </prod>\n" +
-                                "</deployment>";
-        for (String region : Arrays.asList("us-north-1", "us-north-3")) {
-            Container container = containerIn(region, deploymentSpec);
-            assertEquals("Region " + region + " is active", "true",
-                         container.getServicePropertyString("activeRotation"));
-        }
-        for (String region : Arrays.asList("us-north-2", "us-north-4")) {
-            Container container = containerIn(region, deploymentSpec);
-            assertEquals("Region " + region + " is inactive", "false",
-                         container.getServicePropertyString("activeRotation"));
-        }
-        Container container = containerIn("unknown", deploymentSpec);
-        assertEquals("Unknown region is inactive", "false",
-                     container.getServicePropertyString("activeRotation"));
-    }
-
-    private static Container containerIn(String regionName, String deploymentSpec) {
-        ApplicationPackage applicationPackage = new MockApplicationPackage.Builder()
-                .withDeploymentSpec(deploymentSpec)
-                .build();
-        DeployState state = new DeployState.Builder()
-                .applicationPackage(applicationPackage)
-                .properties(new DeployProperties.Builder().hostedVespa(true).zone(
-                        new Zone(Environment.prod, RegionName.from(regionName))).build()
-                )
-                .build();
-        MockRoot root = new MockRoot("foo", state);
-        ContainerCluster cluster = new ContainerCluster(root, "container0", "container1");
-        addContainer(cluster, "c1", "c1.domain");
-        return cluster.getContainers().get(0);
-    }
 
     private static void addContainer(ContainerCluster cluster, String name, String hostName) {
         Container container = new Container(cluster, name, 0);