Remove shared endpoints from config

2 files changed, 19 insertions, 48 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 6982f10f658..8f95e390b07 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -47,7 +47,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.yahoo.config.model.api.ApplicationClusterEndpoint.RoutingMethod.shared;
 import static com.yahoo.config.model.api.ApplicationClusterEndpoint.RoutingMethod.sharedLayer4;
 
 /**
@@ -180,21 +179,18 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         return Optional.empty();
     }
 
-    /*
-      Create list of endpoints, these will be consumed later by the LBservicesProducer
-     */
+    /** Create list of endpoints, these will be consumed later by LbServicesProducer */
     private void createEndpointList(DeployState deployState) {
         if(!deployState.isHosted()) return;
         if(deployState.getProperties().applicationId().instance().isTester()) return;
         List<ApplicationClusterEndpoint> endpoints = new ArrayList<>();
-        // Add zone local endpoints using zone dns suffixes, tenant, application and cluster id.
-        // For now support both L7 and L4 routing
 
+        // Add zone local endpoints using zone dns suffixes, tenant, application and cluster id.
         List<String> hosts = getContainers().stream()
                 .map(AbstractService::getHostName)
                 .collect(Collectors.toList());
-        for(String suffix : deployState.getProperties().zoneDnsSuffixes()) {
-            // L4
+
+        for (String suffix : deployState.getProperties().zoneDnsSuffixes()) {
             ApplicationClusterEndpoint.DnsName l4Name = ApplicationClusterEndpoint.DnsName.sharedL4NameFrom(
                     deployState.zone().system(),
                     ClusterSpec.Id.from(getName()),
@@ -207,28 +203,13 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
                                   .hosts(hosts)
                                   .clusterId(getName())
                                   .build());
-
-            // L7
-            ApplicationClusterEndpoint.DnsName l7Name = ApplicationClusterEndpoint.DnsName.sharedNameFrom(
-                    deployState.zone().system(),
-                    ClusterSpec.Id.from(getName()),
-                    deployState.getProperties().applicationId(),
-                    suffix);
-            endpoints.add(ApplicationClusterEndpoint.builder()
-                                  .zoneScope()
-                                  .sharedRouting()
-                                  .dnsName(l7Name)
-                                  .hosts(hosts)
-                                  .clusterId(getName())
-                                  .build());
         }
 
-        // Then get all endpoints provided by controller.
-        Set<ApplicationClusterEndpoint.RoutingMethod> supportedRoutingMethods = Set.of(shared, sharedLayer4);
+        // Include all endpoints provided by controller
         Set<ContainerEndpoint> endpointsFromController = deployState.getEndpoints();
         endpointsFromController.stream()
                 .filter(ce -> ce.clusterId().equals(getName()))
-                .filter(ce -> supportedRoutingMethods.contains(ce.routingMethod()))
+                .filter(ce -> ce.routingMethod() == sharedLayer4)
                 .forEach(ce -> ce.names().forEach(
                         name -> endpoints.add(ApplicationClusterEndpoint.builder()
                                                       .scope(ce.scope())
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 36adee5ff15..198b5713876 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -364,71 +364,61 @@ public class ContainerClusterTest {
         assertNames(main,
                     ApplicationId.from("t1", "a1", "i1"),
                     Set.of(),
-                    List.of("search-cluster.i1.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--i1--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.i1.a1.t1.endpoint.suffix"));
 
         assertNames(main,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(),
-                    List.of("search-cluster.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.a1.t1.endpoint.suffix"));
 
         assertNames(main,
                     ApplicationId.from("t1", "default", "default"),
                     Set.of(),
-                    List.of("search-cluster.default.t1.endpoint.suffix"),
-                    List.of("search-cluster--default--t1.endpoint.suffix"));
+                    List.of("search-cluster.default.t1.endpoint.suffix"));
 
         assertNames(main,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(new ContainerEndpoint("not-in-this-cluster", global, List.of("foo", "bar"))),
-                    List.of("search-cluster.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.a1.t1.endpoint.suffix"));
 
         assertNames(main,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(new ContainerEndpoint("search-cluster", global, List.of("rotation-1.x.y.z", "rotation-2.x.y.z"), OptionalInt.empty(), sharedLayer4),
                            new ContainerEndpoint("search-cluster", application, List.of("app-rotation.x.y.z"), OptionalInt.of(3), sharedLayer4)),
-                    List.of("search-cluster.a1.t1.endpoint.suffix", "rotation-1.x.y.z", "rotation-2.x.y.z", "app-rotation.x.y.z"),
-                    List.of("search-cluster--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.a1.t1.endpoint.suffix", "rotation-1.x.y.z", "rotation-2.x.y.z", "app-rotation.x.y.z"));
 
         // cd system:
         assertNames(cd,
                     ApplicationId.from("t1", "a1", "i1"),
                     Set.of(),
-                    List.of("search-cluster.cd.i1.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--cd--i1--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.cd.i1.a1.t1.endpoint.suffix"));
 
         assertNames(cd,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(),
-                    List.of("search-cluster.cd.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--cd--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.cd.a1.t1.endpoint.suffix"));
 
         assertNames(cd,
                     ApplicationId.from("t1", "default", "default"),
                     Set.of(),
-                    List.of("search-cluster.cd.default.t1.endpoint.suffix"),
-                    List.of("search-cluster--cd--default--t1.endpoint.suffix"));
+                    List.of("search-cluster.cd.default.t1.endpoint.suffix"));
 
         assertNames(cd,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(new ContainerEndpoint("not-in-this-cluster", global, List.of("foo", "bar"))),
-                    List.of("search-cluster.cd.a1.t1.endpoint.suffix"),
-                    List.of("search-cluster--cd--a1--t1.endpoint.suffix"));
+                    List.of("search-cluster.cd.a1.t1.endpoint.suffix"));
 
         assertNames(cd,
                     ApplicationId.from("t1", "a1", "default"),
                     Set.of(new ContainerEndpoint("search-cluster", global, List.of("rotation-1.x.y.z", "rotation-2.x.y.z"), OptionalInt.empty(), sharedLayer4),
-                           new ContainerEndpoint("search-cluster", global, List.of("a--b.x.y.z", "rotation-2.x.y.z"), OptionalInt.empty(), shared),
+                           new ContainerEndpoint("search-cluster", global, List.of("a.b.x.y.z", "rotation-2.x.y.z"), OptionalInt.empty(), shared),
                            new ContainerEndpoint("search-cluster", application, List.of("app-rotation.x.y.z"), OptionalInt.of(3), sharedLayer4),
                            new ContainerEndpoint("not-supported", global, List.of("not.supported"), OptionalInt.empty(), exclusive)),
-                    List.of("search-cluster.cd.a1.t1.endpoint.suffix", "rotation-1.x.y.z", "rotation-2.x.y.z", "app-rotation.x.y.z"),
-                    List.of("search-cluster--cd--a1--t1.endpoint.suffix", "a--b.x.y.z", "rotation-2.x.y.z"));
+                    List.of("search-cluster.cd.a1.t1.endpoint.suffix", "rotation-1.x.y.z", "rotation-2.x.y.z", "app-rotation.x.y.z"));
 
     }
 
-    private void assertNames(SystemName systemName, ApplicationId appId, Set<ContainerEndpoint> globalEndpoints, List<String> expectedSharedL4Names, List<String> expectedSharedNames) {
+    private void assertNames(SystemName systemName, ApplicationId appId, Set<ContainerEndpoint> globalEndpoints, List<String> expectedSharedL4Names) {
         Zone zone = new Zone(systemName, Environment.defaultEnvironment(), RegionName.defaultName());
         DeployState state = new DeployState.Builder()
                 .zone(zone)
@@ -444,7 +434,7 @@ public class ContainerClusterTest {
         cluster.doPrepare(state);
         List<ApplicationClusterEndpoint> endpoints = cluster.endpoints();
 
-        assertNames(expectedSharedNames, endpoints.stream().filter(e -> e.routingMethod() == shared).collect(Collectors.toList()));
+        assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).collect(Collectors.toList()));
         assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).collect(Collectors.toList()));
 
         List<ContainerEndpoint> endpointsWithWeight =