This is an automated email from the ASF dual-hosted git repository.
ofuks 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 75a07fd [DLAB-1623] Stopping of the Edge node (#659)
75a07fd is described below
commit 75a07fda9644aa9b8febe3844440f62ae58e4185
Author: Pavel Papou <[email protected]>
AuthorDate: Thu Mar 19 10:34:01 2020 -0400
[DLAB-1623] Stopping of the Edge node (#659)
[DLAB-1623] Stopping of the Edge node
---
.../epam/dlab/backendapi/resources/ProjectResource.java | 2 +-
.../com/epam/dlab/backendapi/service/ProjectService.java | 2 +-
.../dlab/backendapi/service/impl/ProjectServiceImpl.java | 14 +++++++++-----
.../dlab/backendapi/resources/ProjectResourceTest.java | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index 06833ec..93e42bb 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@ -104,7 +104,7 @@ public class ProjectResource {
@RolesAllowed("/api/project")
public Response stopProject(@Parameter(hidden = true) @Auth UserInfo
userInfo,
@NotNull @Valid
ProjectActionFormDTO stopProjectDTO) {
- projectService.stopWithResources(userInfo,
stopProjectDTO.getProjectName());
+ projectService.stopWithResources(userInfo,
stopProjectDTO.getEndpoints(), stopProjectDTO.getProjectName());
return Response
.accepted()
.build();
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
index 738fbdb..1fd394b 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
@@ -36,7 +36,7 @@ public interface ProjectService {
void stop(UserInfo userInfo, List<String> endpoints, String name);
- void stopWithResources(UserInfo userInfo, String projectName);
+ void stopWithResources(UserInfo userInfo, List<String> endpoints,
String projectName);
void update(UserInfo userInfo, UpdateProjectDTO projectDTO);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index e6113e7..99836f4 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -165,15 +165,19 @@ public class ProjectServiceImpl implements ProjectService
{
}
@Override
- public void stopWithResources(UserInfo userInfo, String projectName) {
- List<ProjectEndpointDTO> endpoints =
get(projectName).getEndpoints();
- checkProjectRelatedResourcesInProgress(projectName, endpoints,
STOP_ACTION);
+ public void stopWithResources(UserInfo userInfo, List<String>
endpoints, String projectName) {
+ List<ProjectEndpointDTO> endpointDTOs = get(projectName)
+ .getEndpoints()
+ .stream()
+ .filter(projectEndpointDTO ->
endpoints.contains(projectEndpointDTO.getName()))
+ .collect(Collectors.toList());
+ checkProjectRelatedResourcesInProgress(projectName,
endpointDTOs, STOP_ACTION);
exploratoryDAO.fetchRunningExploratoryFieldsForProject(projectName).forEach(e ->
exploratoryService.stop(new
UserInfo(e.getUser(), userInfo.getAccessToken()), projectName,
e.getExploratoryName()));
- endpoints.stream().filter(e ->
!Arrays.asList(UserInstanceStatus.TERMINATED,
- UserInstanceStatus.TERMINATING,
UserInstanceStatus.STOPPED).contains(e.getStatus()))
+ endpointDTOs.stream().filter(e ->
!Arrays.asList(UserInstanceStatus.TERMINATED,
+ UserInstanceStatus.TERMINATING,
UserInstanceStatus.STOPPED, UserInstanceStatus.FAILED).contains(e.getStatus()))
.forEach(e -> stop(userInfo, e.getName(),
projectName));
}
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
index 77ab8ad..b85f631 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
@@ -62,7 +62,7 @@ public class ProjectResourceTest extends TestBase {
.post(Entity.json(getProjectActionDTO()));
assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus());
- verify(projectService).stopWithResources(any(UserInfo.class),
anyString());
+ verify(projectService).stopWithResources(any(UserInfo.class),
anyList(), anyString());
verifyNoMoreInteractions(projectService);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]