summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-06-28 14:10:06 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-07-02 13:43:49 +0200
commitce5876ae157f5ac56bb51cd8e2ad76ed3b4b1f35 (patch)
tree71244645fa54da74093a52481d760c984f95001f /controller-api
parent48417d7a59599c7c8149a19421a35f1d74ca8290 (diff)
Job serialisation and log store changes
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java4
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockLogStore.java11
2 files changed, 5 insertions, 10 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
index 959ac2b8680..918047edca1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
@@ -21,10 +21,10 @@ public interface LogStore {
void setConvergenceLog(RunId id, String convergenceLog);
/** @return the result of prepare of the test application for the given deployment job. */
- PrepareResponse getPrepareResponse(RunId id);
+ String getDeploymentLog(RunId id);
/** Stores the given result of prepare of the test application for the given deployment job. */
- void setPrepareResponse(RunId id, PrepareResponse prepareResponse);
+ void setDeploymentLog(RunId id, String deploymentLog);
/** Deletes all data associated with test of a given deployment job */
void deleteTestData(RunId id);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockLogStore.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockLogStore.java
index c5dba3b8fa7..bc9f6247055 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockLogStore.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockLogStore.java
@@ -35,17 +35,12 @@ public class MockLogStore implements LogStore {
}
@Override
- public PrepareResponse getPrepareResponse(RunId id) {
- PrepareResponse prepareResponse = new PrepareResponse();
- prepareResponse.message = "foo";
- prepareResponse.configChangeActions = new ConfigChangeActions(Collections.emptyList(),
- Collections.emptyList());
- prepareResponse.tenant = new TenantId("tenant");
- return prepareResponse;
+ public String getDeploymentLog(RunId id) {
+ return "SUCCESS";
}
@Override
- public void setPrepareResponse(RunId id, PrepareResponse prepareResponse) {
+ public void setDeploymentLog(RunId id, String deploymentLog) {
}