This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a881ecc1b23502407f44a250267117fd888e20e2 Merge: 5ef0b61 d90deeb Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Tue Jun 25 17:17:54 2019 +0300 Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects .../src/base/scripts/install_user_key.py | 5 +- .../edge/scripts/configure_nginx_reverse_proxy.py | 3 +- .../{dataengine-service.conf => emr.conf} | 0 .../src/edge/templates/nginx.conf | 8 +- .../src/general/api/check_inactivity.py | 4 +- .../src/general/api/configure.py | 4 +- .../src/general/api/create.py | 4 +- .../src/general/api/create_image.py | 4 +- .../src/general/api/git_creds.py | 4 +- .../src/general/api/install_libs.py | 4 +- .../src/general/api/list_libs.py | 8 +- .../src/general/api/reconfigure_spark.py | 4 +- .../src/general/api/recreate.py | 4 +- .../src/general/api/reupload_key.py | 4 +- .../src/general/api/start.py | 4 +- .../src/general/api/status.py | 4 +- .../src/general/api/stop.py | 4 +- .../src/general/api/terminate.py | 4 +- .../src/general/api/terminate_image.py | 4 +- .../src/general/files/aws/base_Dockerfile | 3 +- .../src/general/files/aws/edge_description.json | 4 - .../aws/{edge_Dockerfile => project_Dockerfile} | 4 +- .../src/general/files/aws/project_description.json | 4 + .../src/general/lib/os/debian/edge_lib.py | 2 +- .../src/general/lib/os/redhat/edge_lib.py | 2 +- .../scripts/aws/common_create_notebook_image.py | 8 +- ...common_notebook_configure_dataengine-service.py | 8 +- .../aws/common_notebook_configure_dataengine.py | 6 +- .../general/scripts/aws/common_prepare_notebook.py | 15 +- .../general/scripts/aws/common_start_notebook.py | 2 +- .../general/scripts/aws/common_stop_notebook.py | 4 +- .../scripts/aws/common_terminate_notebook.py | 4 +- .../scripts/aws/dataengine-service_configure.py | 16 +- .../scripts/aws/dataengine-service_create.py | 18 +- .../scripts/aws/dataengine-service_install_libs.py | 2 +- .../scripts/aws/dataengine-service_list_libs.py | 2 +- .../scripts/aws/dataengine-service_prepare.py | 18 +- .../scripts/aws/dataengine-service_terminate.py | 4 +- .../general/scripts/aws/dataengine_configure.py | 16 +- .../src/general/scripts/aws/dataengine_prepare.py | 14 +- .../src/general/scripts/aws/dataengine_start.py | 6 +- .../src/general/scripts/aws/dataengine_stop.py | 6 +- .../general/scripts/aws/dataengine_terminate.py | 6 +- .../general/scripts/aws/deeplearning_configure.py | 12 +- .../scripts/aws/edge_associate_elastic_ip.py | 2 +- .../src/general/scripts/aws/edge_configure.py | 63 ++-- .../src/general/scripts/aws/edge_start.py | 4 +- .../src/general/scripts/aws/edge_status.py | 2 +- .../src/general/scripts/aws/edge_stop.py | 4 +- .../src/general/scripts/aws/jupyter_configure.py | 12 +- .../jupyter_dataengine-service_create_configs.py | 4 +- .../jupyter_install_dataengine-service_kernels.py | 4 +- .../aws/{edge_prepare.py => project_prepare.py} | 378 +++++++++++---------- .../{edge_terminate.py => project_terminate.py} | 46 +-- .../src/general/scripts/aws/rstudio_configure.py | 12 +- .../rstudio_dataengine-service_create_configs.py | 2 +- .../rstudio_install_dataengine-service_kernels.py | 4 +- .../src/general/scripts/aws/ssn_configure.py | 2 +- .../scripts/aws/tensor-rstudio_configure.py | 14 +- .../src/general/scripts/aws/tensor_configure.py | 14 +- .../src/general/scripts/aws/zeppelin_configure.py | 12 +- .../zeppelin_dataengine-service_create_configs.py | 6 +- .../zeppelin_install_dataengine-service_kernels.py | 6 +- .../general/scripts/os/common_clean_instance.py | 4 +- .../general/scripts/os/dataengine_install_libs.py | 2 +- .../src/general/scripts/os/dataengine_list_libs.py | 2 +- .../scripts/os/dataengine_reconfigure_spark.py | 2 +- .../src/general/scripts/os/notebook_git_creds.py | 2 +- .../scripts/os/notebook_inactivity_check.py | 4 +- .../general/scripts/os/notebook_install_libs.py | 2 +- .../src/general/scripts/os/notebook_list_libs.py | 2 +- .../scripts/os/notebook_reconfigure_spark.py | 2 +- .../fabfile.py} | 59 ++-- .../scripts/configure_http_proxy.py} | 36 +- .../scripts/configure_nginx_reverse_proxy.py | 20 +- .../scripts/reupload_ssh_key.py} | 44 +-- .../templates/conf.d/proxy.conf} | 20 +- .../templates/locations/dataengine-service.conf | 0 .../templates/locations/jupyter.conf} | 23 +- .../templates/locations/rstudio.conf} | 22 +- .../src/project/templates/locations/spark.conf | 123 +++++++ .../templates/locations/tensor.conf} | 25 +- .../templates/locations/ungit.conf} | 23 +- .../templates/locations/zeppelin.conf} | 22 +- .../src/{edge => project}/templates/nginx.conf | 20 +- .../src/project/templates/nginx_debian | 216 ++++++++++++ .../src/project/templates/nginx_redhat | 128 +++++++ .../src/project/templates/squid.conf | 62 ++++ infrastructure-provisioning/src/tensor/fabfile.py | 24 +- .../java/com/epam/dlab/dto/ProjectCreateDTO.java | 15 + .../dlab/dto/base/project/CreateProjectResult.java | 15 + .../dlab/dto/base/project/ProjectEdgeInfo.java | 28 ++ .../rest/mappers/ValidationExceptionMapper.java | 2 +- .../backendapi/ProvisioningServiceApplication.java | 1 + .../core/commands/CommandExecutorMockAsync.java | 4 +- .../response/handlers/ProjectCallbackHandler.java | 45 +++ .../dlab/backendapi/modules/ProductionModule.java | 5 +- .../backendapi/modules/ProvisioningDevModule.java | 3 + .../dlab/backendapi/resources/ProjectResource.java | 31 ++ .../dlab/backendapi/service/ProjectService.java | 9 + .../service/impl/ProjectServiceImpl.java | 59 ++++ .../mock_response/gcp/project_create.json | 56 +++ .../dlab/backendapi/SelfServiceApplication.java | 4 +- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 8 + .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 38 +++ .../epam/dlab/backendapi/domain/ProjectDTO.java | 12 + .../dlab/backendapi/resources/ProjectResource.java | 22 +- .../resources/callback/ProjectCallback.java | 46 +++ .../dlab/backendapi/service/ProjectService.java | 3 +- .../service/impl/ProjectServiceImpl.java | 39 ++- .../annotation/SchedulerJobDTOValid.java | 2 +- .../services/applicationServiceFacade.service.ts | 8 + .../src/app/core/services/project.service.ts | 10 +- .../create-environment.component.ts | 6 +- .../InfrastructureTemplateServiceBaseTest.java | 6 +- 115 files changed, 1587 insertions(+), 636 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org