[DATALAB-2422,2425] -- added master/slave gpu for GCP form
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 @@
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
+@JsonIgnoreProperties
public class GcpComputationalCreateForm extends ComputationalCreateFormDTO {
@NotBlank
@@ -56,9 +58,15 @@
@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 @@
.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;
