You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/29 12:37:09 UTC
[incubator-dlab] branch develop updated: DLAB-000 tags added to
create image action
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 4bb8aa9 DLAB-000 tags added to create image action
4bb8aa9 is described below
commit 4bb8aa962e80121983cda8f4fcd9fd7d3fe1a1aa
Author: bhliva <bo...@epam.com>
AuthorDate: Mon Jul 29 15:36:02 2019 +0300
DLAB-000 tags added to create image action
---
.../com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java | 10 ++++++++++
.../java/com/epam/dlab/backendapi/util/RequestBuilder.java | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
index 9e8cfcf..653339d 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
@@ -23,17 +23,27 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
import lombok.Data;
+import java.util.Map;
+
@Data
public class ExploratoryImageDTO extends ExploratoryActionDTO<ExploratoryImageDTO> {
@JsonProperty("notebook_image_name")
private String imageName;
+ @JsonProperty("tags")
+ private Map<String, String> tags;
+
public ExploratoryImageDTO withImageName(String imageName) {
this.imageName = imageName;
return this;
}
+ public ExploratoryImageDTO withTags(Map<String, String> tags) {
+ this.tags = tags;
+ return this;
+ }
+
@Override
public MoreObjects.ToStringHelper toStringHelper(Object self) {
return super.toStringHelper(self)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index f33b758..f97d6c2 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -539,7 +539,8 @@ public class RequestBuilder {
.withExploratoryName(userInstance.getExploratoryName())
.withApplicationName(getApplicationNameFromImage(userInstance.getImageName()))
.withNotebookImage(userInstance.getImageName())
- .withImageName(imageName);
+ .withImageName(imageName)
+ .withTags(userInstance.getTags());
}
@SuppressWarnings("unchecked")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org