You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/08 13:28:09 UTC
[incubator-dlab] 02/02: DLAB-000 commit
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch project_tmp
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 36680a6952375045d13b42a406f14ce0a616b00c
Author: bhliva <bo...@epam.com>
AuthorDate: Mon Jul 8 16:27:44 2019 +0300
DLAB-000 commit
---
.../epam/dlab/backendapi/domain/ProjectDTO.java | 22 +++++++++++++++++-----
.../service/impl/ProjectServiceImpl.java | 6 +++---
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
index 2354857..631cc99 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
@@ -1,6 +1,7 @@
package com.epam.dlab.backendapi.domain;
import com.epam.dlab.dto.UserInstanceStatus;
+import com.epam.dlab.dto.base.edge.EdgeInfo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
@@ -24,21 +25,32 @@ public class ProjectDTO {
private final String tag;
private final Integer budget;
private final Status status = Status.CREATING;
+ private EdgeInfo edgeInfo;
public enum Status {
CREATING,
ACTIVE,
FAILED,
- TERMINATED,
- TERMINATING,
- STOPPING,
- STARTING,
- STOPPED;
+ DELETED,
+ DELETING,
+ DEACTIVATING,
+ ACTIVATING,
+ NOT_ACTIVE;
public static Status from(UserInstanceStatus userInstanceStatus) {
if (userInstanceStatus == UserInstanceStatus.RUNNING) {
return ACTIVE;
+ } else if (userInstanceStatus == UserInstanceStatus.TERMINATED) {
+ return DELETED;
+ } else if (userInstanceStatus == UserInstanceStatus.TERMINATING) {
+ return DELETING;
+ } else if (userInstanceStatus == UserInstanceStatus.STOPPING) {
+ return DEACTIVATING;
+ } else if (userInstanceStatus == UserInstanceStatus.STOPPED) {
+ return NOT_ACTIVE;
+ } else if (userInstanceStatus == UserInstanceStatus.STARTING) {
+ return ACTIVATING;
}
return Status.valueOf(userInstanceStatus.name());
}
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 02f9fc9..23d0e9f 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
@@ -80,19 +80,19 @@ public class ProjectServiceImpl implements ProjectService {
public void terminate(UserInfo userInfo, String name) {
projectActionOnCloud(userInfo, name, TERMINATE_PRJ_API);
environmentService.terminateProjectEnvironment(name);
- projectDAO.updateStatus(name, ProjectDTO.Status.TERMINATING);
+ projectDAO.updateStatus(name, ProjectDTO.Status.DELETING);
}
@Override
public void start(UserInfo userInfo, String name) {
projectActionOnCloud(userInfo, name, START_PRJ_API);
- projectDAO.updateStatus(name, ProjectDTO.Status.STARTING);
+ projectDAO.updateStatus(name, ProjectDTO.Status.ACTIVATING);
}
@Override
public void stop(UserInfo userInfo, String name) {
projectActionOnCloud(userInfo, name, STOP_PRJ_API);
- projectDAO.updateStatus(name, ProjectDTO.Status.STOPPING);
+ projectDAO.updateStatus(name, ProjectDTO.Status.DEACTIVATING);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org