Update tests to take into account rotation changes

- We no longer generate legacy endpoint names
- We can have multiple global endpoints per application
- We only generate one global endpoint per endpoint id

3 files changed, 58 insertions, 71 deletions

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 de31f1f67f9..3a905f8c6d5 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
@@ -290,59 +290,57 @@ public class ControllerTest {
         for (Deployment deployment : deployments) {
             assertEquals("Rotation names are passed to config server in " + deployment.zone(),
                          Set.of("rotation-id-01",
-                                "app1--tenant1.global.vespa.oath.cloud",
-                                "app1.tenant1.global.vespa.yahooapis.com",
-                                "app1--tenant1.global.vespa.yahooapis.com"),
+                                "app1--tenant1.global.vespa.oath.cloud"),
                          tester.configServer().rotationNames().get(new DeploymentId(application.id(), deployment.zone())));
         }
         tester.flushDnsRequests();
-        assertEquals(3, tester.controllerTester().nameService().records().size());
 
-        Optional<Record> record = tester.controllerTester().findCname("app1--tenant1.global.vespa.yahooapis.com");
-        assertTrue(record.isPresent());
-        assertEquals("app1--tenant1.global.vespa.yahooapis.com", record.get().name().asString());
-        assertEquals("rotation-fqdn-01.", record.get().data().asString());
+        assertEquals(1, tester.controllerTester().nameService().records().size());
 
-        record = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
+        var record = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
         assertTrue(record.isPresent());
         assertEquals("app1--tenant1.global.vespa.oath.cloud", record.get().name().asString());
         assertEquals("rotation-fqdn-01.", record.get().data().asString());
-
-        record = tester.controllerTester().findCname("app1.tenant1.global.vespa.yahooapis.com");
-        assertTrue(record.isPresent());
-        assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString());
-        assertEquals("rotation-fqdn-01.", record.get().data().asString());
     }
 
     @Test
-    public void testRedirectLegacyDnsNames() { // TODO: Remove together with Flags.REDIRECT_LEGACY_DNS_NAMES
+    public void testDnsAliasRegistrationWithEndpoints() {
         Application application = tester.createApplication("app1", "tenant1", 1, 1L);
+
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
-                .globalServiceId("foo")
+                .endpoint("foobar", "qrs", "us-west-1", "us-central-1")
+                .endpoint("default", "qrs", "us-west-1", "us-central-1")
                 .region("us-west-1")
-                .region("us-central-1")
+                .region("us-central-1") // Two deployments should result in each DNS alias being registered once
                 .build();
 
-        ((InMemoryFlagSource) tester.controller().flagSource()).withBooleanFlag(Flags.REDIRECT_LEGACY_DNS_NAMES.id(), true);
-
         tester.deployCompletely(application, applicationPackage);
-        assertEquals(3, tester.controllerTester().nameService().records().size());
+        Collection<Deployment> deployments = tester.application(application.id()).deployments().values();
+        assertFalse(deployments.isEmpty());
+        for (Deployment deployment : deployments) {
+            assertEquals("Rotation names are passed to config server in " + deployment.zone(),
+                    Set.of(
+                            "rotation-id-01",
+                            "rotation-id-02",
+                            "app1--tenant1.global.vespa.oath.cloud",
+                            "foobar--app1--tenant1.global.vespa.oath.cloud"
+                    ),
+                    tester.configServer().rotationNames().get(new DeploymentId(application.id(), deployment.zone())));
+        }
+        tester.flushDnsRequests();
 
-        Optional<Record> record = tester.controllerTester().findCname("app1--tenant1.global.vespa.yahooapis.com");
-        assertTrue(record.isPresent());
-        assertEquals("app1--tenant1.global.vespa.yahooapis.com", record.get().name().asString());
-        assertEquals("app1--tenant1.global.vespa.oath.cloud.", record.get().data().asString());
+        assertEquals(2, tester.controllerTester().nameService().records().size());
 
-        record = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
-        assertTrue(record.isPresent());
-        assertEquals("app1--tenant1.global.vespa.oath.cloud", record.get().name().asString());
-        assertEquals("rotation-fqdn-01.", record.get().data().asString());
+        var record1 = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
+        assertTrue(record1.isPresent());
+        assertEquals("app1--tenant1.global.vespa.oath.cloud", record1.get().name().asString());
+        assertEquals("rotation-fqdn-02.", record1.get().data().asString());
 
-        record = tester.controllerTester().findCname("app1.tenant1.global.vespa.yahooapis.com");
-        assertTrue(record.isPresent());
-        assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString());
-        assertEquals("app1--tenant1.global.vespa.oath.cloud.", record.get().data().asString());
+        var record2 = tester.controllerTester().findCname("foobar--app1--tenant1.global.vespa.oath.cloud");
+        assertTrue(record2.isPresent());
+        assertEquals("foobar--app1--tenant1.global.vespa.oath.cloud", record2.get().name().asString());
+        assertEquals("rotation-fqdn-01.", record2.get().data().asString());
     }
 
     @Test
