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/09/04 14:14:46 UTC
[incubator-dlab] branch develop updated: DLAB-1060 removed edge
from status api
This is an automated email from the ASF dual-hosted git repository.
bhliva 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 093c289 DLAB-1060 removed edge from status api
093c289 is described below
commit 093c289ae9ca8c864c8bd92d2c168549058f9c25
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Sep 4 17:14:35 2019 +0300
DLAB-1060 removed edge from status api
---
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 26 +++-------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java
index b2c6c2b..8254abf 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/EnvDAO.java
@@ -26,7 +26,6 @@ import com.epam.dlab.backendapi.domain.EnvStatusListener;
import com.epam.dlab.backendapi.resources.aws.ComputationalResourceAws;
import com.epam.dlab.backendapi.resources.dto.HealthStatusEnum;
import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO;
-import com.epam.dlab.backendapi.resources.dto.HealthStatusResource;
import com.epam.dlab.cloud.CloudProvider;
import com.epam.dlab.dto.UserInstanceDTO;
import com.epam.dlab.dto.UserInstanceStatus;
@@ -146,28 +145,9 @@ public class EnvDAO extends BaseDAO {
* @throws DlabException in case of any exception
*/
public HealthStatusPageDTO getHealthStatusPageDTO(String user, boolean fullReport) {
- List<HealthStatusResource> listResource = new ArrayList<>(1);
- final HealthStatusPageDTO healthStatusPageDTO = new HealthStatusPageDTO()
- .withStatus(HealthStatusEnum.OK);
-
- final Optional<Document> edgeNode = getEdgeNode(user);
- if (edgeNode.isPresent()) {
- final Document document = edgeNode.get();
- final String edgeStatus = document.getString(EDGE_STATUS);
- if (UserInstanceStatus.RUNNING != UserInstanceStatus.of(edgeStatus)) {
- healthStatusPageDTO.withStatus(HealthStatusEnum.ERROR);
- }
- if (fullReport) {
- listResource.add(new HealthStatusResource()
- .withType("Edge Node")
- .withResourceId(document.getString(EDGE_PUBLIC_IP))
- .withStatus(edgeStatus));
- }
- } else {
- healthStatusPageDTO.withStatus(HealthStatusEnum.ERROR);
- }
- return healthStatusPageDTO
- .withListResources(fullReport ? listResource : null);
+ return new HealthStatusPageDTO()
+ .withStatus(HealthStatusEnum.OK)
+ .withListResources(Collections.emptyList());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org