diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-07-17 15:30:18 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-07-17 15:30:18 +0200 |
commit | 9ee2084b394bd01ecb3d52028188057193c06d4d (patch) | |
tree | 8fe458548cd037004b526f6ed06f67e7fe6fba4c | |
parent | 980885223d1953260f0f2ea6f608fa5b77413d0f (diff) |
Add SubmitOptions and SubmitResult
3 files changed, 58 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java index 812c4a60288..bea496c19d7 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/EnvironmentResource.java @@ -36,8 +36,10 @@ public interface EnvironmentResource { String API_PATH = "environment"; + String APPLICATION_TEST_ZIP = "applicationTestZip"; String APPLICATION_ZIP = "applicationZip"; String DEPLOY_OPTIONS = "deployOptions"; + String SUBMIT_OPTIONS = "submitOptions"; @POST @Path("{environmentId}/region/{regionId}/instance/{instanceId}/deploy") diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java new file mode 100644 index 00000000000..2c14addfeee --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitOptions.java @@ -0,0 +1,30 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.controller.api.application.v4.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository; + +/** + * Additional options to be sent along the application package and the application test package + * when submitting an application to the controller + * + * @author freva + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class SubmitOptions { + + public GitRepository gitRepository; + public GitBranch gitBranch; + public GitCommit gitCommit; + + @Override + public String toString() { + return "SubmitOptions{" + + "gitRepository=" + gitRepository + + ", gitBranch=" + gitBranch + + ", gitCommit=" + gitCommit + + '}'; + } +} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java new file mode 100644 index 00000000000..ee40a1e6ee8 --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/SubmitResult.java @@ -0,0 +1,26 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.controller.api.application.v4.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.yahoo.component.Version; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitBranch; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitCommit; +import com.yahoo.vespa.hosted.controller.api.identifiers.GitRepository; + +/** + * Represents the response from application submit request + * + * @author freva + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class SubmitResult { + + public String version; + + @Override + public String toString() { + return "SubmitResult{" + + "version='" + version + '\'' + + '}'; + } +} |