This is an automated email from the ASF dual-hosted git repository. dyankiv pushed a commit to branch DATALAB-2645 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit fc0a564ded75804fb31dbfb4b53544c089bfbe58 Author: Denys Yankiv <[email protected]> AuthorDate: Tue Aug 16 11:28:16 2022 +0300 add termiante dto for hdinsight --- .../computational/AzureComputationalTerminateDTO.java | 14 ++++++++++++++ .../resources/azure/ComputationalResourceAzure.java | 5 ++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/azure/computational/AzureComputationalTerminateDTO.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/azure/computational/AzureComputationalTerminateDTO.java new file mode 100644 index 000000000..d21089b64 --- /dev/null +++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/azure/computational/AzureComputationalTerminateDTO.java @@ -0,0 +1,14 @@ +package com.epam.datalab.dto.azure.computational; + +import com.epam.datalab.dto.computational.ComputationalTerminateDTO; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString(callSuper = true) +public class AzureComputationalTerminateDTO extends ComputationalTerminateDTO { + + @JsonProperty("hdinsight_cluster_name") + private String clusterName; +} diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/azure/ComputationalResourceAzure.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/azure/ComputationalResourceAzure.java index 5f8bc5676..fc65179cc 100644 --- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/azure/ComputationalResourceAzure.java +++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/azure/ComputationalResourceAzure.java @@ -29,6 +29,7 @@ import com.epam.datalab.backendapi.core.response.handlers.ComputationalCallbackH import com.epam.datalab.backendapi.core.response.handlers.ComputationalConfigure; import com.epam.datalab.backendapi.service.impl.DockerService; import com.epam.datalab.backendapi.service.impl.SparkClusterService; +import com.epam.datalab.dto.azure.computational.AzureComputationalTerminateDTO; import com.epam.datalab.dto.azure.computational.ComputationalCreateAzure; import com.epam.datalab.dto.azure.computational.SparkComputationalCreateAzure; import com.epam.datalab.dto.base.DataEngineType; @@ -37,7 +38,6 @@ import com.epam.datalab.dto.computational.ComputationalClusterConfigDTO; import com.epam.datalab.dto.computational.ComputationalStartDTO; import com.epam.datalab.dto.computational.ComputationalStopDTO; import com.epam.datalab.dto.computational.ComputationalTerminateDTO; -import com.epam.datalab.dto.gcp.computational.GcpComputationalTerminateDTO; import com.epam.datalab.exceptions.DatalabException; import com.epam.datalab.rest.contracts.ComputationalAPI; import com.fasterxml.jackson.core.JsonProcessingException; @@ -58,7 +58,6 @@ import static com.epam.datalab.backendapi.core.commands.DockerAction.TERMINATE; @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @Slf4j -//public class ComputationalResourceAzure implements ComputationalAPI { public class ComputationalResourceAzure extends DockerService implements DockerCommands { @Inject @@ -103,7 +102,7 @@ public class ComputationalResourceAzure extends DockerService implements DockerC @POST @Path(ComputationalAPI.COMPUTATIONAL_TERMINATE_CLOUD_SPECIFIC) - public String terminate(@Auth UserInfo ui, GcpComputationalTerminateDTO dto) { + public String terminate(@Auth UserInfo ui, AzureComputationalTerminateDTO dto) { log.debug("Terminate computational resources {} for user {}: {}", dto.getComputationalName(), ui.getName(), dto); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
