summaryrefslogtreecommitdiffstats
path: root/controller-api/src
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2019-09-20 18:42:30 +0200
committerGitHub <noreply@github.com>2019-09-20 18:42:30 +0200
commit855be4095e91b40d27dc6c6a6b1a9ebc8be90523 (patch)
tree78753bb1e2231a7f3e260ff4ea283eeff7fbb8cb /controller-api/src
parent3019fa5cb4d6f1635c947a4320353d09da2e6fb2 (diff)
parent124901534a695f56ade34c52ec0916914d1f89d7 (diff)
Merge pull request #10749 from vespa-engine/andreer/use-internal-ssl-context-for-tester-app
use internal ssl context for tester app
Diffstat (limited to 'controller-api/src')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java3
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java7
2 files changed, 9 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
index 89d922db806..f0972643bd5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/TesterCloud.java
@@ -25,6 +25,9 @@ public interface TesterCloud {
/** Returns whether the container is ready to serve. */
boolean ready(URI endpointUrl);
+ /** Returns whether the test container is ready to serve */
+ boolean testerReady(URI endpointUrl);
+
/** Returns whether the given URL is registered in DNS. */
boolean exists(URI endpointUrl);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
index ce5cc128d78..ce4d44eadce 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
@@ -39,7 +39,12 @@ public class MockTesterCloud implements TesterCloud {
}
@Override
- public boolean ready(URI resterUrl) {
+ public boolean ready(URI testerUrl) {
+ return true;
+ }
+
+ @Override
+ public boolean testerReady(URI testerUrl) {
return true;
}