Merge pull request #1212 from apache/DATALAB-2441
[DATALAB-2441] removed gpu count with value 8 for all available instances/GPU type
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/aws/computational/ComputationalCreateAws.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/aws/computational/ComputationalCreateAws.java
index bb1eeb9..a2b044b 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/aws/computational/ComputationalCreateAws.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/aws/computational/ComputationalCreateAws.java
@@ -22,9 +22,13 @@
import com.epam.datalab.dto.base.computational.ComputationalBase;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects.ToStringHelper;
+import lombok.Getter;
+import lombok.Setter;
import java.util.List;
+@Getter
+@Setter
public class ComputationalCreateAws extends ComputationalBase<ComputationalCreateAws> {
@JsonProperty("emr_instance_count")
private String instanceCount;
@@ -56,49 +60,21 @@
return this;
}
- public String getMasterInstanceType() {
- return masterInstanceType;
- }
-
- public void setMasterInstanceType(String masterInstanceType) {
- this.masterInstanceType = masterInstanceType;
- }
-
public ComputationalCreateAws withMasterInstanceType(String masterInstanceType) {
setMasterInstanceType(masterInstanceType);
return this;
}
- public String getSlaveInstanceType() {
- return slaveInstanceType;
- }
-
- public void setSlaveInstanceType(String slaveInstanceType) {
- this.slaveInstanceType = slaveInstanceType;
- }
-
public ComputationalCreateAws withSlaveInstanceType(String slaveInstanceType) {
setSlaveInstanceType(slaveInstanceType);
return this;
}
- public Boolean getSlaveInstanceSpot() {
- return slaveInstanceSpot;
- }
-
- public void setSlaveInstanceSpot(Boolean slaveInstanceSpot) {
- this.slaveInstanceSpot = slaveInstanceSpot;
- }
-
public ComputationalCreateAws withSlaveInstanceSpot(Boolean slaveInstanceSpot) {
setSlaveInstanceSpot(slaveInstanceSpot);
return this;
}
- public Integer getSlaveInstanceSpotPctPrice() {
- return slaveInstanceSpotPctPrice;
- }
-
public void setSlaveInstanceSpotPctPrice(Integer slaveInstanceSpotPctPrice) {
this.slaveInstanceSpotPctPrice = slaveInstanceSpotPctPrice;
}
@@ -108,45 +84,26 @@
return this;
}
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
public ComputationalCreateAws withVersion(String version) {
setVersion(version);
return this;
}
- public List<ClusterConfig> getConfig() {
- return config;
- }
-
- public void setConfig(List<ClusterConfig> config) {
- this.config = config;
- }
-
public ComputationalCreateAws withConfig(List<ClusterConfig> config) {
setConfig(config);
return this;
}
- public String getSharedImageEnabled() {
- return sharedImageEnabled;
- }
-
- public void setSharedImageEnabled(String sharedImageEnabled) {
- this.sharedImageEnabled = sharedImageEnabled;
- }
-
public ComputationalCreateAws withSharedImageEnabled(String sharedImageEnabled) {
setSharedImageEnabled(sharedImageEnabled);
return this;
}
+ public ComputationalCreateAws withNotebookName(String name) {
+ setNotebookInstanceName(name);
+ return this;
+ }
+
@Override
public ToStringHelper toStringHelper(Object self) {
return super.toStringHelper(self)
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 43dbc9c..8d5cfe0 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
@@ -155,7 +155,7 @@
return Exploratory.builder()
.name(formDTO.getName())
.dockerImage(formDTO.getImage())
- .imageName(formDTO.getImageName())
+ .imageName(formDTO.getImageName().isEmpty() ? formDTO.getVersion() : formDTO.getImageName())
.templateName(formDTO.getTemplateName())
.version(formDTO.getVersion())
.clusterConfig(formDTO.getClusterConfig())
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/aws/AwsComputationalCreateForm.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/aws/AwsComputationalCreateForm.java
index 5b536ee..314dba5 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/aws/AwsComputationalCreateForm.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/aws/AwsComputationalCreateForm.java
@@ -52,6 +52,4 @@
@NotBlank
@JsonProperty("emr_version")
private String version;
-
-
}
