Allow services.xml variants on application instance name

6 files changed, 16 insertions, 19 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
index fad5685d6fa..cb1f6519f57 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
@@ -87,7 +87,7 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
 
     private ApplicationPackage createApplication(File userDir,
                                                  File configApplicationDir,
-                                                 String applicationName,
+                                                 ApplicationId applicationId,
                                                  long sessionId,
                                                  long currentlyActiveSessionId,
                                                  boolean internalRedeploy) {
@@ -96,7 +96,7 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
         if (user == null) {
             user = "unknown";
         }
-        DeployData deployData = new DeployData(user, userDir.getAbsolutePath(), applicationName, deployTimestamp, internalRedeploy, sessionId, currentlyActiveSessionId);
+        DeployData deployData = new DeployData(user, userDir.getAbsolutePath(), applicationId, deployTimestamp, internalRedeploy, sessionId, currentlyActiveSessionId);
         return FilesApplicationPackage.fromFileWithDeployData(configApplicationDir, deployData);
     }
 
@@ -150,7 +150,7 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
             IOUtils.copyDirectory(applicationFile, userApplicationDir);
             ApplicationPackage applicationPackage = createApplication(applicationFile,
                                                                       userApplicationDir,
-                                                                      applicationId.application().value(),
+                                                                      applicationId,
                                                                       sessionId,
                                                                       currentlyActiveSessionId,
                                                                       internalRedeploy);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index 786b26318a3..3af0df53cba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -117,7 +117,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
 
     @Override
     public String getApplicationName() {
-        return metaData.getApplicationName();
+        return metaData.getApplicationId().application().value();
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 589c3fcba6a..25ddddbdf11 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -132,10 +132,10 @@ public class ApplicationRepositoryTest {
         ApplicationMetaData applicationMetaData = getApplicationMetaData(applicationId(), sessionId);
 
         assertNotEquals(sessionId, originalSessionId);
-        assertEquals(applicationMetaData.getApplicationName(), originalApplicationMetaData.getApplicationName());
-        assertEquals(applicationMetaData.getPreviousActiveGeneration(), originalApplicationMetaData.getGeneration().longValue());
-        assertNotEquals(applicationMetaData.getGeneration(), originalApplicationMetaData.getGeneration());
-        assertEquals(applicationMetaData.getDeployedByUser(), originalApplicationMetaData.getDeployedByUser());
+        assertEquals(originalApplicationMetaData.getApplicationId(), applicationMetaData.getApplicationId());
+        assertEquals(originalApplicationMetaData.getPreviousActiveGeneration(), applicationMetaData.getGeneration().longValue());
+        assertNotEquals(originalApplicationMetaData.getGeneration(), applicationMetaData.getGeneration());
+        assertEquals(originalApplicationMetaData.getDeployedByUser(), applicationMetaData.getDeployedByUser());
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index d01ebad8c26..14fa0cb2dbe 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -11,6 +11,7 @@ import com.yahoo.config.model.application.provider.DeployData;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.AllocatedHosts;
+import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
@@ -56,7 +57,7 @@ public class ZooKeeperClientTest {
         ApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(new File("src/test/apps/zkfeed"),
                                                                                 new DeployData("foo",
                                                                                                "/bar/baz",
-                                                                                               "appName",
+                                                                                               ApplicationId.from("default", "appName", "default"),
                                                                                                1345L,
                                                                                                true,
                                                                                                3L,
@@ -135,8 +136,7 @@ public class ZooKeeperClientTest {
     public void testFeedAppMetaDataToZooKeeper() {
         assertTrue(zk.exists(appPath, ConfigCurator.META_ZK_PATH));
         ApplicationMetaData metaData = ApplicationMetaData.fromJsonString(zk.getData(appPath, ConfigCurator.META_ZK_PATH));
-        assertThat(metaData.getApplicationName(), is("appName"));
-        assertTrue(metaData.getCheckSum().length() > 0);
+        assertTrue(metaData.getChecksum().length() > 0);
         assertTrue(metaData.isInternalRedeploy());
         assertThat(metaData.getDeployedByUser(), is("foo"));
         assertThat(metaData.getDeployPath(), is("/bar/baz"));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 0982fad2bcb..6ba3c33d37b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -218,7 +218,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
     }
 
     private void addLocalSession(long sessionId, DeployData deployData, SessionZooKeeperClient zkc) throws IOException {
-        writeApplicationId(zkc, deployData.getApplicationName());
+        writeApplicationId(zkc, deployData.getApplicationId());
         TenantFileSystemDirs tenantFileSystemDirs = new TenantFileSystemDirs(temporaryFolder.newFolder(), tenantName);
         ApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(testApp, deployData);
         localRepo.addSession(new LocalSession(tenantName, sessionId, new SessionTest.MockSessionPreparer(),
@@ -278,7 +278,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
             this.initialStatus = initialStatus;
             this.deployData = new DeployData("foo",
                                              "bar",
-                                             appName,
+                                             ApplicationId.from(tenantName.value(), appName, "default"),
                                              0L,
                                              false,
                                              sessionId,
@@ -312,9 +312,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
                                             Optional.of(AllocatedHosts.withHosts(Collections.singleton(new HostSpec("bar", Collections.emptyList())))));
             session = createRemoteSession(sessionId, initialStatus, zkClient);
             addLocalSession(sessionId, deployData, zkClient);
-            tenantRepository.getTenant(tenantName).getApplicationRepo().createApplication(ApplicationId.from(tenantName.value(),
-                                                                                                             deployData.getApplicationName(),
-                                                                                                             InstanceName.defaultName().value()));
+            tenantRepository.getTenant(tenantName).getApplicationRepo().createApplication(deployData.getApplicationId());
             metaData = localRepo.getSession(sessionId).getMetaData();
             actResponse = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.ACTIVE, sessionId, subPath));
             return this;
@@ -349,8 +347,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
         assertFalse(hostProvisioner.activated);
     }
 
-    private void writeApplicationId(SessionZooKeeperClient zkc, String applicationName) {
-        ApplicationId id = ApplicationId.from(tenantName, ApplicationName.from(applicationName), InstanceName.defaultName());
+    private void writeApplicationId(SessionZooKeeperClient zkc, ApplicationId id) {
         zkc.writeApplicationId(id);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index ff3d9449448..8b9028fee4a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -107,7 +107,7 @@ public class TenantRequestHandlerTest {
         ZooKeeperDeployer deployer = zkc.createDeployer(new BaseDeployLogger());
         DeployData deployData = new DeployData("user",
                                                appDir.toString(),
-                                               appId.application().toString(),
+                                               appId,
                                                0L,
                                                internalRedeploy,
                                                0L,