This is an automated email from the ASF dual-hosted git repository. ykinash pushed a commit to branch DATALAB-2422 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 7d0a25cadde8a318c12fc02d7e76be03e3704ead Author: KinashYurii <[email protected]> AuthorDate: Mon Jun 7 14:51:04 2021 +0300 [DATALAB-2422,2425] -- added master/slave gpu for GCP form --- .../resources/dto/gcp/GcpComputationalCreateForm.java | 16 ++++++++++++---- .../com/epam/datalab/backendapi/util/RequestBuilder.java | 6 ++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java index 92c8402..684264f 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/gcp/GcpComputationalCreateForm.java @@ -20,6 +20,7 @@ package com.epam.datalab.backendapi.resources.dto.gcp; import com.epam.datalab.backendapi.resources.dto.ComputationalCreateFormDTO; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,6 +30,7 @@ import org.hibernate.validator.constraints.NotBlank; @EqualsAndHashCode(callSuper = true) @Data @ToString(callSuper = true) +@JsonIgnoreProperties public class GcpComputationalCreateForm extends ComputationalCreateFormDTO { @NotBlank @@ -56,9 +58,15 @@ public class GcpComputationalCreateForm extends ComputationalCreateFormDTO { @JsonProperty("gpu_enabled") private Boolean enabledGPU; - @JsonProperty("gpuType") - private String gpuType; + @JsonProperty("master_gpu_type") + private String masterGpuType; - @JsonProperty("gpuCount") - private String gpuCount; + @JsonProperty("master_gpu_count") + private String masterGpuCount; + + @JsonProperty("slave_gpu_type") + private String slaveGpuType; + + @JsonProperty("slave_gpu_count") + private String slaveGpuCount; } diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java index 76457cf..5821d76 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java @@ -358,8 +358,10 @@ public class RequestBuilder { .withMasterInstanceType(gcpForm.getMasterInstanceType()) .withSlaveInstanceType(gcpForm.getSlaveInstanceType()) .withVersion(gcpForm.getVersion()) - .withMasterGPUCount(gcpForm.getGpuCount()) - .withMasterGPUType(gcpForm.getGpuType()) + .withMasterGPUCount(gcpForm.getMasterGpuCount()) + .withMasterGPUType(gcpForm.getMasterGpuType()) + .withSlaveGPUCount(gcpForm.getSlaveGpuCount()) + .withSlaveGPUType(gcpForm.getSlaveGpuType()) .withSharedImageEnabled(String.valueOf(projectDTO.isSharedImageEnabled())); break; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
