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

ofuks pushed a commit to branch DLAB-1357
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1357 by this push:
     new 047ce4d  Added Odahu on 'List of Resources' and 'Environment 
Management' pages
047ce4d is described below

commit 047ce4d220eef929d78292b440f23aa4532fe798
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Jan 31 14:37:27 2020 +0200

    Added Odahu on 'List of Resources' and 'Environment Management' pages
---
 .../java/com/epam/dlab/model/ResourceEnum.java     |  3 ++-
 .../resources/InfrastructureInfoResource.java      |  2 +-
 .../resources/dto/ProjectInfrastructureInfo.java   |  4 +++
 .../service/InfrastructureInfoService.java         |  2 +-
 .../service/impl/EnvironmentServiceImpl.java       | 28 +++++++++++++++++---
 .../impl/InfrastructureInfoServiceBase.java        | 30 ++++++++--------------
 .../resources/InfrastructureInfoResourceTest.java  | 15 ++++++++---
 7 files changed, 54 insertions(+), 30 deletions(-)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/model/ResourceEnum.java 
b/services/dlab-model/src/main/java/com/epam/dlab/model/ResourceEnum.java
index 4ee7d2c..dd96c8f 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/model/ResourceEnum.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/model/ResourceEnum.java
@@ -22,7 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum ResourceEnum {
        EDGE_NODE("edge node"),
-       NOTEBOOK("notebook");
+       NOTEBOOK("notebook"),
+       ODAHU("odahu");
 
        private String name;
 
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java
index db8197f..b9dee92 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResource.java
@@ -78,7 +78,7 @@ public class InfrastructureInfoResource {
        @GET
        @Path("/info")
        public List<ProjectInfrastructureInfo> getUserResources(@Auth UserInfo 
userInfo) {
-               return 
infrastructureInfoService.getUserResources(userInfo.getName());
+               return infrastructureInfoService.getUserResources(userInfo);
 
        }
 
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
index 950893e..acac316 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
@@ -19,11 +19,13 @@
 
 package com.epam.dlab.backendapi.resources.dto;
 
+import com.epam.dlab.backendapi.domain.OdahuDTO;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
 import org.bson.Document;
 
+import java.util.List;
 import java.util.Map;
 
 @AllArgsConstructor
@@ -37,4 +39,6 @@ public class ProjectInfrastructureInfo {
        private Map<String, Map<String, String>> shared;
        @JsonProperty
        private Iterable<Document> exploratory;
+       @JsonProperty
+       private List<OdahuDTO> odahu;
 }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java
index aa23d1d..a385925 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java
@@ -27,7 +27,7 @@ import com.epam.dlab.dto.InfrastructureMetaInfoDTO;
 import java.util.List;
 
 public interface InfrastructureInfoService {
-       List<ProjectInfrastructureInfo> getUserResources(String user);
+       List<ProjectInfrastructureInfo> getUserResources(UserInfo user);
 
        HealthStatusPageDTO getHeathStatus(UserInfo user, boolean fullReport, 
boolean isAdmin);
 
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
index 1d70935..0d513a5 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
@@ -24,10 +24,16 @@ import com.epam.dlab.backendapi.dao.EnvDAO;
 import com.epam.dlab.backendapi.dao.ExploratoryDAO;
 import com.epam.dlab.backendapi.dao.KeyDAO;
 import com.epam.dlab.backendapi.dao.UserSettingsDAO;
+import com.epam.dlab.backendapi.domain.OdahuDTO;
 import com.epam.dlab.backendapi.domain.ProjectDTO;
 import com.epam.dlab.backendapi.resources.dto.UserDTO;
 import com.epam.dlab.backendapi.resources.dto.UserResourceInfo;
-import com.epam.dlab.backendapi.service.*;
+import com.epam.dlab.backendapi.service.ComputationalService;
+import com.epam.dlab.backendapi.service.EdgeService;
+import com.epam.dlab.backendapi.service.EnvironmentService;
+import com.epam.dlab.backendapi.service.ExploratoryService;
+import com.epam.dlab.backendapi.service.ProjectService;
+import com.epam.dlab.backendapi.service.SecurityService;
 import com.epam.dlab.dto.UserInstanceDTO;
 import com.epam.dlab.dto.UserInstanceStatus;
 import com.epam.dlab.exceptions.ResourceConflictException;
@@ -99,7 +105,8 @@ public class EnvironmentServiceImpl implements 
EnvironmentService {
                List<UserInstanceDTO> expList = exploratoryDAO.getInstances();
                return projectService.getProjects()
                                .stream()
-                               .map(projectDTO -> getProjectEnv(projectDTO, 
expList)).flatMap(Collection::stream)
+                               .map(projectDTO -> getProjectEnv(projectDTO, 
expList))
+                               .flatMap(Collection::stream)
                                .collect(toList());
        }
 
@@ -216,7 +223,12 @@ public class EnvironmentServiceImpl implements 
EnvironmentService {
 
        private List<UserResourceInfo> getProjectEnv(ProjectDTO projectDTO, 
List<UserInstanceDTO> allInstances) {
                final Stream<UserResourceInfo> userResources = 
allInstances.stream()
-                               .filter(instance -> 
instance.getProject().equals(projectDTO.getName())).map(this::toUserResourceInfo);
+                               .filter(instance -> 
instance.getProject().equals(projectDTO.getName()))
+                               .map(this::toUserResourceInfo);
+
+               Stream<UserResourceInfo> odahuResources = 
projectDTO.getOdahu().stream()
+                               .map(this::toUserResourceInfo);
+
                if (projectDTO.getEndpoints() != null) {
                        final Stream<UserResourceInfo> edges = 
projectDTO.getEndpoints()
                                        .stream()
@@ -224,7 +236,7 @@ public class EnvironmentServiceImpl implements 
EnvironmentService {
                                                        
.withResourceStatus(e.getStatus().toString())
                                                        
.withProject(projectDTO.getName())
                                                        .withIp(e.getEdgeInfo() 
!= null ? e.getEdgeInfo().getPublicIp() : null));
-                       return Stream.concat(edges, userResources)
+                       return Stream.concat(edges, 
Stream.concat(odahuResources, userResources))
                                        .collect(toList());
                } else {
                        return userResources.collect(toList());
@@ -241,6 +253,14 @@ public class EnvironmentServiceImpl implements 
EnvironmentService {
                                .withProject(userInstance.getProject());
        }
 
+       private UserResourceInfo toUserResourceInfo(OdahuDTO odahuDTO) {
+               return new UserResourceInfo()
+                               .withResourceType(ResourceEnum.ODAHU)
+                               .withResourceName(odahuDTO.getName())
+                               
.withResourceStatus(odahuDTO.getStatus().toString())
+                               .withProject(odahuDTO.getProject());
+       }
+
        private void checkProjectResourceConditions(String project, String 
action) {
                final List<UserInstanceDTO> userInstances = exploratoryDAO
                                .fetchProjectExploratoriesWhereStatusIn(project,
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
index 751d399..651d2ea 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
@@ -36,12 +36,10 @@ import com.epam.dlab.exceptions.DlabException;
 import com.google.inject.Inject;
 import com.jcabi.manifests.Manifests;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
 
 @Slf4j
 public abstract class InfrastructureInfoServiceBase<T> implements 
InfrastructureInfoService {
@@ -68,26 +66,12 @@ public abstract class InfrastructureInfoServiceBase<T> 
implements Infrastructure
        }
 
        @Override
-       public List<ProjectInfrastructureInfo> getUserResources(String user) {
+       public List<ProjectInfrastructureInfo> getUserResources(UserInfo user) {
                log.debug("Loading list of provisioned resources for user {}", 
user);
                try {
-                       Iterable<Document> documents = 
expDAO.findExploratory(user);
-
-                       return StreamSupport.stream(documents.spliterator(),
-                                       false)
-                                       .collect(Collectors.groupingBy(d -> 
d.getString("project")))
-                                       .entrySet()
-                                       .stream()
-                                       .map(e -> {
-
-                                               final Map<String, Map<String, 
String>> projectEdges =
-                                                               
projectService.get(e.getKey()).getEndpoints().stream()
-                                                                               
.collect(Collectors.toMap(ProjectEndpointDTO::getName,
-                                                                               
                endpointDTO -> getSharedInfo(endpointDTO.getEdgeInfo())));
-                                               return new 
ProjectInfrastructureInfo(e.getKey(),
-                                                               
billingDAO.getBillingProjectQuoteUsed(e.getKey()),
-                                                               projectEdges, 
e.getValue());
-                                       })
+                       return projectService.getUserProjects(user, 
false).stream()
+                                       .map(p -> new 
ProjectInfrastructureInfo(p.getName(), 
billingDAO.getBillingProjectQuoteUsed(p.getName()),
+                                                       
getSharedInfo(p.getName()), expDAO.findExploratory(user.getName()), 
p.getOdahu()))
                                        .collect(Collectors.toList());
                } catch (Exception e) {
                        log.error("Could not load list of provisioned resources 
for user: {}", user, e);
@@ -124,5 +108,11 @@ public abstract class InfrastructureInfoServiceBase<T> 
implements Infrastructure
                                .build();
        }
 
+       private Map<String, Map<String, String>> getSharedInfo(String name) {
+               return projectService.get(name).getEndpoints().stream()
+                               
.collect(Collectors.toMap(ProjectEndpointDTO::getName,
+                                               endpointDTO -> 
getSharedInfo(endpointDTO.getEdgeInfo())));
+       }
+
        protected abstract Map<String, String> getSharedInfo(T sharedInfo);
 }
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java
index b92335e..e31b1ed 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java
@@ -37,7 +37,16 @@ import javax.ws.rs.core.Response;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.refEq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class InfrastructureInfoResourceTest extends TestBase {
 
@@ -159,7 +168,7 @@ public class InfrastructureInfoResourceTest extends 
TestBase {
        @Test
        public void getUserResourcesWithException() {
                doThrow(new DlabException("Could not load list of provisioned 
resources for user"))
-                               
.when(infrastructureInfoService).getUserResources(anyString());
+                               
.when(infrastructureInfoService).getUserResources(any(UserInfo.class));
                final Response response = resources.getJerseyTest()
                                .target("/infrastructure/info")
                                .request()
@@ -169,7 +178,7 @@ public class InfrastructureInfoResourceTest extends 
TestBase {
                assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, 
response.getStatus());
                assertEquals(MediaType.APPLICATION_JSON, 
response.getHeaderString(HttpHeaders.CONTENT_TYPE));
 
-               
verify(infrastructureInfoService).getUserResources(USER.toLowerCase());
+               
verify(infrastructureInfoService).getUserResources(any(UserInfo.class));
                verifyNoMoreInteractions(infrastructureInfoService);
        }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to