From d12d6ec23605ce29cc9d1848d154ee64cf19ce8a Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 30 May 2017 16:37:09 +0200 Subject: Auto-upgrade manually deployed applications --- .../java/com/yahoo/vespa/config/server/deploy/DeployTester.java | 3 ++- .../vespa/config/server/http/v2/ApplicationContentHandlerTest.java | 4 +++- .../yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java | 7 +++++-- .../vespa/config/server/http/v2/SessionActiveHandlerTest.java | 4 +++- .../vespa/config/server/http/v2/SessionContentHandlerTest.java | 4 +++- .../vespa/config/server/http/v2/SessionCreateHandlerTest.java | 3 ++- .../vespa/config/server/http/v2/SessionPrepareHandlerTest.java | 3 ++- 7 files changed, 20 insertions(+), 8 deletions(-) (limited to 'configserver/src/test/java/com/yahoo') diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java index a1b8b4192c8..7c2b36d4d72 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java @@ -152,7 +152,8 @@ public class DeployTester { curator, new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher())); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder())); return applicationRepository.deployFromLocalActive(id, Duration.ofSeconds(60)); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java index 6eb730d11dc..199d592deb5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.http.v2; +import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; @@ -65,7 +66,8 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase { new MockCurator(), new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); pathPrefix = createPath(idTenant1, Zone.defaultZone()); baseUrl = baseServer + pathPrefix; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java index c34cb565878..330c13892ad 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.config.server.http.v2; import com.fasterxml.jackson.databind.ObjectMapper; +import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.NullConfigModelRegistry; import com.yahoo.config.model.application.provider.FilesApplicationPackage; @@ -114,7 +115,8 @@ public class ApplicationHandlerTest { new MockCurator(), logServerLogGrabber, convergeChecker, - httpProxy)); + httpProxy, + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } private ApplicationHandler createApplicationHandler(Tenants tenants) { @@ -127,7 +129,8 @@ public class ApplicationHandlerTest { new MockCurator(), new LogServerLogGrabber(), new ApplicationConvergenceChecker(stateApiFactory), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } @Test 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 2d76e9aa2cc..f5bac7b0abc 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 @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.http.v2; +import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.Capacity; @@ -183,7 +184,8 @@ public class SessionActiveHandlerTest extends SessionActiveHandlerTestBase { curator, new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } public static class MockProvisioner implements Provisioner { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java index 7f5ab96d76a..caef49e922f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.config.server.http.v2; import com.google.common.io.Files; +import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpResponse; @@ -178,6 +179,7 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { new MockCurator(), new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index 107297743e1..04d8f35b2d4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -252,7 +252,8 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { new MockCurator(), new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } public HttpRequest post() throws FileNotFoundException { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index f10a7ffd502..6ca7a2922b6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -373,7 +373,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { new MockCurator(), new LogServerLogGrabber(), new ApplicationConvergenceChecker(), - new HttpProxy(new SimpleHttpFetcher()))); + new HttpProxy(new SimpleHttpFetcher()), + new ConfigserverConfig(new ConfigserverConfig.Builder()))); } private TestTenantBuilder addTenant(TenantName tenantName, -- cgit v1.2.3