Revert "Remove global-service-id"

2 files changed, 59 insertions, 14 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 ca2f9da3273..4f52eede4e8 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
@@ -22,6 +22,8 @@ import com.yahoo.vespa.config.ConfigPayload;
 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;
@@ -34,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.RoutingMethod.Enum.sharedLayer4;
 import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.application;
@@ -43,10 +46,12 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 /**
  * @author Ulf Lilleengen
  */
+@RunWith(Parameterized.class)
 public class LbServicesProducerTest {
 
     private static final Set<ContainerEndpoint> endpoints = Set.of(
@@ -56,6 +61,16 @@ public class LbServicesProducerTest {
     private static final List<String> zoneDnsSuffixes = List.of(".endpoint1.suffix", ".endpoint2.suffix");
 
     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() {
@@ -73,9 +88,17 @@ public class LbServicesProducerTest {
 
     @Test
     public void testConfigActiveRotation() {
-        RegionName regionName = RegionName.from("us-east-1");
-        LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
-        assertTrue(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").activeRotation());
+        {
+            RegionName regionName = RegionName.from("us-east-1");
+            LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
+            assertTrue(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").activeRotation());
+        }
+
+        {
+            RegionName regionName = RegionName.from("us-east-2");
+            LbServicesConfig conf = createModelAndGetLbServicesConfig(regionName);
+            assertFalse(conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").activeRotation());
+        }
     }
 
     private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) {
@@ -93,6 +116,8 @@ public class LbServicesProducerTest {
 
     @Test
     public void testConfigAliasesWithEndpoints() {
+        assumeFalse(useGlobalServiceId);
+
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
                 .endpoints(endpoints)
                 .properties(new TestProperties().setHostedVespa(true)));
@@ -125,6 +150,8 @@ public class LbServicesProducerTest {
 
     @Test
     public void testRoutingConfigForTesterApplication() {
+        assumeFalse(useGlobalServiceId);
+
         Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder());
 
         // No config for tester application
@@ -200,17 +227,32 @@ public class LbServicesProducerTest {
                           "  </container>" +
                           "</services>";
 
-        String deploymentInfo = "<?xml version='1.0' encoding='UTF-8'?>" +
-                                "<deployment version='1.0'>" +
-                                "  <test />" +
-                                "  <prod>" +
-                                "    <region>us-east-1</region>" +
-                                "    <region>us-east-2</region>" +
-                                "  </prod>" +
-                                "  <endpoints>" +
-                                "    <endpoint container-id='mydisc' />" +
-                                "  </endpoints>" +
-                                "</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().withServices(services).withDeploymentSpec(deploymentInfo).build();
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
index 9508a67fc01..f3a2c42852f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackageTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.config.server.zookeeper;
 
 import com.yahoo.component.Version;
+import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ClusterMembership;
@@ -101,6 +102,8 @@ public class ZKApplicationPackageTest {
         assertEquals(dockerImage, readInfo.getHosts().iterator().next().dockerImageRepo().get().asString());
         assertTrue(zkApp.getDeployment().isPresent());
         assertFalse(zkApp.getDeploymentSpec().isEmpty());
+        assertEquals("mydisc", DeploymentSpec.fromXml(zkApp.getDeployment().get()).requireInstance("default").globalServiceId().get());
+        assertEquals("mydisc", zkApp.getDeploymentSpec().requireInstance("default").globalServiceId().get());
     }
 
     private void feed(com.yahoo.vespa.curator.Curator zk, File dirToFeed) throws IOException {