From 01b61de4db4be59d86298d540aaa948c68185585 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Sep 2019 13:52:14 +0200 Subject: Allow services.xml variants on application instance name --- .../yahoo/vespa/config/server/ApplicationRepositoryTest.java | 8 ++++---- .../yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java | 6 +++--- .../vespa/config/server/http/v2/SessionActiveHandlerTest.java | 11 ++++------- .../vespa/config/server/tenant/TenantRequestHandlerTest.java | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'configserver/src/test/java') 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, -- cgit v1.2.3