You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/02/01 14:56:58 UTC
[incubator-datalab] branch DATALAB-2232 updated:
DATALAB-2232/DATALAB-2247
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2232
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2232 by this push:
new 4a8169c DATALAB-2232/DATALAB-2247
4a8169c is described below
commit 4a8169c04221e6972aa15c33f8a1eec4b7a67354
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Mon Feb 1 16:56:26 2021 +0200
DATALAB-2232/DATALAB-2247
---
.../com/epam/datalab/model/exploratory/Exploratory.java | 6 ++----
.../backendapi/resources/ExploratoryResource.java | 6 ++----
.../resources/dto/ExploratoryCreateFormDTO.java | 16 ++++------------
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
index e831bf5..49913c1 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Exploratory.java
@@ -40,8 +40,6 @@ public class Exploratory {
private final String exploratoryTag;
private final List<ClusterConfig> clusterConfig;
private Boolean enabledGPU;
- private String masterGPUType;
- private String slaveGPUType;
- private String masterGPUCount;
- private String slaveGPUCount;
+ private String gpuType;
+ private String gpuCount;
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
index 2cf6653..edde577 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ExploratoryResource.java
@@ -170,10 +170,8 @@ public class ExploratoryResource implements ExploratoryAPI {
.project(formDTO.getProject())
.exploratoryTag(formDTO.getExploratoryTag())
.enabledGPU(formDTO.getEnabledGPU())
- .masterGPUCount(formDTO.getMasterGPUCount())
- .masterGPUType(formDTO.getMasterGPUType())
- .slaveGPUCount(formDTO.getSlaveGPUCount())
- .slaveGPUType(formDTO.getSlaveGPUType())
+ .gpuCount(formDTO.getGpuCount())
+ .gpuType(formDTO.getGpuType())
.build();
}
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
index a6d3e33..8440ac5 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryCreateFormDTO.java
@@ -70,18 +70,10 @@ public class ExploratoryCreateFormDTO {
@JsonProperty("gpu_enabled")
private Boolean enabledGPU;
-
- @JsonProperty("masterGPUType")
- private String masterGPUType;
-
- @JsonProperty("slaveGPUType")
- private String slaveGPUType;
-
- @JsonProperty("masterGPUCount")
- private String masterGPUCount;
-
- @JsonProperty("slaveGPUCount")
- private String slaveGPUCount;
+ @JsonProperty("gpuType")
+ private String gpuType;
+ @JsonProperty("gpuCount")
+ private String gpuCount;
@Override
public String toString() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org