This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 783ef7a [DEVELOP] -- GPU fix
new 598a85c Merge branch 'develop' of
https://github.com/apache/incubator-datalab into develop
783ef7a is described below
commit 783ef7aa516691d13f45975e5d35410808a8abdd
Author: KinashYurii <[email protected]>
AuthorDate: Mon May 24 18:22:07 2021 +0300
[DEVELOP] -- GPU fix
---
.../epam/datalab/dto/imagemetadata/EdgeGPU.java | 2 +
.../ExploratoryEnvironmentVersion.java | 60 +---------------------
.../com/epam/datalab/backendapi/dao/GpuDAO.java | 3 ++
.../epam/datalab/backendapi/dao/GpuDAOImpl.java | 6 +++
4 files changed, 13 insertions(+), 58 deletions(-)
diff --git
a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
index 3510776..3ac03f0 100644
---
a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
+++
b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/EdgeGPU.java
@@ -19,6 +19,7 @@
package com.epam.datalab.dto.imagemetadata;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,6 +32,7 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
public class EdgeGPU {
private String projectName;
diff --git
a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryEnvironmentVersion.java
b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryEnvironmentVersion.java
index 0c8f0e0..2bc34e5 100644
---
a/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryEnvironmentVersion.java
+++
b/services/datalab-model/src/main/java/com/epam/datalab/dto/imagemetadata/ExploratoryEnvironmentVersion.java
@@ -21,8 +21,9 @@
package com.epam.datalab.dto.imagemetadata;
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import lombok.Data;
+@Data
public class ExploratoryEnvironmentVersion {
@JsonProperty("template_name")
private String templateName;
@@ -34,61 +35,4 @@ public class ExploratoryEnvironmentVersion {
private String version;
@JsonProperty("vendor")
private String vendor;
-
- public ExploratoryEnvironmentVersion() {
- }
-
- public ExploratoryEnvironmentVersion(String templateName, String
description, String type, String version,
- String vendor) {
- this.templateName = templateName;
- this.description = description;
- this.type = type;
- this.version = version;
- this.vendor = vendor;
- }
-
- public String getTemplateName() {
- return templateName;
- }
-
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getVendor() {
- return vendor;
- }
-
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this);
- }
}
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAO.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAO.java
index 867deed..58019b8 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAO.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAO.java
@@ -21,12 +21,15 @@ package com.epam.datalab.backendapi.dao;
import com.epam.datalab.dto.imagemetadata.EdgeGPU;
+import java.util.List;
import java.util.Optional;
public interface GpuDAO {
Optional<EdgeGPU> getGPUByProjectName(String projectName);
+ void createAll(List<Object> gpus);
+
void create(EdgeGPU gpu);
void remove(String nodeId);
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAOImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAOImpl.java
index bfbf0ca..ef8f15e 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/GpuDAOImpl.java
@@ -22,6 +22,7 @@ package com.epam.datalab.backendapi.dao;
import com.epam.datalab.dto.imagemetadata.EdgeGPU;
import org.bson.conversions.Bson;
+import java.util.List;
import java.util.Optional;
import static com.mongodb.client.model.Filters.eq;
@@ -42,6 +43,11 @@ public class GpuDAOImpl extends BaseDAO implements GpuDAO {
}
@Override
+ public void createAll(List<Object> gpus) {
+ insertMany(GPU_COLLECTION, gpus);
+ }
+
+ @Override
public void remove(String edgeId) {
deleteOne(GPU_COLLECTION, getByIdCondition(edgeId));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
