Add ContainerEndpoint info to LbServices

1 files changed, 75 insertions, 21 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 395c1ecb80b..1287bce4963 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -5,6 +5,7 @@ import com.yahoo.cloud.config.LbServicesConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.NullConfigModelRegistry;
 import com.yahoo.config.model.api.ApplicationInfo;
+import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
@@ -20,11 +21,14 @@ import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.model.VespaModel;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -33,20 +37,32 @@ import java.util.Random;
 import java.util.Set;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Ulf Lilleengen
  */
+@RunWith(Parameterized.class)
 public class LbServicesProducerTest {
     private static final String rotation1 = "rotation-1";
     private static final String rotation2 = "rotation-2";
     private static final String rotationString = rotation1 + "," + rotation2;
     private static final Set<Rotation> rotations = Collections.singleton(new Rotation(rotationString));
+    private static final Set<ContainerEndpoint> endpoints = Set.of(
+            new ContainerEndpoint("mydisc", List.of("rotation-1", "rotation-2"))
+    );
     private final InMemoryFlagSource flagSource = new InMemoryFlagSource();
+    private final boolean useGlobalServiceId;
+
+    @Parameterized.Parameters
+    public static Object[] useGlobalServiceId() {
+        return new Object[] { true, false };
+    }
+
+    public LbServicesProducerTest(boolean useGlobalServiceId) {
+        this.useGlobalServiceId = useGlobalServiceId;
+    }
 
     @Test
     public void testDeterministicGetConfig() throws IOException, SAXException {
@@ -127,16 +143,36 @@ public class LbServicesProducerTest {
                                                                                   .rotations(rotations)
                                                                                   .properties(new TestProperties().setHostedVespa(true)));
         RegionName regionName = RegionName.from("us-east-1");
-        LbServicesConfig conf = getLbServicesConfig(new Zone(Environment.prod, regionName), testModel);
-        final LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName);
-        assertThat(services.servicealiases().size(), is(1));
-        assertThat(services.endpointaliases().size(), is(4));
 
-        assertThat(services.servicealiases(0), is("service1"));
-        assertThat(services.endpointaliases(0), is("foo1.bar1.com"));
-        assertThat(services.endpointaliases(1), is("foo2.bar2.com"));
-        assertThat(services.endpointaliases(2), is(rotation1));
-        assertThat(services.endpointaliases(3), is(rotation2));
+        var services = getLbServicesConfig(new Zone(Environment.prod, regionName), testModel)
+                .tenants("foo")
+                .applications("foo:prod:" + regionName.value() + ":default")
+                .hosts("foo.foo.yahoo.com")
+                .services(QRSERVER.serviceName);
+
+        if (useGlobalServiceId) {
+            assertThat(services.servicealiases(), contains("service1"));
+            assertThat("Missing rotations in list: " + services.endpointaliases(), services.endpointaliases(), containsInAnyOrder("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2));
+        }
+    }
+
+    @Test
+    public void testConfigAliasesWithEndpoints() throws IOException, SAXException {
+        Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
+                .endpoints(endpoints)
+                .properties(new TestProperties().setHostedVespa(true)));
+        RegionName regionName = RegionName.from("us-east-1");
+
+        var services = getLbServicesConfig(new Zone(Environment.prod, regionName), testModel)
+                .tenants("foo")
+                .applications("foo:prod:" + regionName.value() + ":default")
+                .hosts("foo.foo.yahoo.com")
+                .services(QRSERVER.serviceName);
+
+        if (! useGlobalServiceId) {
+            assertThat(services.servicealiases(), contains("service1"));
+            assertThat("Missing endpoints in list: " + services.endpointaliases(), services.endpointaliases(), containsInAnyOrder("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2));
+        }
     }
 
     private Map<TenantName, Set<ApplicationInfo>> randomizeApplications(Map<TenantName, Set<ApplicationInfo>> testModel, int seed) {
@@ -195,14 +231,32 @@ public class LbServicesProducerTest {
                 "  <search/>" +
                 "</jdisc>" +
                 "</services>";
-        String deploymentInfo ="<?xml version='1.0' encoding='UTF-8'?>" +
-                "<deployment version='1.0'>" +
-                "  <test />" +
-                "  <prod global-service-id='mydisc'>" +
-                "    <region active='true'>us-east-1</region>" +
-                "    <region active='false'>us-east-2</region>" +
-                "  </prod>" +
-                "</deployment>";
+
+        String deploymentInfo;
+
+        if (useGlobalServiceId) {
+            deploymentInfo ="<?xml version='1.0' encoding='UTF-8'?>" +
+                    "<deployment version='1.0'>" +
+                    "  <test />" +
+                    "  <prod global-service-id='mydisc'>" +
+                    "    <region active='true'>us-east-1</region>" +
+                    "    <region active='false'>us-east-2</region>" +
+                    "  </prod>" +
+                    "</deployment>";
+        } else {
+            deploymentInfo ="<?xml version='1.0' encoding='UTF-8'?>" +
+                    "<deployment version='1.0'>" +
+                    "  <test />" +
+                    "  <prod>" +
+                    "    <region active='true'>us-east-1</region>" +
+                    "    <region active='false'>us-east-2</region>" +
+                    "  </prod>" +
+                    "  <endpoints>" +
+                    "    <endpoint container-id='mydisc' />" +
+                    "  </endpoints>" +
+                    "</deployment>";
+        }
+
 
         return new MockApplicationPackage.Builder().withHosts(hosts).withServices(services).withDeploymentSpec(deploymentInfo).build();
     }