Remove global-service-id

13 files changed, 22 insertions, 186 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 3d550973f22..bceef3fd96f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.controller;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
-import com.yahoo.config.application.api.DeploymentInstanceSpec;
 import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
@@ -158,15 +157,6 @@ public class RoutingController {
         DeploymentSpec deploymentSpec = application.deploymentSpec();
         for (var spec : deploymentSpec.instances()) {
             ApplicationId instance = application.id().instance(spec.name());
-            // Add endpoint declared with legacy syntax
-            spec.globalServiceId().ifPresent(clusterId -> {
-                List<DeploymentId> deployments = spec.zones().stream()
-                                                     .filter(zone -> zone.concerns(Environment.prod))
-                                                     .map(zone -> new DeploymentId(instance, ZoneId.from(Environment.prod, zone.region().get())))
-                                                     .toList();
-                RoutingId routingId = RoutingId.of(instance, EndpointId.defaultId());
-                endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(clusterId), deployments, generatedEndpoints));
-            });
             // Add endpoints declared with current syntax
             spec.endpoints().forEach(declaredEndpoint -> {
                 RoutingId routingId = RoutingId.of(instance, EndpointId.of(declaredEndpoint.endpointId()));
@@ -275,7 +265,6 @@ public class RoutingController {
         }
 
         // Add endpoints backed by a rotation, and register them in DNS if necessary
-        boolean registerLegacyNames = requiresLegacyNames(application.get().deploymentSpec(), instanceName);
         Instance instance = application.get().require(instanceName);
         Set<ContainerEndpoint> containerEndpoints = new HashSet<>();
         DeploymentId deployment = new DeploymentId(instance.id(), zone);
@@ -285,16 +274,11 @@ public class RoutingController {
             EndpointList rotationEndpoints = globalEndpoints.named(assignedRotation.endpointId(), Scope.global)
                                                             .requiresRotation();
 
-            // Skip rotations which do not apply to this zone. Legacy names always point to all zones
-            if (!registerLegacyNames && !assignedRotation.regions().contains(zone.region())) {
+            // Skip rotations which do not apply to this zone
+            if (!assignedRotation.regions().contains(zone.region())) {
                 continue;
             }
 
-            // Omit legacy DNS names when assigning rotations using <endpoints/> syntax
-            if (!registerLegacyNames) {
-                rotationEndpoints = rotationEndpoints.not().legacy();
-            }
-
             // Register names in DNS
             Rotation rotation = rotationRepository.requireRotation(assignedRotation.rotationId());
             for (var endpoint : rotationEndpoints) {
@@ -480,13 +464,6 @@ public class RoutingController {
         return randomizedEndpoints.with(FetchVector.Dimension.APPLICATION_ID, instance.serializedForm()).value();
     }
 
-    /** Whether legacy global DNS names should be available for given application */
-    private static boolean requiresLegacyNames(DeploymentSpec deploymentSpec, InstanceName instanceName) {
-        return deploymentSpec.instance(instanceName)
-                             .flatMap(DeploymentInstanceSpec::globalServiceId)
-                             .isPresent();
-    }
-
     /** Create a common name based on a hash of given application. This must be less than 64 characters long. */
     private static String commonNameHashOf(ApplicationId application, SystemName system) {
         @SuppressWarnings("deprecation") // for Hashing.sha1()
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
index 186e6838a71..0c05d710763 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
@@ -21,8 +21,6 @@ import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Controller;
-import com.yahoo.vespa.hosted.controller.application.EndpointId;
-import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -31,7 +29,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
@@ -179,9 +176,10 @@ public class ApplicationPackageValidator {
         if (applicationPackage.validationOverrides().allows(validationId, instant)) return;
 
         var endpoints = application.deploymentSpec().instance(instanceName)
-                                   .map(ApplicationPackageValidator::allEndpointsOf)
+                                   .map(deploymentInstanceSpec1 -> deploymentInstanceSpec1.endpoints())
                                    .orElseGet(List::of);
-        var newEndpoints = allEndpointsOf(applicationPackage.deploymentSpec().requireInstance(instanceName));
+        DeploymentInstanceSpec deploymentInstanceSpec = applicationPackage.deploymentSpec().requireInstance(instanceName);
+        var newEndpoints = new ArrayList<>(deploymentInstanceSpec.endpoints());
 
         if (newEndpoints.containsAll(endpoints)) return; // Adding new endpoints is fine
         if (containsAllDestinationsOf(endpoints, newEndpoints)) return; // Adding destinations is fine
@@ -255,26 +253,6 @@ public class ApplicationPackageValidator {
         return containsAllRegions && hasSameCluster;
     }
 
-    /** Returns all configued endpoints of given deployment instance spec */
-    private static List<Endpoint> allEndpointsOf(DeploymentInstanceSpec deploymentInstanceSpec) {
-        var endpoints = new ArrayList<>(deploymentInstanceSpec.endpoints());
-        legacyEndpoint(deploymentInstanceSpec).ifPresent(endpoints::add);
-        return endpoints;
-    }
-
-    /** Returns global service ID as an endpoint, if any global service ID is set */
-    private static Optional<Endpoint> legacyEndpoint(DeploymentInstanceSpec instance) {
-        return instance.globalServiceId().map(globalServiceId -> {
-            var targets = instance.zones().stream()
-                                  .filter(zone -> zone.environment().isProduction())
-                                  .flatMap(zone -> zone.region().stream())
-                                  .distinct()
-                                  .map(region -> new Endpoint.Target(region, instance.name(), 1))
-                                  .toList();
-            return new Endpoint(EndpointId.defaultId().id(), globalServiceId, Endpoint.Level.instance, targets);
-        });
-    }
-
     /** Returns a list of the non-compactable IDs of given instance and endpoint */
     private static List<String> nonCompactableIds(InstanceName instance, Endpoint endpoint) {
         List<String> ids = new ArrayList<>(2);
@@ -287,16 +265,6 @@ public class ApplicationPackageValidator {
         return ids;
     }
 
-    private static class InstanceEndpoint {
-
-        private final InstanceName instance;
-        private final String endpointId;
-
-        public InstanceEndpoint(InstanceName instance, String endpointId) {
-            this.instance = instance;
-            this.endpointId = endpointId;
-        }
-
-    }
+    private record InstanceEndpoint(InstanceName instance, String endpointId) {}
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index a309afcd039..8fae3309f2b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -658,10 +658,6 @@ public class RoutingPolicies {
             if (instanceSpec.isEmpty()) {
                 return Set.of();
             }
-            if (instanceSpec.get().globalServiceId().filter(id -> id.equals(loadBalancer.cluster().value())).isPresent()) {
-                // Legacy assignment always has the default endpoint ID
-                return Set.of(EndpointId.defaultId());
-            }
             return instanceSpec.get().endpoints().stream()
                                .filter(endpoint -> endpoint.containerId().equals(loadBalancer.cluster().value()))
                                .filter(endpoint -> endpoint.regions().contains(deployment.zoneId().region()))
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
index 1e9f11e0349..d54bdead0bd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.routing.rotation;
 
-import com.yahoo.config.application.api.DeploymentInstanceSpec;
 import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.application.api.Endpoint;
 import com.yahoo.config.provision.ApplicationId;
@@ -63,44 +62,10 @@ public class RotationRepository {
     }
 
     /**
-     * Returns a single rotation for the given application. This is only used when a rotation is assigned through the
-     * use of a global service ID.
-     *
-     * If a rotation is already assigned to the application, that rotation will be returned.
-     * If no rotation is assigned, return an available rotation. The caller is responsible for assigning the rotation.
-     *
-     * @param instanceSpec the instance deployment spec
-     * @param instance the instance requesting a rotation
-     * @param lock lock which must be acquired by the caller
-     */
-    private AssignedRotation assignRotationTo(String globalServiceId, DeploymentInstanceSpec instanceSpec,
-                                              Instance instance, RotationLock lock) {
-        RotationId rotation;
-        if (instance.rotations().isEmpty()) {
-            rotation = findAvailableRotation(instance.id(), lock).id();
-        } else {
-            rotation = instance.rotations().get(0).rotationId();
-        }
-        var productionRegions = instanceSpec.zones().stream()
-                                            .filter(zone -> zone.environment().isProduction())
-                                            .flatMap(zone -> zone.region().stream())
-                                            .collect(Collectors.toSet());
-        if (productionRegions.size() < 2) {
-            throw new IllegalArgumentException("global-service-id is set but less than 2 prod zones are defined " +
-                                               "in instance '" + instance.name() + "'");
-        }
-        return new AssignedRotation(new ClusterSpec.Id(globalServiceId),
-                                    EndpointId.defaultId(),
-                                    rotation,
-                                    productionRegions);
-    }
-
-    /**
      * Returns rotation assignments for all endpoints in application.
      *
      * If rotations are already assigned, these will be returned.
      * If rotations are not assigned, a new assignment will be created taking new rotations from the repository.
-     * This method supports both global-service-id as well as the new endpoints tag.
      *
      * @param deploymentSpec The deployment spec of the application
      * @param instance The application requesting rotations
@@ -112,19 +77,7 @@ public class RotationRepository {
         if (allRotations.isEmpty()) {
             return List.of();
         }
-
-        // Only allow one kind of configuration syntax
         var instanceSpec = deploymentSpec.requireInstance(instance.name());
-        if (     instanceSpec.globalServiceId().isPresent()
-            && ! instanceSpec.endpoints().isEmpty()) {
-            throw new IllegalArgumentException("Cannot provision rotations with both global-service-id and 'endpoints'");
-        }
-
-        // Support legacy global-service-id
-        if (instanceSpec.globalServiceId().isPresent()) {
-            return List.of(assignRotationTo(instanceSpec.globalServiceId().get(), instanceSpec, instance, lock));
-        }
-
         return assignRotationsTo(instanceSpec.endpoints(), instance, lock);
     }
 
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 3d2a66adc81..c46a28c4567 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
@@ -384,7 +384,7 @@ public class ControllerTest {
     void testDnsUpdatesForGlobalEndpointLegacySyntax() {
         var context = tester.newDeploymentContext("tenant1", "app1", "default");
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region("us-west-1")
                 .region("us-central-1") // Two deployments should result in each DNS alias being registered once
                 .build();
@@ -1532,22 +1532,6 @@ public class ControllerTest {
     }
 
     @Test
-    void testSubmitWithElementDeprecatedOnPreviousMajor() {
-        DeploymentContext context = tester.newDeploymentContext();
-        var applicationPackage = new ApplicationPackageBuilder()
-                .compileVersion(Version.fromString("8.1"))
-                .region("us-west-1")
-                .globalServiceId("qrs")
-                .build();
-        try {
-            context.submit(applicationPackage).deploy();
-            fail("Expected exception");
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("Element 'prod' contains attribute 'global-service-id' deprecated since major version 7"));
-        }
-    }
-
-    @Test
     void testDeactivateDeploymentUnknownByController() {
         DeploymentContext context = tester.newDeploymentContext();
         DeploymentId deployment = context.deploymentIdIn(ZoneId.from("prod", "us-west-1"));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 965201ec6da..a70125815b1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -65,7 +65,6 @@ public class ApplicationPackageBuilder {
     private String revisionTarget = "latest";
     private String revisionChange = "always";
     private String upgradeRollout = null;
-    private String globalServiceId = null;
     private String athenzIdentityAttributes = "athenz-domain='domain' athenz-service='service'";
     private String searchDefinition = "search test { }";
     private Version compileVersion = Version.fromString("6.1");
@@ -101,11 +100,6 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
-    public ApplicationPackageBuilder globalServiceId(String globalServiceId) {
-        this.globalServiceId = globalServiceId;
-        return this;
-    }
-
     public ApplicationPackageBuilder endpoint(String id, String containerId, String... regions) {
         endpointsBody.append("      <endpoint");
         endpointsBody.append(" id='").append(id).append("'");
@@ -335,13 +329,7 @@ public class ApplicationPackageBuilder {
                 xml.append(" />\n");
             });
             xml.append(blockChange);
-            xml.append("    <prod");
-            if (globalServiceId != null) {
-                xml.append(" global-service-id='");
-                xml.append(globalServiceId);
-                xml.append("'");
-            }
-            xml.append(">\n");
+            xml.append("    <prod>\n");
             xml.append(prodBody);
             xml.append("    </prod>\n");
             if (endpointsBody.length() > 0) {
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 53f2e85ad31..2f4e9a0dbef 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
@@ -275,7 +275,7 @@ public class MetricsReporterTest {
     void name_service_queue_size_metric() {
         var tester = new DeploymentTester();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .globalServiceId("default")
+                .endpoint("default", "foo")
                 .region("us-west-1")
                 .region("us-east-3")
                 .build();
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 69b473dce87..f287bc52604 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
@@ -78,8 +78,8 @@ public class ApplicationSerializerTest {
         DeploymentSpec deploymentSpec = DeploymentSpec.fromXml("<deployment version='1.0'>\n" +
                 "   <staging/>\n" +
                 "   <instance id=\"i1\">\n" +
-                "      <prod global-service-id=\"default\">\n" +
-                "         <region active=\"true\">us-west-1</region>\n" +
+                "      <prod>\n" +
+                "         <region>us-west-1</region>\n" +
                 "      </prod>\n" +
                 "   </instance>\n" +
                 "</deployment>");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
index ec36f52c23a..32f7e8e8f5a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-application.json
@@ -2,7 +2,7 @@
   "id": "tenant1:app1",
   "internal": true,
   "deploymentIssueId": "321",
-  "deploymentSpecField": "<deployment version='1.0'>\n  <test />\n  <!--<staging />-->\n  <prod global-service-id=\"foo\">\n    <region active=\"true\">us-east-3</region>\n    <region active=\"true\">us-west-1</region>\n  </prod>\n</deployment>\n",
+  "deploymentSpecField": "<deployment version='1.0'>\n  <test />\n  <!--<staging />-->\n  <prod>\n    <region>us-east-3</region>\n    <region>us-west-1</region>\n  </prod>\n</deployment>\n",
   "validationOverrides": "<validation-overrides>\n    <allow until=\"2016-04-28\" comment=\"Renaming content cluster\">content-cluster-removal</allow>\n    <allow until=\"2016-08-22\" comment=\"Migrating us-east-3 to C-2E\">cluster-size-reduction</allow>\n    <allow until=\"2017-06-30\" comment=\"Test Vespa upgrade tests\">force-automatic-tenant-upgrade-test</allow>\n</validation-overrides>\n",
   "projectId": 102889,
   "deployingField": {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 3cd9d586350..915466dac26 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -542,7 +542,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         var applicationPackage = new ApplicationPackageBuilder()
                 .trustDefaultCertificate()
                 .instances("default")
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region("aws-us-east-1c")
                 .build();
         new ControllerTester(tester).upgradeSystem(new Version("6.1"));
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 14c279c9ef8..98775ea214d 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
@@ -130,7 +130,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
     private static final ApplicationPackage applicationPackageDefault = new ApplicationPackageBuilder()
             .withoutAthenzIdentity()
             .instances("default")
-            .globalServiceId("foo")
+            .endpoint("default", "foo")
             .region("us-central-1")
             .region("us-east-3")
             .region("us-west-1")
@@ -140,7 +140,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
     private static final ApplicationPackage applicationPackageInstance1 = new ApplicationPackageBuilder()
             .withoutAthenzIdentity()
             .instances("instance1")
-            .globalServiceId("foo")
+            .endpoint("default", "foo")
             .region("us-central-1")
             .region("us-east-3")
             .region("us-west-1")
@@ -343,7 +343,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .withoutAthenzIdentity()
                 .instances("instance1")
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region("us-west-1")
                 .region("us-east-3")
                 .allow(ValidationId.globalEndpointChange)
@@ -864,7 +864,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         // Third attempt has a service under the domain of the tenant, and also succeeds.
         ApplicationPackage packageWithService = new ApplicationPackageBuilder()
                 .instances("instance1")
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from(ATHENZ_TENANT_DOMAIN.getName()), AthenzService.from("service"))
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
@@ -1043,7 +1043,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         var eastZone = ZoneId.from("prod", "us-east-3");
         var applicationPackage = new ApplicationPackageBuilder()
                 .instances("instance1")
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region(westZone.region())
                 .region(eastZone.region())
                 .build();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index 02f030aa758..e41856b0c3d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -234,27 +234,6 @@ public class RoutingPoliciesTest {
     }
 
     @Test
-    void global_routing_policies_legacy_global_service_id() {
-        var tester = new RoutingPoliciesTester();
-        var context = tester.newDeploymentContext("tenant1", "app1", "default");
-        int clustersPerZone = 2;
-        int numberOfDeployments = 2;
-        var applicationPackage = applicationPackageBuilder()
-                .region(zone1.region())
-                .region(zone2.region())
-                .globalServiceId("c0")
-                .build();
-        tester.provisionLoadBalancers(clustersPerZone, context.instanceId(), zone1, zone2);
-
-        // Creates alias records
-        context.submit(applicationPackage).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
-        tester.assertTargets(context.instanceId(), EndpointId.defaultId(), 0, zone1, zone2);
-        assertEquals(numberOfDeployments * clustersPerZone,
-                tester.policiesOf(context.instance().id()).size(),
-                "Routing policy count is equal to cluster count");
-    }
-
-    @Test
     void zone_routing_policies() {
         zone_routing_policies(false);
         zone_routing_policies(true);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
index 168a1345c39..6190680d098 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepositoryTest.java
@@ -41,7 +41,7 @@ public class RotationRepositoryTest {
         );
 
     private static final ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-            .globalServiceId("foo")
+            .endpoint("default", "foo")
             .region("us-east-3")
             .region("us-west-1")
             .build();
@@ -74,7 +74,7 @@ public class RotationRepositoryTest {
 
         // Adding region updates rotation
         var applicationPackage = new ApplicationPackageBuilder()
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region("us-east-3")
                 .region("us-west-1")
                 .region("us-central-1")
@@ -116,15 +116,6 @@ public class RotationRepositoryTest {
     }
 
     @Test
-    void too_few_zones() {
-        ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .globalServiceId("foo")
-                .region("us-east-3")
-                .build();
-        application.submit(applicationPackage).runJobExpectingFailure(DeploymentContext.systemTest, "less than 2 prod zones are defined");
-    }
-
-    @Test
     void no_rotation_assigned_for_application_without_service_id() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .region("us-east-3")
@@ -137,7 +128,7 @@ public class RotationRepositoryTest {
     @Test
     void prefixes_system_when_not_main() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .globalServiceId("foo")
+                .endpoint("default", "foo")
                 .region("cd-us-east-1")
                 .region("cd-us-west-1")
                 .build();
@@ -164,7 +155,7 @@ public class RotationRepositoryTest {
                 .instances("instance1,instance2")
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
-                .globalServiceId("global")
+                .endpoint("default", "global")
                 .build();
         var instance1 = tester.newDeploymentContext("tenant1", "application1", "instance1")
                 .submit(applicationPackage)