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 a4fd5de [DATALAB] -- fixed name for DP on AWS
new 4e24db1 Merge remote-tracking branch 'origin/develop' into develop
a4fd5de is described below
commit a4fd5de4bbde9a60a2db5c0dd1a6eca9f9f3735c
Author: KinashYurii <[email protected]>
AuthorDate: Thu Jul 1 14:52:59 2021 +0300
[DATALAB] -- fixed name for DP on AWS
---
.../epam/datalab/backendapi/resources/base/ExploratoryService.java | 4 ++++
.../com/epam/datalab/backendapi/resources/ExploratoryResource.java | 3 ++-
.../epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java | 1 +
.../main/java/com/epam/datalab/backendapi/util/RequestBuilder.java | 5 ++++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/base/ExploratoryService.java
b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/base/ExploratoryService.java
index 2116670..58aa0db 100644
---
a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/base/ExploratoryService.java
+++
b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/base/ExploratoryService.java
@@ -43,6 +43,8 @@ public class ExploratoryService extends DockerService
implements DockerCommands
configuration.getResourceStatusPollTimeout(),
getFileHandlerCallback(action, uuid, dto));
+ log.info("TEST LOG!!!: dto: {}", dto);
+
RunDockerCommand runDockerCommand = new RunDockerCommand()
.withInteractive()
.withName(nameContainer(dto.getEdgeUserName(), action,
dto.getExploratoryName()))
@@ -54,6 +56,8 @@ public class ExploratoryService extends DockerService
implements DockerCommands
.withConfKeyName(configuration.getAdminKey())
.withImage(dto.getNotebookImage())
.withAction(action);
+ log.info("TEST LOG!!!: command: {}", runDockerCommand);
+
if (configuration.getCloudProvider() == CloudProvider.AZURE &&
Objects.nonNull(configuration.getCloudConfiguration().getAzureAuthFile()) &&
!configuration.getCloudConfiguration().getAzureAuthFile().isEmpty()) {
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 8d5cfe0..23b74a6 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,8 @@ public class ExploratoryResource implements ExploratoryAPI {
return Exploratory.builder()
.name(formDTO.getName())
.dockerImage(formDTO.getImage())
- .imageName(formDTO.getImageName().isEmpty() ?
formDTO.getVersion() : formDTO.getImageName())
+ .imageName((formDTO.getImageName() == null ||
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/service/impl/ExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
index ade4807..41ce2fd 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -123,6 +123,7 @@ public class ExploratoryServiceImpl implements
ExploratoryService {
isAdded = true;
final ExploratoryGitCredsDTO gitCreds =
gitCredsDAO.findGitCreds(userInfo.getName());
log.debug("Created exploratory environment {} for user {}",
exploratory.getName(), userInfo.getName());
+ log.info("TEST LOG!!!: send to provserv: {}", exploratory);
final String uuid =
provisioningService.post(endpointDTO.getUrl() +
EXPLORATORY_CREATE,
userInfo.getAccessToken(),
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
index 682d293..7362160 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
@@ -168,7 +168,8 @@ public class RequestBuilder {
throw new
IllegalArgumentException(UNSUPPORTED_CLOUD_PROVIDER_MESSAGE + cloudProvider);
}
- return exploratoryCreate.withExploratoryName(exploratory.getName())
+
+ T t = exploratoryCreate.withExploratoryName(exploratory.getName())
.withNotebookImage(exploratory.getDockerImage())
.withApplicationName(getApplicationNameFromImage(exploratory.getDockerImage()))
.withGitCreds(exploratoryGitCredsDTO.getGitCreds())
@@ -181,6 +182,8 @@ public class RequestBuilder {
.withGPUCount(exploratory.getGpuCount())
.withGPUType(exploratory.getGpuType())
.withEnabledGPU(exploratory.getEnabledGPU());
+ System.out.println("TEST LOG!!!! send to prov: + " + t.toString());
+ return t;
}
@SuppressWarnings("unchecked")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
