You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/09/21 12:36:20 UTC

[incubator-datalab] branch develop updated: fix

This is an automated email from the ASF dual-hosted git repository.

dyankiv 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 ade32c3af fix
ade32c3af is described below

commit ade32c3af0db6238fa537e97d9185082dd24c6c4
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Wed Sep 21 15:35:58 2022 +0300

    fix
---
 .../datalab/backendapi/core/commands/CommandExecutorMock.java     | 2 +-
 .../backendapi/core/response/handlers/ComputationalConfigure.java | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
index 5306272b3..c8db9c38f 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
@@ -105,7 +105,7 @@ public class CommandExecutorMock implements ICommandExecutor {
             case AWS:
                 return Lists.newArrayList(DOCKER_DATALAB_DATAENGINE_SERVICE, DOCKER_DATALAB_DATAENGINE);
             case AZURE:
-                return Lists.newArrayList(DOCKER_DATALAB_DATAENGINE);
+                return Lists.newArrayList(DOCKER_DATALAB_DATAENGINE, DOCKER_DATALAB_DATAENGINE_SERVICE);
             case GCP:
                 return Lists.newArrayList(DOCKER_DATALAB_DATAENGINE_SERVICE, DOCKER_DATALAB_DATAENGINE);
             default:
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalConfigure.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalConfigure.java
index 3cdfcf2e8..21c11eba0 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalConfigure.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/response/handlers/ComputationalConfigure.java
@@ -30,6 +30,7 @@ import com.epam.datalab.backendapi.core.commands.RunDockerCommand;
 import com.epam.datalab.backendapi.core.response.folderlistener.FolderListenerExecutor;
 import com.epam.datalab.cloud.CloudProvider;
 import com.epam.datalab.dto.aws.computational.SparkComputationalCreateAws;
+import com.epam.datalab.dto.azure.computational.SparkComputationalCreateAzure;
 import com.epam.datalab.dto.base.DataEngineType;
 import com.epam.datalab.dto.base.computational.ComputationalBase;
 import com.epam.datalab.dto.gcp.computational.SparkComputationalCreateGcp;
@@ -66,7 +67,12 @@ public class ComputationalConfigure implements DockerCommands {
                     return runConfigure(uuid, dto, DataEngineType.CLOUD_SERVICE);
                 }
             case AZURE:
-                return runConfigure(uuid, dto, DataEngineType.SPARK_STANDALONE);
+                if (dto instanceof SparkComputationalCreateAzure) {
+                    return runConfigure(uuid, dto, DataEngineType.SPARK_STANDALONE);
+                } else {
+                    return runConfigure(uuid, dto, DataEngineType.CLOUD_SERVICE);
+                }
+
             case GCP:
                 if (dto instanceof SparkComputationalCreateGcp) {
                     return runConfigure(uuid, dto, DataEngineType.SPARK_STANDALONE);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org