You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/03/16 13:23:10 UTC
[incubator-dlab] branch odahu-integration updated: Added ssh key
parameter for start/stop/terminate actions
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new b931d7e Added ssh key parameter for start/stop/terminate actions
b931d7e is described below
commit b931d7ece17ae3e6193304aff3be221a8083ba99
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Mon Mar 16 15:22:54 2020 +0200
Added ssh key parameter for start/stop/terminate actions
---
.../src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java | 2 ++
.../java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java | 3 ++-
.../src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java | 5 +++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
index 2b24540..544ba82 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/odahu/ActionOdahuDTO.java
@@ -33,6 +33,8 @@ public class ActionOdahuDTO extends ResourceBaseDTO<ActionOdahuDTO> {
private final String project;
@JsonProperty("endpoint_name")
private final String endpoint;
+ @JsonProperty("ssh_key")
+ private final String key;
@JsonProperty("grafana_admin")
private String grafanaAdmin;
@JsonProperty("grafana_pass")
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
index 71d01c1..3f5671b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/OdahuServiceImpl.java
@@ -162,12 +162,13 @@ public class OdahuServiceImpl implements OdahuService {
private void actionOnCloud(UserInfo user, String uri, String name, String project, String endpoint) {
String url = null;
EndpointDTO endpointDTO = endpointService.get(endpoint);
+ ProjectDTO projectDTO = projectService.get(project);
try {
OdahuFieldsDTO fields = odahuDAO.getFields(name, project, endpoint);
url = endpointDTO.getUrl() + uri;
String uuid =
provisioningService.post(url, user.getAccessToken(),
- requestBuilder.newOdahuAction(user, name, project, endpointDTO, fields), String.class);
+ requestBuilder.newOdahuAction(user, name, projectDTO, endpointDTO, fields), String.class);
requestId.put(user.getName(), uuid);
} catch (Exception e) {
log.error("Can not perform {} due to: {}, {}", url, e.getMessage(), e);
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 10fda13..4d2eaaf 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
@@ -634,11 +634,12 @@ public class RequestBuilder {
.withCloudSettings(cloudSettings(user, endpointDTO.getCloudProvider()));
}
- public ActionOdahuDTO newOdahuAction(UserInfo user, String name, String project, EndpointDTO endpointDTO,
+ public ActionOdahuDTO newOdahuAction(UserInfo user, String name, ProjectDTO projectDTO, EndpointDTO endpointDTO,
OdahuFieldsDTO odahuFields) {
return ActionOdahuDTO.builder()
.name(name)
- .project(project)
+ .project(projectDTO.getName())
+ .key(projectDTO.getKey().replace("\n", ""))
.endpoint(endpointDTO.getName())
.grafanaAdmin(odahuFields.getGrafanaAdmin())
.grafanaPassword(odahuFields.getGrafanaPassword())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org