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/04/28 10:27:29 UTC
[incubator-datalab] 02/03: [DATALAB-2352] - refactoring
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit e549c095241e29deac95dc517e8dd49de57d55a5
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Apr 28 13:26:17 2021 +0300
[DATALAB-2352] - refactoring
---
.../epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java | 2 ++
.../com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java | 2 ++
.../epam/datalab/backendapi/core/commands/CommandParserMock.java | 4 +++-
.../backendapi/core/response/handlers/BackupCallbackHandler.java | 1 -
.../backendapi/service/impl/InfrastructureTemplateServiceImpl.java | 7 ++++++-
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
index 83ace74..9d50136 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ComputationalMetadataDTO.java
@@ -20,6 +20,7 @@
package com.epam.datalab.dto.imagemetadata;
import com.epam.datalab.dto.base.edge.GPU;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +32,7 @@ import java.util.Map;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties
public class ComputationalMetadataDTO extends ImageMetadataDTO {
@JsonProperty
protected String image;
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
index 5571db2..a919ed7 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryMetadataDTO.java
@@ -21,6 +21,7 @@
package com.epam.datalab.dto.imagemetadata;
import com.epam.datalab.dto.base.edge.GPU;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.util.List;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties
public class ExploratoryMetadataDTO extends ImageMetadataDTO {
@JsonProperty
protected String image;
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
index 90659d9..e61f06b 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandParserMock.java
@@ -214,8 +214,10 @@ public class CommandParserMock {
*/
private Pair<String, String> getPair(String argName, String value, String separator) {
String[] array = value.split(separator);
- if (array.length != 2) {
+ if (array.length == 2) {
return new ImmutablePair<>(array[0], array[1]);
+ } else if (array.length == 3) {
+ return new ImmutablePair<>(array[1], array[2]);
}
throw new DatalabException("Invalid value for \"" + argName + "\": " + value);
}
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
index 40fa2dd..d8309b5 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/BackupCallbackHandler.java
@@ -122,5 +122,4 @@ public class BackupCallbackHandler implements FileHandlerCallback {
.withStatus(status)
.withUser(user);
}
-
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index cc659c5..55cccfc 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -256,6 +256,11 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
}
private void addGpu(ExploratoryMetadataDTO e, String projectName) {
- gpuDAO.getGPUByProjectName(projectName).ifPresent(x -> x.setGpus(x.getGpus()));
+ try {
+ gpuDAO.getGPUByProjectName(projectName).ifPresent(x -> e.setComputationGPU(x.getGpus()));
+ } catch (Exception ex) {
+ log.info(ex.getMessage());
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org