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 2b8488c  [DLAB-1511] Pass cloud provider to FE on 'Environment 
Management' page
2b8488c is described below

commit 2b8488c324cf00bde79e3e2a4f12439e7e5cd830
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Jan 31 17:22:30 2020 +0200

    [DLAB-1511] Pass cloud provider to FE on 'Environment Management' page
---
 .../java/com/epam/dlab/dto/UserInstanceDTO.java    | 13 +++++++-
 .../backendapi/resources/dto/UserResourceInfo.java |  8 +++++
 .../service/impl/EnvironmentServiceImpl.java       |  9 +++--
 .../service/impl/ExploratoryServiceImpl.java       | 29 ++++++++++++----
 .../service/impl/ExploratoryServiceImplTest.java   | 39 ++++++++++++++++++----
 5 files changed, 83 insertions(+), 15 deletions(-)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
index 5dae5ef..1950312 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
@@ -28,7 +28,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Stores info about the user notebook.
@@ -52,6 +56,8 @@ public class UserInstanceDTO {
        private String project;
        @JsonProperty("endpoint")
        private String endpoint;
+       @JsonProperty("cloud_provider")
+       private String cloudProvider;
        @JsonProperty("template_name")
        private String templateName;
        @JsonProperty
@@ -174,6 +180,11 @@ public class UserInstanceDTO {
                return this;
        }
 
+       public UserInstanceDTO withCloudProvider(String cloudProvider) {
+               setCloudProvider(cloudProvider);
+               return this;
+       }
+
        public UserInstanceDTO withTags(Map<String, String> tags) {
                setTags(tags);
                return this;
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
index 8b4eeb6..ea1198e 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java
@@ -54,6 +54,9 @@ public class UserResourceInfo {
        @JsonProperty("public_ip")
        private String ip;
 
+       @JsonProperty("cloud_provider")
+       private String cloudProvider;
+
 
        public UserResourceInfo withResourceType(ResourceEnum resourceType) {
                setResourceType(resourceType);
@@ -94,4 +97,9 @@ public class UserResourceInfo {
                setProject(project);
                return this;
        }
+
+       public UserResourceInfo withCloudProvider(String cloudProvider) {
+               setCloudProvider(cloudProvider);
+               return this;
+       }
 }
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 349dfdb..808f8ae 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
@@ -26,7 +26,11 @@ import com.epam.dlab.backendapi.dao.UserSettingsDAO;
 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.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;
@@ -204,7 +208,8 @@ public class EnvironmentServiceImpl implements 
EnvironmentService {
                                .withResourceStatus(userInstance.getStatus())
                                .withCompResources(userInstance.getResources())
                                .withUser(userInstance.getUser())
-                               .withProject(userInstance.getProject());
+                               .withProject(userInstance.getProject())
+                               
.withCloudProvider(userInstance.getCloudProvider());
        }
 
        private void checkProjectResourceConditions(String project, String 
action) {
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
index 9bce79d..1006bec 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -34,13 +34,19 @@ import com.epam.dlab.backendapi.service.ExploratoryService;
 import com.epam.dlab.backendapi.service.ProjectService;
 import com.epam.dlab.backendapi.service.TagService;
 import com.epam.dlab.backendapi.util.RequestBuilder;
+import com.epam.dlab.cloud.CloudProvider;
 import com.epam.dlab.constants.ServiceConsts;
 import com.epam.dlab.dto.StatusEnvBaseDTO;
 import com.epam.dlab.dto.UserInstanceDTO;
 import com.epam.dlab.dto.UserInstanceStatus;
 import com.epam.dlab.dto.aws.computational.ClusterConfig;
 import com.epam.dlab.dto.computational.UserComputationalResource;
-import com.epam.dlab.dto.exploratory.*;
+import com.epam.dlab.dto.exploratory.ExploratoryActionDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryGitCredsDTO;
+import 
com.epam.dlab.dto.exploratory.ExploratoryReconfigureSparkClusterActionDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryStatusDTO;
+import com.epam.dlab.dto.exploratory.LibInstallDTO;
+import com.epam.dlab.dto.exploratory.LibStatus;
 import com.epam.dlab.exceptions.DlabException;
 import com.epam.dlab.model.exploratory.Exploratory;
 import com.epam.dlab.model.library.Library;
@@ -55,8 +61,18 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static com.epam.dlab.dto.UserInstanceStatus.*;
-import static com.epam.dlab.rest.contracts.ExploratoryAPI.*;
+import static com.epam.dlab.dto.UserInstanceStatus.CREATING;
+import static com.epam.dlab.dto.UserInstanceStatus.FAILED;
+import static com.epam.dlab.dto.UserInstanceStatus.STARTING;
+import static com.epam.dlab.dto.UserInstanceStatus.STOPPED;
+import static com.epam.dlab.dto.UserInstanceStatus.STOPPING;
+import static com.epam.dlab.dto.UserInstanceStatus.TERMINATED;
+import static com.epam.dlab.dto.UserInstanceStatus.TERMINATING;
+import static com.epam.dlab.rest.contracts.ExploratoryAPI.EXPLORATORY_CREATE;
+import static 
com.epam.dlab.rest.contracts.ExploratoryAPI.EXPLORATORY_RECONFIGURE_SPARK;
+import static com.epam.dlab.rest.contracts.ExploratoryAPI.EXPLORATORY_START;
+import static com.epam.dlab.rest.contracts.ExploratoryAPI.EXPLORATORY_STOP;
+import static 
com.epam.dlab.rest.contracts.ExploratoryAPI.EXPLORATORY_TERMINATE;
 
 @Slf4j
 @Singleton
@@ -106,12 +122,12 @@ public class ExploratoryServiceImpl implements 
ExploratoryService {
                boolean isAdded = false;
                try {
                        final ProjectDTO projectDTO = 
projectService.get(project);
-                       final UserInstanceDTO userInstanceDTO = 
getUserInstanceDTO(userInfo, exploratory, project);
+                       final EndpointDTO endpointDTO = 
endpointService.get(exploratory.getEndpoint());
+                       final UserInstanceDTO userInstanceDTO = 
getUserInstanceDTO(userInfo, exploratory, project, 
endpointDTO.getCloudProvider());
                        exploratoryDAO.insertExploratory(userInstanceDTO);
                        isAdded = true;
                        final ExploratoryGitCredsDTO gitCreds = 
gitCredsDAO.findGitCreds(userInfo.getName());
                        log.debug("Created exploratory environment {} for user 
{}", exploratory.getName(), userInfo.getName());
-                       EndpointDTO endpointDTO = 
endpointService.get(userInstanceDTO.getEndpoint());
                        final String uuid =
                                        
provisioningService.post(endpointDTO.getUrl() + EXPLORATORY_CREATE,
                                                        
userInfo.getAccessToken(),
@@ -341,7 +357,7 @@ public class ExploratoryServiceImpl implements 
ExploratoryService {
                                .withStatus(status);
        }
 
-       private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, 
Exploratory exploratory, String project) {
+       private UserInstanceDTO getUserInstanceDTO(UserInfo userInfo, 
Exploratory exploratory, String project, CloudProvider cloudProvider) {
                final UserInstanceDTO userInstance = new UserInstanceDTO()
                                .withUser(userInfo.getName())
                                .withExploratoryName(exploratory.getName())
@@ -353,6 +369,7 @@ public class ExploratoryServiceImpl implements 
ExploratoryService {
                                .withShape(exploratory.getShape())
                                .withProject(project)
                                .withEndpoint(exploratory.getEndpoint())
+                               .withCloudProvider(cloudProvider.toString())
                                .withTags(tagService.getResourceTags(userInfo, 
exploratory.getEndpoint(), project,
                                                
exploratory.getExploratoryTag()));
                if (StringUtils.isNotBlank(exploratory.getImageName())) {
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java
index 5d0bdb2..e7d718d 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImplTest.java
@@ -38,7 +38,12 @@ import com.epam.dlab.dto.UserInstanceStatus;
 import com.epam.dlab.dto.aws.computational.ClusterConfig;
 import com.epam.dlab.dto.base.edge.EdgeInfo;
 import com.epam.dlab.dto.computational.UserComputationalResource;
-import com.epam.dlab.dto.exploratory.*;
+import com.epam.dlab.dto.exploratory.ExploratoryActionDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryCreateDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryGitCredsDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryGitCredsUpdateDTO;
+import 
com.epam.dlab.dto.exploratory.ExploratoryReconfigureSparkClusterActionDTO;
+import com.epam.dlab.dto.exploratory.ExploratoryStatusDTO;
 import com.epam.dlab.exceptions.DlabException;
 import com.epam.dlab.exceptions.ResourceNotFoundException;
 import com.epam.dlab.model.exploratory.Exploratory;
@@ -60,7 +65,22 @@ import java.util.Optional;
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyListOf;
+import static org.mockito.Mockito.anyMapOf;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.anyVararg;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+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;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ExploratoryServiceImplTest {
@@ -276,7 +296,7 @@ public class ExploratoryServiceImplTest {
                when(gitCredsDAO.findGitCreds(anyString())).thenReturn(egcDto);
 
                ExploratoryCreateDTO ecDto = new ExploratoryCreateDTO();
-               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).build();
+               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).endpoint("test").build();
                when(requestBuilder.newExploratoryCreate(any(ProjectDTO.class), 
any(EndpointDTO.class),
                                any(Exploratory.class), any(UserInfo.class), 
any(ExploratoryGitCredsDTO.class), anyMapOf(String.class, 
String.class))).thenReturn(ecDto);
                String exploratoryCreate = "exploratory/create";
@@ -301,6 +321,7 @@ public class ExploratoryServiceImplTest {
 
        @Test
        public void createWhenMethodInsertExploratoryThrowsException() {
+               
when(endpointService.get(anyString())).thenReturn(endpointDTO());
                doThrow(new RuntimeException("Exploratory for user with name 
not found"))
                                
.when(exploratoryDAO).insertExploratory(any(UserInstanceDTO.class));
                expectedException.expect(DlabException.class);
@@ -309,12 +330,14 @@ public class ExploratoryServiceImplTest {
 
                Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).build();
                exploratoryService.create(userInfo, exploratory, "project");
+               verify(endpointService).get(anyString());
        }
 
        @Test
        public void 
createWhenMethodInsertExploratoryThrowsExceptionWithItsCatching() {
+               
when(endpointService.get(anyString())).thenReturn(endpointDTO());
                doThrow(new 
RuntimeException()).when(exploratoryDAO).insertExploratory(any(UserInstanceDTO.class));
-               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).build();
+               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).endpoint("test").build();
                try {
                        exploratoryService.create(userInfo, exploratory, 
"project");
                } catch (DlabException e) {
@@ -325,6 +348,7 @@ public class ExploratoryServiceImplTest {
                userInstance.withResources(Collections.emptyList());
                verify(exploratoryDAO).insertExploratory(userInstance);
                verify(exploratoryDAO, 
never()).updateExploratoryStatus(any(StatusEnvBaseDTO.class));
+               verify(endpointService).get("test");
                verifyNoMoreInteractions(exploratoryDAO);
        }
 
@@ -337,7 +361,7 @@ public class ExploratoryServiceImplTest {
                ExploratoryGitCredsDTO egcDto = new ExploratoryGitCredsDTO();
                when(gitCredsDAO.findGitCreds(anyString())).thenReturn(egcDto);
 
-               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).build();
+               Exploratory exploratory = 
Exploratory.builder().name(EXPLORATORY_NAME).endpoint("test").build();
 
                doThrow(new DlabException("Cannot create instance of resource 
class ")).when(requestBuilder)
                                .newExploratoryCreate(any(ProjectDTO.class), 
any(EndpointDTO.class), any(Exploratory.class),
@@ -357,6 +381,7 @@ public class ExploratoryServiceImplTest {
                userInstance.withResources(Collections.emptyList());
                verify(projectService).get("project");
                verify(exploratoryDAO).insertExploratory(userInstance);
+               verify(exploratoryDAO).insertExploratory(userInstance);
                verify(gitCredsDAO).findGitCreds(USER);
                verify(requestBuilder).newExploratoryCreate(projectDTO, 
endpointDTO(), exploratory, userInfo, egcDto, Collections.emptyMap());
                
verify(exploratoryDAO).updateExploratoryStatus(refEq(statusEnvBaseDTO, "self"));
@@ -580,7 +605,9 @@ public class ExploratoryServiceImplTest {
                return new 
UserInstanceDTO().withUser(USER).withExploratoryName(EXPLORATORY_NAME).withStatus("running")
                                .withResources(singletonList(compResource))
                                .withTags(Collections.emptyMap())
-                               .withProject("project");
+                               .withProject("project")
+                               .withEndpoint("test")
+                               
.withCloudProvider(CloudProvider.AWS.toString());
        }
 
        private StatusEnvBaseDTO getStatusEnvBaseDTOWithStatus(String status) {


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

Reply via email to