@@ -358,16 +356,11 @@ public class ControllerTest {
                     .build();
 
             tester.deployCompletely(app1, applicationPackage);
-            assertEquals(3, tester.controllerTester().nameService().records().size());
+            assertEquals(1, tester.controllerTester().nameService().records().size());
 
-            Optional<Record> record = tester.controllerTester().findCname("app1--tenant1.global.vespa.yahooapis.com");
+            Optional<Record> record = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
             assertTrue(record.isPresent());
-            assertEquals("app1--tenant1.global.vespa.yahooapis.com", record.get().name().asString());
-            assertEquals("rotation-fqdn-01.", record.get().data().asString());
-
-            record = tester.controllerTester().findCname("app1.tenant1.global.vespa.yahooapis.com");
-            assertTrue(record.isPresent());
-            assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString());
+            assertEquals("app1--tenant1.global.vespa.oath.cloud", record.get().name().asString());
             assertEquals("rotation-fqdn-01.", record.get().data().asString());
 
             // Application is deleted and rotation is unassigned
@@ -408,22 +401,12 @@ public class ControllerTest {
                     .region("us-central-1")
                     .build();
             tester.deployCompletely(app2, applicationPackage);
-            assertEquals(3, tester.controllerTester().nameService().records().size());
-
-            Optional<Record> record = tester.controllerTester().findCname("app2--tenant2.global.vespa.yahooapis.com");
-            assertTrue(record.isPresent());
-            assertEquals("app2--tenant2.global.vespa.yahooapis.com", record.get().name().asString());
-            assertEquals("rotation-fqdn-01.", record.get().data().asString());
+            assertEquals(1, tester.controllerTester().nameService().records().size());
 
-            record = tester.controllerTester().findCname("app2--tenant2.global.vespa.oath.cloud");
+            var record = tester.controllerTester().findCname("app2--tenant2.global.vespa.oath.cloud");
             assertTrue(record.isPresent());
             assertEquals("app2--tenant2.global.vespa.oath.cloud", record.get().name().asString());
             assertEquals("rotation-fqdn-01.", record.get().data().asString());
-
-            record = tester.controllerTester().findCname("app2.tenant2.global.vespa.yahooapis.com");
-            assertTrue(record.isPresent());
-            assertEquals("app2.tenant2.global.vespa.yahooapis.com", record.get().name().asString());
-            assertEquals("rotation-fqdn-01.", record.get().data().asString());
         }
 
         // Application 1 is recreated, deployed and assigned a new rotation
