Revert "Remove global-service-id"

14 files changed, 263 insertions, 52 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 bceef3fd96f..3d550973f22 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,6 +4,7 @@ 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;
@@ -157,6 +158,15 @@ 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()));
@@ -265,6 +275,7 @@ 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);
@@ -274,11 +285,16 @@ public class RoutingController {
             EndpointList rotationEndpoints = globalEndpoints.named(assignedRotation.endpointId(), Scope.global)
                                                             .requiresRotation();
 
-            // Skip rotations which do not apply to this zone
-            if (!assignedRotation.regions().contains(zone.region())) {
+            // Skip rotations which do not apply to this zone. Legacy names always point to all zones
+            if (!registerLegacyNames && !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) {
@@ -464,6 +480,13 @@ 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 0c05d710763..186e6838a71 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,6 +21,8 @@ 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;
@@ -29,6 +31,7 @@ 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;
@@ -176,10 +179,9 @@ public class ApplicationPackageValidator {
         if (applicationPackage.validationOverrides().allows(validationId, instant)) return;
 
         var endpoints = application.deploymentSpec().instance(instanceName)
-                                   .map(deploymentInstanceSpec1 -> deploymentInstanceSpec1.endpoints())
+                                   .map(ApplicationPackageValidator::allEndpointsOf)
                                    .orElseGet(List::of);
-        DeploymentInstanceSpec deploymentInstanceSpec = applicationPackage.deploymentSpec().requireInstance(instanceName);
-        var newEndpoints = new ArrayList<>(deploymentInstanceSpec.endpoints());
+        var newEndpoints = allEndpointsOf(applicationPackage.deploymentSpec().requireInstance(instanceName));
 
         if (newEndpoints.containsAll(endpoints)) return; // Adding new endpoints is fine
         if (containsAllDestinationsOf(endpoints, newEndpoints)) return; // Adding destinations is fine
@@ -253,6 +255,26 @@ 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);
@@ -265,6 +287,16 @@ public class ApplicationPackageValidator {
         return ids;
     }
 
-    private record InstanceEndpoint(InstanceName instance, String endpointId) {}
+    private static class InstanceEndpoint {
+
+        private final InstanceName instance;
+        private final String endpointId;
+
+        public InstanceEndpoint(InstanceName instance, String endpointId) {
+            this.instance = instance;
+            this.endpointId = 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 c8c3d057ee3..a309afcd039 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
@@ -112,20 +112,21 @@ public class RoutingPolicies {
         List<LoadBalancer> loadBalancers = controller.serviceRegistry().configServer()
                                                      .getLoadBalancers(instance, deployment.zoneId());
         LoadBalancerAllocation allocation = new LoadBalancerAllocation(deployment, deploymentSpec, loadBalancers);
+        Set<ZoneId> inactiveZones = inactiveZones(instance, deploymentSpec);
         Optional<TenantAndApplicationId> owner = ownerOf(allocation);
         try (var lock = db.lockRoutingPolicies()) {
             RoutingPolicyList applicationPolicies = read(TenantAndApplicationId.from(instance));
             RoutingPolicyList deploymentPolicies = applicationPolicies.deployment(allocation.deployment);
 
-            removeGlobalDnsUnreferencedBy(allocation, deploymentPolicies, lock);
+            removeGlobalDnsUnreferencedBy(allocation, deploymentPolicies, inactiveZones, lock);
             removeApplicationDnsUnreferencedBy(allocation, deploymentPolicies, lock);
 
             RoutingPolicyList instancePolicies = storePoliciesOf(allocation, applicationPolicies, generatedEndpoints, lock);
             instancePolicies = removePoliciesUnreferencedBy(allocation, instancePolicies, lock);
 
             RoutingPolicyList updatedApplicationPolicies = applicationPolicies.replace(instance, instancePolicies);
-            updateGlobalDnsOf(instancePolicies, Optional.of(deployment), owner, lock);
-            updateApplicationDnsOf(updatedApplicationPolicies, deployment, owner, lock);
+            updateGlobalDnsOf(instancePolicies, Optional.of(deployment), inactiveZones, owner, lock);
+            updateApplicationDnsOf(updatedApplicationPolicies, inactiveZones, deployment, owner, lock);
         }
     }
 
@@ -136,7 +137,7 @@ public class RoutingPolicies {
                                                                                        controller.clock().instant())));
             Map<ApplicationId, RoutingPolicyList> allPolicies = readAll().groupingBy(policy -> policy.id().owner());
             allPolicies.forEach((instance, policies) -> {
-                updateGlobalDnsOf(policies, Optional.empty(), Optional.of(TenantAndApplicationId.from(instance)), lock);
+                updateGlobalDnsOf(policies, Optional.empty(), Set.of(), Optional.of(TenantAndApplicationId.from(instance)), lock);
             });
         }
     }
@@ -156,16 +157,17 @@ public class RoutingPolicies {
             Map<ApplicationId, RoutingPolicyList> policiesByInstance = effectivePolicies.groupingBy(policy -> policy.id().owner());
             policiesByInstance.forEach((ignored, instancePolicies) -> updateGlobalDnsOf(instancePolicies,
                                                                                         Optional.of(deployment),
+                                                                                        Set.of(),
                                                                                         ownerOf(deployment),
                                                                                         lock));
-            updateApplicationDnsOf(effectivePolicies, deployment, ownerOf(deployment), lock);
+            updateApplicationDnsOf(effectivePolicies, Set.of(), deployment, ownerOf(deployment), lock);
             policiesByInstance.forEach((owner, instancePolicies) -> db.writeRoutingPolicies(owner, instancePolicies.asList()));
         }
     }
 
     /** Update global DNS records for given policies */
     private void updateGlobalDnsOf(RoutingPolicyList instancePolicies, Optional<DeploymentId> deployment,
-                                   Optional<TenantAndApplicationId> owner,
+                                   Set<ZoneId> inactiveZones, Optional<TenantAndApplicationId> owner,
                                    @SuppressWarnings("unused") Mutex lock) {
         Map<RoutingId, List<RoutingPolicy>> routingTable = instancePolicies.asInstanceRoutingTable();
         for (Map.Entry<RoutingId, List<RoutingPolicy>> routeEntry : routingTable.entrySet()) {
@@ -173,17 +175,17 @@ public class RoutingPolicies {
             controller.routing().readDeclaredEndpointsOf(routingId.instance())
                       .named(routingId.endpointId(), Endpoint.Scope.global)
                       .not().requiresRotation()
-                      .forEach(endpoint -> updateGlobalDnsOf(endpoint, routeEntry.getValue(), deployment, owner));
+                      .forEach(endpoint -> updateGlobalDnsOf(endpoint, inactiveZones, routeEntry.getValue(), deployment, owner));
         }
     }
 
     /** Update global DNS records for given global endpoint */
-    private void updateGlobalDnsOf(Endpoint endpoint, List<RoutingPolicy> policies,
+    private void updateGlobalDnsOf(Endpoint endpoint, Set<ZoneId> inactiveZones, List<RoutingPolicy> policies,
                                    Optional<DeploymentId> deployment, Optional<TenantAndApplicationId> owner) {
         if (endpoint.scope() != Endpoint.Scope.global) throw new IllegalArgumentException("Endpoint " + endpoint + " is not global");
         if (deployment.isPresent() && !endpoint.deployments().contains(deployment.get())) return;
 
-        Collection<RegionEndpoint> regionEndpoints = computeRegionEndpoints(endpoint, policies);
+        Collection<RegionEndpoint> regionEndpoints = computeRegionEndpoints(endpoint, policies, inactiveZones);
         Set<AliasTarget> latencyTargets = new LinkedHashSet<>();
         Set<AliasTarget> inactiveLatencyTargets = new LinkedHashSet<>();
         for (var regionEndpoint : regionEndpoints) {
@@ -235,7 +237,7 @@ public class RoutingPolicies {
     }
 
     /** Compute region endpoints and their targets from given policies */
-    private Collection<RegionEndpoint> computeRegionEndpoints(Endpoint parent, List<RoutingPolicy> policies) {
+    private Collection<RegionEndpoint> computeRegionEndpoints(Endpoint parent, List<RoutingPolicy> policies, Set<ZoneId> inactiveZones) {
         if (!parent.scope().multiDeployment()) {
             throw new IllegalArgumentException(parent + " has unexpected scope");
         }
@@ -246,7 +248,7 @@ public class RoutingPolicies {
             Endpoint endpoint = policy.regionEndpointIn(controller.system(), RoutingMethod.exclusive, parent.generated());
             var zonePolicy = db.readZoneRoutingPolicy(policy.id().zone());
             long weight = 1;
-            if (isConfiguredOut(zonePolicy, policy)) {
+            if (isConfiguredOut(zonePolicy, policy, inactiveZones)) {
                 weight = 0; // A record with 0 weight will not receive traffic. If all records within a group have 0
                             // weight, traffic is routed to all records with equal probability.
             }
@@ -268,8 +270,9 @@ public class RoutingPolicies {
     }
 
 
-    private void updateApplicationDnsOf(RoutingPolicyList routingPolicies, DeploymentId deployment,
-                                        Optional<TenantAndApplicationId> owner, @SuppressWarnings("unused") Mutex lock) {
+    private void updateApplicationDnsOf(RoutingPolicyList routingPolicies, Set<ZoneId> inactiveZones,
+                                        DeploymentId deployment, Optional<TenantAndApplicationId> owner,
+                                        @SuppressWarnings("unused") Mutex lock) {
         // In the context of single deployment (which this is) there is only one routing policy per routing ID. I.e.
         // there is no scenario where more than one deployment within an instance can be a member the same
         // application-level endpoint. However, to allow this in the future the routing table remains
@@ -294,7 +297,7 @@ public class RoutingPolicies {
 
                         Set<Target> activeTargets = targetsByEndpoint.computeIfAbsent(endpoint, (k) -> new LinkedHashSet<>());
                         Set<Target> inactiveTargets = inactiveTargetsByEndpoint.computeIfAbsent(endpoint, (k) -> new LinkedHashSet<>());
-                        if (isConfiguredOut(zonePolicy, policy)) {
+                        if (isConfiguredOut(zonePolicy, policy, inactiveZones)) {
                             inactiveTargets.add(Target.weighted(policy, target));
                         } else {
                             activeTargets.add(Target.weighted(policy, target));
@@ -486,7 +489,7 @@ public class RoutingPolicies {
     }
 
     /** Remove unreferenced instance endpoints from DNS */
-    private void removeGlobalDnsUnreferencedBy(LoadBalancerAllocation allocation, RoutingPolicyList deploymentPolicies, @SuppressWarnings("unused") Mutex lock) {
+    private void removeGlobalDnsUnreferencedBy(LoadBalancerAllocation allocation, RoutingPolicyList deploymentPolicies, Set<ZoneId> inactiveZones, @SuppressWarnings("unused") Mutex lock) {
         Set<RoutingId> removalCandidates = new HashSet<>(deploymentPolicies.asInstanceRoutingTable().keySet());
         Set<RoutingId> activeRoutingIds = instanceRoutingIds(allocation);
         removalCandidates.removeAll(activeRoutingIds);
@@ -497,7 +500,7 @@ public class RoutingPolicies {
             // This removes all ALIAS records having this DNS name. There is no attempt to delete only the entry for the
             // affected zone. Instead, the correct set of records is (re)created by updateGlobalDnsOf
             for (var endpoint : endpoints) {
-                for (var regionEndpoint : computeRegionEndpoints(endpoint, deploymentPolicies.asList())) {
+                for (var regionEndpoint : computeRegionEndpoints(endpoint, deploymentPolicies.asList(), inactiveZones)) {
                     Record.Type type = regionEndpoint.zoneDirectTargets().isEmpty() ? Record.Type.ALIAS : Record.Type.DIRECT;
                     controller.nameServiceForwarder().removeRecords(type,
                                                                     RecordName.from(regionEndpoint.target().name().value()),
@@ -568,12 +571,14 @@ public class RoutingPolicies {
     }
 
     /** Returns whether the endpoints of given policy are configured {@link RoutingStatus.Value#out} */
-    private static boolean isConfiguredOut(ZoneRoutingPolicy zonePolicy, RoutingPolicy policy) {
+    private static boolean isConfiguredOut(ZoneRoutingPolicy zonePolicy, RoutingPolicy policy, Set<ZoneId> inactiveZones) {
         // A deployment can be configured out from endpoints at any of the following levels:
         // - zone level (ZoneRoutingPolicy)
         // - deployment level (RoutingPolicy)
+        // - application package level (deployment.xml)
         return zonePolicy.routingStatus().value() == RoutingStatus.Value.out ||
-               policy.routingStatus().value() == RoutingStatus.Value.out;
+               policy.routingStatus().value() == RoutingStatus.Value.out ||
+               inactiveZones.contains(policy.id().zone());
     }
 
     /** Represents records for a region-wide endpoint */
@@ -653,6 +658,10 @@ 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()))
@@ -678,6 +687,17 @@ public class RoutingPolicies {
 
     }
 
+    /** Returns zones where global routing is declared inactive for instance through deploymentSpec */
+    private static Set<ZoneId> inactiveZones(ApplicationId instance, DeploymentSpec deploymentSpec) {
+        var instanceSpec = deploymentSpec.instance(instance.instance());
+        if (instanceSpec.isEmpty()) return Set.of();
+        return instanceSpec.get().zones().stream()
+                           .filter(zone -> zone.environment().isProduction())
+                           .filter(zone -> !zone.active())
+                           .map(zone -> ZoneId.from(zone.environment(), zone.region().get()))
+                           .collect(Collectors.toUnmodifiableSet());
+    }
+
     /** Returns the name updater to use for given endpoint */
     private NameServiceForwarder nameServiceForwarder(Endpoint endpoint) {
         return switch (endpoint.routingMethod()) {
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 d54bdead0bd..1e9f11e0349 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,6 +1,7 @@
 // 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;
@@ -62,10 +63,44 @@ 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
@@ -77,7 +112,19 @@ 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 c46a28c4567..3d2a66adc81 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()
-                .endpoint("default", "foo")
+                .globalServiceId("foo")
                 .region("us-west-1")
                 .region("us-central-1") // Two deployments should result in each DNS alias being registered once
                 .build();
@@ -1532,6 +1532,22 @@ 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 fb3026e1d80..965201ec6da 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,6 +65,7 @@ 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");
@@ -100,6 +101,11 @@ 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("'");
@@ -156,8 +162,15 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
+    public ApplicationPackageBuilder region(RegionName regionName) {
+        return region(regionName, true);
+    }
+
     public ApplicationPackageBuilder region(String regionName) {
-        return region(RegionName.from(regionName));
+        prodBody.append("      <region>")
+                .append(regionName)
+                .append("</region>\n");
+        return this;
     }
 
     public ApplicationPackageBuilder region(String regionName, String cloudAccount) {
@@ -174,8 +187,10 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
-    public ApplicationPackageBuilder region(RegionName regionName) {
-        prodBody.append("      <region>")
+    public ApplicationPackageBuilder region(RegionName regionName, boolean active) {
+        prodBody.append("      <region active='")
+                .append(active)
+                .append("'>")
                 .append(regionName.value())
                 .append("</region>\n");
         return this;
@@ -320,7 +335,13 @@ public class ApplicationPackageBuilder {
                 xml.append(" />\n");
             });
             xml.append(blockChange);
-            xml.append("    <prod>\n");
+            xml.append("    <prod");
+            if (globalServiceId != null) {
+                xml.append(" global-service-id='");
+                xml.append(globalServiceId);
+                xml.append("'");
+            }
+            xml.append(">\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/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 3fb4a040e0d..e5a10bb5889 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
@@ -1312,19 +1312,19 @@ public class DeploymentTriggerTest {
                             <staging />
                             <prod>
                                 <parallel>
-                                    <region>us-west-1</region>
+                                    <region active='true'>us-west-1</region>
                                     <steps>
-                                        <region>us-east-3</region>
+                                        <region active='true'>us-east-3</region>
                                         <delay hours='2' />
-                                        <region>eu-west-1</region>
+                                        <region active='true'>eu-west-1</region>
                                         <delay hours='2' />
                                     </steps>
                                     <steps>
                                         <delay hours='3' />
-                                        <region>us-central-1</region>
+                                        <region active='true'>us-central-1</region>
                                         <parallel>
-                                            <region athenz-service='no-service'>ap-northeast-1</region>
-                                            <region>ap-northeast-2</region>
+                                            <region active='true' athenz-service='no-service'>ap-northeast-1</region>
+                                            <region active='true'>ap-northeast-2</region>
                                             <test>us-central-1</test>
                                         </parallel>
                                     </steps>
@@ -1335,7 +1335,7 @@ public class DeploymentTriggerTest {
                                    <test>ap-northeast-1</test>
                                 </parallel>
                                 <test>us-east-3</test>
-                                <region>ap-southeast-1</region>
+                                <region active='true'>ap-southeast-1</region>
                             </prod>
                             <endpoints>
                                 <endpoint id='foo' container-id='bar'>
@@ -1350,7 +1350,7 @@ public class DeploymentTriggerTest {
                             <test />
                             <block-change revision='true' version='false' days='sat' hours='0-23' time-zone='CET' />
                             <prod>
-                                <region>eu-west-1</region>
+                                <region active='true'>eu-west-1</region>
                                 <test>eu-west-1</test>
                             </prod>
                             <notifications when='failing'>
@@ -1363,7 +1363,7 @@ public class DeploymentTriggerTest {
                     <instance id='last'>
                         <upgrade policy='conservative' />
                         <prod>
-                            <region>eu-west-1</region>
+                            <region active='true'>eu-west-1</region>
                         </prod>
                     </instance>
                 </deployment>
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 593d788fd7d..5df2ce234a1 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()
-                .endpoint("default", "foo")
+                .globalServiceId("default")
                 .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 f287bc52604..69b473dce87 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>\n" +
-                "         <region>us-west-1</region>\n" +
+                "      <prod global-service-id=\"default\">\n" +
+                "         <region active=\"true\">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 32f7e8e8f5a..ec36f52c23a 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>\n    <region>us-east-3</region>\n    <region>us-west-1</region>\n  </prod>\n</deployment>\n",
+  "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",
   "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 915466dac26..3cd9d586350 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")
-                .endpoint("default", "foo")
+                .globalServiceId("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 98775ea214d..14c279c9ef8 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")
-            .endpoint("default", "foo")
+            .globalServiceId("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")
-            .endpoint("default", "foo")
+            .globalServiceId("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")
-                .endpoint("default", "foo")
+                .globalServiceId("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")
-                .endpoint("default", "foo")
+                .globalServiceId("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")
-                .endpoint("default", "foo")
+                .globalServiceId("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 46ec42cab8f..02f030aa758 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,6 +234,27 @@ 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);
@@ -642,6 +663,28 @@ public class RoutingPoliciesTest {
         assertEquals(RoutingStatus.Value.in, policy1.routingStatus().value());
         assertEquals(RoutingStatus.Agent.tenant, policy1.routingStatus().agent());
         assertEquals(changedAt.truncatedTo(ChronoUnit.MILLIS), policy1.routingStatus().changedAt());
+
+        // Deployment is set out through a new deployment.xml
+        var applicationPackage2 = applicationPackageBuilder()
+                .region(zone1.region())
+                .region(zone2.region(), false)
+                .endpoint("r0", "c0", zone1.region().value(), zone2.region().value())
+                .endpoint("r1", "c0", zone1.region().value(), zone2.region().value())
+                .build();
+        context.submit(applicationPackage2).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
+        tester.assertTargets(context.instanceId(), EndpointId.of("r0"), 0, zone1);
+        tester.assertTargets(context.instanceId(), EndpointId.of("r1"), 0, zone1);
+
+        // ... back in
+        var applicationPackage3 = applicationPackageBuilder()
+                .region(zone1.region())
+                .region(zone2.region())
+                .endpoint("r0", "c0", zone1.region().value(), zone2.region().value())
+                .endpoint("r1", "c0", zone1.region().value(), zone2.region().value())
+                .build();
+        context.submit(applicationPackage3).deferLoadBalancerProvisioningIn(Environment.prod).deploy();
+        tester.assertTargets(context.instanceId(), EndpointId.of("r0"), 0, zone1, zone2);
+        tester.assertTargets(context.instanceId(), EndpointId.of("r1"), 0, zone1, zone2);
     }
 
     @Test
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 6190680d098..168a1345c39 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()
-            .endpoint("default", "foo")
+            .globalServiceId("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()
-                .endpoint("default", "foo")
+                .globalServiceId("foo")
                 .region("us-east-3")
                 .region("us-west-1")
                 .region("us-central-1")
@@ -116,6 +116,15 @@ 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")
@@ -128,7 +137,7 @@ public class RotationRepositoryTest {
     @Test
     void prefixes_system_when_not_main() {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
-                .endpoint("default", "foo")
+                .globalServiceId("foo")
                 .region("cd-us-east-1")
                 .region("cd-us-west-1")
                 .build();
@@ -155,7 +164,7 @@ public class RotationRepositoryTest {
                 .instances("instance1,instance2")
                 .region("us-central-1")
                 .parallel("us-west-1", "us-east-3")
-                .endpoint("default", "global")
+                .globalServiceId("global")
                 .build();
         var instance1 = tester.newDeploymentContext("tenant1", "application1", "instance1")
                 .submit(applicationPackage)