@@ -441,19 +424,15 @@ public class ControllerTest {
             assertEquals("rotation-id-02", app1.rotations().get(0).asString());
 
             // DNS records are created for the newly assigned rotation
-            assertEquals(6, tester.controllerTester().nameService().records().size());
+            assertEquals(2, tester.controllerTester().nameService().records().size());
 
-            Optional<Record> record = tester.controllerTester().findCname("app1--tenant1.global.vespa.yahooapis.com");
-            assertTrue(record.isPresent());
-            assertEquals("rotation-fqdn-02.", record.get().data().asString());
+            var record1 = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
+            assertTrue(record1.isPresent());
+            assertEquals("rotation-fqdn-02.", record1.get().data().asString());
 
-            record = tester.controllerTester().findCname("app1--tenant1.global.vespa.oath.cloud");
-            assertTrue(record.isPresent());
-            assertEquals("rotation-fqdn-02.", record.get().data().asString());
-
-            record = tester.controllerTester().findCname("app1.tenant1.global.vespa.yahooapis.com");
-            assertTrue(record.isPresent());
-            assertEquals("rotation-fqdn-02.", record.get().data().asString());
+            var record2 = tester.controllerTester().findCname("app2--tenant2.global.vespa.oath.cloud");
+            assertTrue(record2.isPresent());
+            assertEquals("rotation-fqdn-01.", record2.get().data().asString());
         }
 
     }
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 58f35c0ac05..b994c55ce55 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
@@ -253,7 +253,7 @@ public class MetricsReporterTest {
 
         tester.deployCompletely(application, applicationPackage);
         reporter.maintain();
-        assertEquals("Deployment queues name services requests", 6, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
+        assertEquals("Deployment queues name services requests", 2, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
 
         tester.flushDnsRequests();
         reporter.maintain();
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 67b6b1ac61c..f9725715ce5 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
@@ -7,6 +7,7 @@ import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.RegionName;
 import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.MetricsService;
@@ -45,6 +46,7 @@ import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
+import java.util.Set;
 import java.util.TreeMap;
 
 import static com.yahoo.config.provision.SystemName.main;
@@ -118,7 +120,7 @@ public class ApplicationSerializerTest {
                                                OptionalInt.of(7),
                                                new MetricsService.ApplicationMetrics(0.5, 0.9),
                                                Optional.of("-----BEGIN PUBLIC KEY-----\n∠( ᐛ 」∠)＿\n-----END PUBLIC KEY-----"),
-                                               List.of(new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.default_(), new RotationId("my-rotation"))),
+                                               List.of(new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.default_(), new RotationId("my-rotation"), Set.of())),
                                                rotationStatus);
 
         Application serialized = applicationSerializer.fromSlime(applicationSerializer.toSlime(original));
@@ -254,6 +256,11 @@ public class ApplicationSerializerTest {
         final var applicationJson = Files.readAllBytes(testData.resolve("complete-application.json"));
         final var slime = SlimeUtils.jsonToSlime(applicationJson);
 
+        final var regions = Set.of(
+                RegionName.from("us-east-3"),
+                RegionName.from("us-west-1")
+        );
+
         // Add the necessary fields to the Slime representation of the application
         final var cursor = slime.get();
         cursor.setString("rotation", "single-rotation");
@@ -271,11 +278,11 @@ public class ApplicationSerializerTest {
         // Parse and test the output from parsing contains both legacy rotation and multiple rotations
         final var application = applicationSerializer.fromSlime(slime);
 
+        // Since only one AssignedEndpoint can be "default", we make sure that we are ignoring the
+        // multiple-rotation entries as the globalServiceId will override them
         assertEquals(
                 List.of(
                         new RotationId("single-rotation"),
-                        new RotationId("multiple-rotation-1"),
-                        new RotationId("multiple-rotation-2"),
                         new RotationId("assigned-rotation")
                 ),
                 application.rotations()
@@ -285,12 +292,13 @@ public class ApplicationSerializerTest {
                 Optional.of(new RotationId("single-rotation")), application.legacyRotation()
         );
 
+        // The same goes here for AssignedRotations with "default" EndpointId as in the .rotations() test above.
+        // Note that we are only using Set.of() on "assigned-rotation" because in this test we do not have access
+        // to a deployment.xml that describes the zones a rotation should map to.
         assertEquals(
                 List.of(
-                        new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("single-rotation")),
-                        new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("multiple-rotation-1")),
-                        new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("multiple-rotation-2")),
-                        new AssignedRotation(new ClusterSpec.Id("foobar"), EndpointId.of("nice-endpoint"), new RotationId("assigned-rotation"))
+                        new AssignedRotation(new ClusterSpec.Id("foo"), EndpointId.of("default"), new RotationId("single-rotation"), regions),
+                        new AssignedRotation(new ClusterSpec.Id("foobar"), EndpointId.of("nice-endpoint"), new RotationId("assigned-rotation"), Set.of())
                 ),
                 application.assignedRotations()
         );