This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0947ed175cea7a99defeda6afcc199c730f166af
Merge: 6315946 b0d6fee
Author: Dyoma33 <demian.mysakove...@gmail.com>
AuthorDate: Wed Aug 14 16:38:40 2019 +0300
Merge branch 'develop' into DLAB-433
# Conflicts:
# infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py
# infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
README.md | 583 +-
infrastructure-provisioning/scripts/deploy_dlab.py | 19 +-
.../src/base/scripts/install_user_key.py | 5 +-
.../scripts/configure_deep_learning_node.py | 3 +-
infrastructure-provisioning/src/edge/fabfile.py | 145 +-
.../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/stop.py | 4 +-
.../src/general/api/terminate.py | 4 +-
.../src/general/api/terminate_image.py | 4 +-
.../src/general/conf/dlab.ini | 2 +-
.../src/general/files/aws/base_Dockerfile | 3 +-
.../src/general/files/aws/edge_description.json | 4 +-
.../project_Dockerfile} | 16 +-
.../src/general/files/aws/project_description.json | 4 +
.../src/general/files/azure/base_Dockerfile | 4 +-
.../project_Dockerfile} | 15 +-
.../general/files/azure/project_description.json | 4 +
.../src/general/files/gcp/base_Dockerfile | 3 +-
...ensor-rstudio_Dockerfile => project_Dockerfile} | 17 +-
.../src/general/files/gcp/project_description.json | 4 +
.../general/files/gcp/tensor-rstudio_Dockerfile | 3 +
.../src/general/lib/aws/actions_lib.py | 25 +-
.../src/general/lib/azure/actions_lib.py | 8 +-
.../src/general/lib/gcp/actions_lib.py | 29 +
.../src/general/lib/gcp/meta_lib.py | 20 +
.../src/general/lib/os/debian/edge_lib.py | 6 +-
.../src/general/lib/os/debian/ssn_lib.py | 4 +-
.../src/general/lib/os/fab.py | 8 +-
.../src/general/lib/os/redhat/edge_lib.py | 6 +-
.../src/general/lib/os/redhat/ssn_lib.py | 4 +-
.../scripts/aws/common_create_notebook_image.py | 16 +-
.../scripts/aws/common_download_git_certfile.py | 4 +-
...common_notebook_configure_dataengine-service.py | 11 +-
.../aws/common_notebook_configure_dataengine.py | 9 +-
.../general/scripts/aws/common_prepare_notebook.py | 42 +-
.../general/scripts/aws/common_start_notebook.py | 5 +-
.../general/scripts/aws/common_stop_notebook.py | 7 +-
.../scripts/aws/common_terminate_notebook.py | 7 +-
.../scripts/aws/dataengine-service_configure.py | 19 +-
.../scripts/aws/dataengine-service_create.py | 23 +-
.../scripts/aws/dataengine-service_install_libs.py | 2 +-
.../scripts/aws/dataengine-service_list_libs.py | 2 +-
.../scripts/aws/dataengine-service_prepare.py | 30 +-
.../scripts/aws/dataengine-service_terminate.py | 7 +-
.../general/scripts/aws/dataengine_configure.py | 62 +-
.../src/general/scripts/aws/dataengine_prepare.py | 46 +-
.../src/general/scripts/aws/dataengine_start.py | 11 +-
.../src/general/scripts/aws/dataengine_stop.py | 11 +-
.../general/scripts/aws/dataengine_terminate.py | 11 +-
.../general/scripts/aws/deeplearning_configure.py | 30 +-
.../scripts/aws/edge_associate_elastic_ip.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 68 +-
.../src/general/scripts/aws/edge_prepare.py | 573 --
.../src/general/scripts/aws/edge_start.py | 7 +-
.../src/general/scripts/aws/edge_stop.py | 7 +-
.../src/general/scripts/aws/jupyter_configure.py | 32 +-
.../jupyter_dataengine-service_create_configs.py | 4 +-
.../jupyter_install_dataengine-service_kernels.py | 4 +-
.../src/general/scripts/aws/project_prepare.py | 610 ++
.../{edge_terminate.py => project_terminate.py} | 61 +-
.../src/general/scripts/aws/rstudio_configure.py | 30 +-
.../rstudio_dataengine-service_create_configs.py | 2 +-
.../rstudio_install_dataengine-service_kernels.py | 4 +-
.../src/general/scripts/aws/ssn_configure.py | 10 +-
.../src/general/scripts/aws/ssn_prepare.py | 5 +-
.../src/general/scripts/aws/ssn_terminate.py | 3 +-
.../scripts/aws/tensor-rstudio_configure.py | 32 +-
.../src/general/scripts/aws/tensor_configure.py | 32 +-
.../src/general/scripts/aws/zeppelin_configure.py | 30 +-
.../zeppelin_dataengine-service_create_configs.py | 6 +-
.../zeppelin_install_dataengine-service_kernels.py | 6 +-
.../scripts/azure/common_create_instance.py | 4 +-
.../scripts/azure/common_create_notebook_image.py | 10 +-
.../azure/common_notebook_configure_dataengine.py | 7 +-
.../scripts/azure/common_prepare_notebook.py | 33 +-
.../general/scripts/azure/common_start_notebook.py | 2 +-
.../general/scripts/azure/common_stop_notebook.py | 2 +-
.../scripts/azure/common_terminate_notebook.py | 2 +-
.../general/scripts/azure/dataengine_configure.py | 19 +-
.../general/scripts/azure/dataengine_prepare.py | 28 +-
.../src/general/scripts/azure/dataengine_start.py | 5 +-
.../src/general/scripts/azure/dataengine_stop.py | 5 +-
.../general/scripts/azure/dataengine_terminate.py | 5 +-
.../scripts/azure/deeplearning_configure.py | 21 +-
.../src/general/scripts/azure/edge_configure.py | 30 +-
.../src/general/scripts/azure/edge_prepare.py | 2 +-
.../src/general/scripts/azure/edge_start.py | 3 +-
.../src/general/scripts/azure/edge_stop.py | 6 +-
.../src/general/scripts/azure/edge_terminate.py | 26 +-
.../src/general/scripts/azure/jupyter_configure.py | 21 +-
.../azure/{edge_prepare.py => project_prepare.py} | 351 +-
.../{edge_terminate.py => project_terminate.py} | 43 +-
.../src/general/scripts/azure/rstudio_configure.py | 19 +-
.../src/general/scripts/azure/ssn_configure.py | 1 +
.../src/general/scripts/azure/tensor_configure.py | 21 +-
.../general/scripts/azure/zeppelin_configure.py | 19 +-
.../scripts/gcp/common_create_service_account.py | 6 +-
...common_notebook_configure_dataengine-service.py | 15 +-
.../gcp/common_notebook_configure_dataengine.py | 9 +-
.../general/scripts/gcp/common_prepare_notebook.py | 24 +-
.../general/scripts/gcp/common_start_notebook.py | 2 +-
.../general/scripts/gcp/common_stop_notebook.py | 11 +-
.../scripts/gcp/common_terminate_notebook.py | 7 +-
.../scripts/gcp/dataengine-service_configure.py | 15 +-
.../scripts/gcp/dataengine-service_create.py | 2 +-
.../scripts/gcp/dataengine-service_install_libs.py | 2 +-
.../scripts/gcp/dataengine-service_list_libs.py | 2 +-
.../scripts/gcp/dataengine-service_prepare.py | 21 +-
.../scripts/gcp/dataengine-service_terminate.py | 7 +-
.../general/scripts/gcp/dataengine_configure.py | 17 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 19 +-
.../src/general/scripts/gcp/dataengine_start.py | 5 +-
.../src/general/scripts/gcp/dataengine_stop.py | 5 +-
.../general/scripts/gcp/dataengine_terminate.py | 5 +-
.../general/scripts/gcp/deeplearning_configure.py | 16 +-
.../src/general/scripts/gcp/edge_configure.py | 30 +-
.../general/scripts/gcp/edge_create_static_ip.py | 2 +-
.../src/general/scripts/gcp/edge_prepare.py | 467 --
.../src/general/scripts/gcp/edge_start.py | 8 +-
.../src/general/scripts/gcp/edge_stop.py | 6 +-
.../src/general/scripts/gcp/jupyter_configure.py | 16 +-
.../jupyter_install_dataengine-service_kernels.py | 9 +-
.../src/general/scripts/gcp/project_prepare.py | 475 ++
.../src/general/scripts/gcp/project_terminate.py | 161 +
.../src/general/scripts/gcp/rstudio_configure.py | 15 +-
.../rstudio_install_dataengine-service_kernels.py | 7 +-
.../src/general/scripts/gcp/ssn_configure.py | 1 +
.../scripts/gcp/tensor-rstudio_configure.py | 15 +-
.../src/general/scripts/gcp/tensor_configure.py | 15 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 16 +-
.../zeppelin_install_dataengine-service_kernels.py | 7 +-
.../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 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 3 +-
.../fabfile.py} | 59 +-
.../scripts/configure_http_proxy.py} | 36 +-
.../scripts/configure_nginx_reverse_proxy.py | 5 +-
.../scripts/reupload_ssh_key.py} | 44 +-
.../templates/conf.d/proxy.conf} | 24 +-
.../templates/locations/dataengine-service.conf | 0
.../templates/locations/jupyter.conf} | 27 +-
.../templates/locations/rstudio.conf} | 26 +-
.../src/project/templates/locations/spark.conf | 123 +
.../templates/locations/tensor.conf} | 29 +-
.../templates/locations/ungit.conf} | 27 +-
.../templates/locations/zeppelin.conf} | 26 +-
.../src/{edge => project}/templates/nginx.conf | 2 +-
.../src/project/templates/nginx_debian | 216 +
.../src/project/templates/nginx_redhat | 128 +
.../src/project/templates/squid.conf | 62 +
.../src/rstudio/scripts/configure_rstudio_node.py | 3 +-
.../src/ssn/files/aws/mongo_roles.json | 4 +-
.../src/ssn/files/azure/mongo_roles.json | 4 +-
.../src/ssn/files/gcp/mongo_roles.json | 4 +-
.../src/ssn/scripts/configure_billing.py | 5 +-
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/nginx_proxy.conf | 3 +-
.../scripts/configure_tensor-rstudio_node.py | 3 +-
infrastructure-provisioning/src/tensor/fabfile.py | 24 +-
.../src/tensor/scripts/configure_tensor_node.py | 3 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 3 +-
integration-tests-cucumber/pom.xml | 114 +
.../main/java/org/apache/dlab/dto/EndpointDTO.java | 19 +
.../java/org/apache/dlab/mongo/MongoDBHelper.java | 14 +
.../java/org/apache/dlab/util/JacksonMapper.java | 16 +
.../java/org/apache/dlab/util/PropertyHelper.java | 23 +
.../src/test/java/dlab/Constants.java | 5 +
.../src/test/java/dlab/RunCucumberTest.java | 10 +
.../src/test/java/dlab/endpoint/EndpointSteps.java | 97 +
.../src/test/java/dlab/login/LoginSteps.java | 44 +
.../src/test/resources/config.properties | 2 +
.../src/test/resources/dlab/endpoint.feature | 57 +
.../src/test/resources/dlab/login.feature | 12 +
services/billing-aws/billing.yml | 2 +-
.../com/epam/dlab/module/aws/AdapterS3File.java | 93 +-
.../java/com/epam/dlab/module/aws/S3FileList.java | 2 +-
.../com/epam/dlab/mongo/DlabResourceTypeDAO.java | 82 +-
.../java/com/epam/dlab/mongo/MongoConstants.java | 42 +-
.../java/com/epam/dlab/mongo/ResourceItem.java | 98 +-
.../java/com/epam/dlab/mongo/ResourceItemList.java | 90 +-
.../com/epam/dlab/module/aws/S3FileListTest.java | 18 +-
.../com/epam/dlab/mongo/ResourceItemListTest.java | 4 +-
.../java/com/epam/dlab/dto/UserInstanceDTO.java | 26 +-
.../computational/AwsComputationalResource.java | 5 +-
.../dto/base/computational/ComputationalBase.java | 29 +
.../java/com/epam/dlab/dto/base/edge/EdgeInfo.java | 32 +-
.../epam/dlab/dto/base/project/ProjectResult.java | 16 +
.../SparkStandaloneClusterResource.java | 5 +-
.../computational/UserComputationalResource.java | 5 +-
.../dlab/dto/exploratory/ExploratoryBaseDTO.java | 71 +-
.../dlab/dto/exploratory/ExploratoryCreateDTO.java | 23 +
.../dlab/dto/exploratory/ExploratoryImageDTO.java | 17 +
.../computational/GcpComputationalResource.java | 6 +-
.../epam/dlab/dto/project/ProjectActionDTO.java | 15 +
.../epam/dlab/dto/project/ProjectCreateDTO.java | 18 +
.../java/com/epam/dlab/dto/status/EnvResource.java | 5 +-
.../epam/dlab/model/exploratory/Exploratory.java | 3 +
.../src/main/java/com/epam/dlab/auth/UserInfo.java | 6 +-
.../rest/mappers/ValidationExceptionMapper.java | 2 +-
services/provisioning-service/provisioning.yml | 6 +-
.../backendapi/ProvisioningServiceApplication.java | 1 +
.../core/commands/CommandExecutorMockAsync.java | 4 +-
.../backendapi/core/commands/DockerCommands.java | 1 +
.../response/handlers/ProjectCallbackHandler.java | 50 +
.../dlab/backendapi/modules/ProductionModule.java | 5 +-
.../backendapi/modules/ProvisioningDevModule.java | 3 +
.../dlab/backendapi/resources/ProjectResource.java | 57 +
.../dlab/backendapi/service/ProjectService.java | 16 +
.../service/impl/ProjectServiceImpl.java | 100 +
.../resources/mock_response/aws/edge_create.json | 75 +-
.../mock_response/aws/project_create.json | 57 +
.../mock_response/aws/project_terminate.json | 12 +
.../mock_response/gcp/notebook_create.json | 1 +
.../mock_response/gcp/project_create.json | 57 +
.../mock_response/gcp/project_terminate.json | 12 +
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 2 +-
.../service/impl/LdapAuthenticationService.java | 2 +-
services/self-service/pom.xml | 16 +
services/self-service/self-service.yml | 11 +-
.../dlab/backendapi/SelfServiceApplication.java | 38 +-
.../epam/dlab/backendapi/annotation/Project.java | 12 +
.../auth/SelfServiceSecurityAuthorizer.java | 2 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 23 +
.../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 4 +-
.../com/epam/dlab/backendapi/dao/BillingDAO.java | 5 +
.../com/epam/dlab/backendapi/dao/EndpointDAO.java | 15 +
.../epam/dlab/backendapi/dao/EndpointDAOImpl.java | 38 +
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 39 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 30 +
.../backendapi/dao/ImageExploratoryDaoImpl.java | 2 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 36 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 110 +
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 18 +-
.../com/epam/dlab/backendapi/dao/UserGroupDao.java | 2 +
.../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 9 +
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 303 +-
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 2 +-
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 15 +
.../epam/dlab/backendapi/domain/EndpointDTO.java | 16 +
.../epam/dlab/backendapi/domain/ProjectDTO.java | 83 +
.../backendapi/domain/UpdateProjectBudgetDTO.java | 15 +
.../dlab/backendapi/domain/UpdateProjectDTO.java | 19 +
.../interceptor/BudgetLimitInterceptor.java | 17 +-
.../epam/dlab/backendapi/modules/DevModule.java | 5 +
.../dlab/backendapi/modules/ProductionModule.java | 5 +
.../backendapi/resources/EndpointResource.java | 108 +
.../backendapi/resources/ExploratoryResource.java | 12 +-
.../resources/InfrastructureInfoResource.java | 7 +-
.../resources/InfrastructureTemplateResource.java | 19 +-
.../dlab/backendapi/resources/ProjectResource.java | 217 +
.../resources/aws/ComputationalResourceAws.java | 38 +-
.../azure/ComputationalResourceAzure.java | 14 +-
.../resources/callback/ProjectCallback.java | 57 +
.../resources/dto/ComputationalCreateFormDTO.java | 6 +
.../resources/dto/ExploratoryCreateFormDTO.java | 30 +
.../resources/dto/HealthStatusPageDTO.java | 11 +
.../resources/dto/ProjectActionFormDTO.java | 10 +
...ureInfo.java => ProjectInfrastructureInfo.java} | 14 +-
.../backendapi/resources/dto/UserResourceInfo.java | 7 +
.../resources/gcp/ComputationalResourceGcp.java | 18 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 33 +-
.../schedulers/CheckProjectQuoteScheduler.java | 52 +
.../backendapi/service/ComputationalService.java | 6 +-
.../epam/dlab/backendapi/service/EdgeService.java | 2 +
.../dlab/backendapi/service/EndpointService.java | 14 +
.../backendapi/service/EnvironmentService.java | 2 +
.../backendapi/service/ExploratoryService.java | 5 +-
.../service/InfrastructureInfoService.java | 9 +-
.../service/InfrastructureTemplateService.java | 4 +-
.../dlab/backendapi/service/ProjectService.java | 33 +
.../epam/dlab/backendapi/service/TagService.java | 9 +
.../dlab/backendapi/service/TagServiceImpl.java | 23 +
.../service/impl/ComputationalServiceImpl.java | 38 +-
.../backendapi/service/impl/EdgeServiceImpl.java | 8 +
.../service/impl/EndpointServiceImpl.java | 44 +
.../service/impl/EnvironmentServiceImpl.java | 66 +-
.../service/impl/ExploratoryServiceImpl.java | 28 +-
.../impl/InfrastructureInfoServiceBase.java | 29 +-
.../impl/InfrastructureTemplateServiceBase.java | 35 +-
.../service/impl/ProjectServiceImpl.java | 169 +
.../service/impl/SchedulerJobServiceImpl.java | 4 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 77 +-
.../src/main/resources/webapp/angular.json | 16 +-
.../src/main/resources/webapp/package-lock.json | 7718 ++++++++------------
.../src/main/resources/webapp/package.json | 28 +-
.../app/access-denied/access-denied.component.scss | 5 -
.../administration.module.ts} | 15 +-
.../backup-dilog/backup-dilog.component.html | 17 +-
.../backup-dilog/backup-dilog.component.scss | 0
.../backup-dilog/backup-dilog.component.ts | 55 +-
.../management/endpoints/endpoints.component.html | 139 +
.../management/endpoints/endpoints.component.scss | 71 +
.../management/endpoints/endpoints.component.ts | 92 +
.../app/{ => administration}/management/index.ts | 56 +-
.../manage-environment-dilog.component.html | 95 +
.../manage-environment-dilog.component.scss | 24 +-
.../manage-environment-dilog.component.ts | 58 +-
.../management/management-data.service.ts} | 25 +-
.../management-grid/management-grid.component.html | 130 +
.../management-grid/management-grid.component.scss | 13 +
.../management-grid/management-grid.component.ts | 96 +-
.../management/management.component.html | 45 +
.../management/management.component.scss | 0
.../management/management.component.ts | 174 +
.../management/management.model.ts | 25 +-
.../ssn-monitor/ssn-monitor.component.html | 53 +-
.../ssn-monitor/ssn-monitor.component.scss | 1 +
.../ssn-monitor/ssn-monitor.component.ts | 33 +-
.../scheduler => administration/project}/index.ts | 25 +-
.../project/project-data.service.ts} | 26 +-
.../project-form/project-form.component.html | 172 +
.../project-form/project-form.component.scss} | 48 +-
.../project/project-form/project-form.component.ts | 185 +
.../project-list/project-list.component.html | 83 +
.../project-list/project-list.component.scss} | 52 +-
.../project/project-list/project-list.component.ts | 72 +
.../project/project.component.html} | 35 +-
.../administration/project/project.component.ts | 145 +
.../roles}/group-name-validarion.directive.ts | 0
.../scheduler => administration/roles}/index.ts | 20 +-
.../app/administration/roles/roles.component.html | 173 +
.../roles/roles.component.scss} | 96 +-
.../roles/roles.component.ts} | 146 +-
.../resources/webapp/src/app/app.component.html | 1 -
.../main/resources/webapp/src/app/app.module.ts | 25 +-
.../resources/webapp/src/app/app.routing.module.ts | 97 +-
.../resources/webapp/src/app/core/core.module.ts | 15 +-
.../models/computationalResourceImage.model.ts | 6 +-
.../{cloudProvider.guard.ts => admin.quard.ts} | 4 +-
.../services/applicationServiceFacade.service.ts | 175 +-
.../src/app/core/services/cloudProvider.guard.ts | 2 +-
.../src/app/core/services/endpoint.service.ts | 59 +
.../src/app/core/services/healthStatus.service.ts | 66 +-
.../webapp/src/app/core/services/index.ts | 3 +
.../src/app/core/services/project.service.ts | 89 +
.../src/app/core/services/userResource.service.ts | 14 +-
.../webapp/src/app/core/util/checkUtils.ts | 10 +-
.../resources/webapp/src/app/core/util/index.ts | 3 +-
.../util/patterns.ts} | 13 +-
.../app/core/util/{sortUtil.ts => sortUtils.ts} | 2 +-
.../layout.component.html} | 1 -
.../layout.component.ts} | 14 +-
.../index.ts => layout/layout.module.ts} | 15 +-
.../webapp/src/app/login/login.component.ts | 10 +-
.../manage-environment-dilog.component.html | 73 -
.../manage-roles-groups.component.html | 154 -
.../management-grid/management-grid.component.html | 161 -
.../src/app/management/management.component.html | 55 -
.../src/app/management/management.component.ts | 275 -
.../reporting-grid/reporting-grid.component.html | 190 +-
.../reporting-grid/reporting-grid.component.scss | 45 +-
.../reporting-grid/reporting-grid.component.ts | 24 +-
.../src/app/reporting/reporting.component.ts | 37 +-
.../webapp/src/app/reporting/reporting.module.ts | 6 -
.../app/reporting/toolbar/toolbar.component.css | 1 -
.../app/reporting/toolbar/toolbar.component.html | 3 +-
.../cluster-details/cluster-details.component.html | 14 +-
.../cluster-details/cluster-details.component.scss | 10 +
.../cluster-details/cluster-details.component.ts | 35 +-
.../computational/cluster-details/index.ts | 4 +-
...utational-resource-create-dialog.component.html | 234 +-
...utational-resource-create-dialog.component.scss | 10 +-
...mputational-resource-create-dialog.component.ts | 294 +-
.../computational-resource-create.model.ts | 208 +-
.../computational-resource-create-dialog/index.ts | 8 +-
.../computational-resources-list.component.html | 69 +-
.../computational-resources-list.component.ts | 45 +-
.../computational-resources-list/index.ts | 2 -
.../ami-create-dialog.component.html | 17 +-
.../ami-create-dialog.component.ts | 28 +-
.../exploratory/ami-create-dialog/index.ts | 3 +-
.../cost-details-dialog.component.html | 12 +-
.../cost-details-dialog.component.scss | 0
.../cost-details-dialog.component.ts | 26 +-
.../cost-details-dialog/index.ts | 4 +-
.../create-environment.component.html | 180 +
.../create-environment.component.scss | 20 +
.../create-environment.component.ts | 142 +
.../index.ts | 18 +-
.../detail-dialog/detail-dialog.component.html | 16 +-
.../detail-dialog/detail-dialog.component.ts | 39 +-
.../resources/exploratory/detail-dialog/index.ts | 3 +-
...ratory-environment-create-dialog.component.html | 93 -
...loratory-environment-create-dialog.component.ts | 195 -
.../exploratory-environment-create.model.ts | 157 -
.../exploratory/install-libraries/index.ts | 6 +-
.../install-libraries.component.html | 18 +-
.../install-libraries.component.ts | 104 +-
.../manage-ungit/manage-ungit.component.html | 49 +-
.../manage-ungit/manage-ungit.component.scss | 21 +-
.../manage-ungit/manage-ungit.component.ts | 40 +-
.../src/app/resources/resources-grid/index.ts | 5 +-
.../resources-grid/resources-grid.component.html | 481 +-
...component.css => resources-grid.component.scss} | 157 +-
.../resources-grid/resources-grid.component.ts | 306 +-
.../resources-grid/resources-grid.model.ts | 56 +-
.../src/app/resources/resources.component.html | 57 +-
.../src/app/resources/resources.component.scss | 8 -
.../src/app/resources/resources.component.ts | 61 +-
.../webapp/src/app/resources/resources.module.ts | 14 +-
.../webapp/src/app/resources/scheduler/index.ts | 4 +-
.../resources/scheduler/scheduler.component.html | 15 +-
.../resources/scheduler/scheduler.component.scss | 47 +
.../app/resources/scheduler/scheduler.component.ts | 45 +-
.../shared/form-controls/dropdowns.component.scss | 38 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../confirmation-dialog.component.html | 26 +-
.../confirmation-dialog.component.ts | 45 +-
.../confirmation-dialog.model.ts | 4 +-
.../modal-dialog/confirmation-dialog/index.ts | 4 +-
.../webapp/src/app/shared/modal-dialog/index.ts | 61 -
.../shared/modal-dialog/key-upload-dialog/index.ts | 4 +-
.../key-upload-dialog.component.html | 13 +-
.../key-upload-dialog.component.ts | 38 +-
.../app/shared/modal-dialog/modal.component.html | 42 -
.../app/shared/modal-dialog/modal.component.scss | 399 -
.../src/app/shared/modal-dialog/modal.component.ts | 111 -
.../modal-dialog/notification-dialog/index.ts | 3 +-
.../notification-dialog.component.ts | 63 +-
.../shared/modal-dialog/progress-dialog/index.ts | 5 +-
.../progress-dialog/progress-dialog.component.html | 13 +-
.../progress-dialog/progress-dialog.component.ts | 18 +-
.../webapp/src/app/shared/navbar/index.ts | 3 +-
.../src/app/shared/navbar/navbar.component.html | 100 +-
.../src/app/shared/navbar/navbar.component.scss | 64 +-
.../src/app/shared/navbar/navbar.component.ts | 117 +-
.../shared/time-picker/time-picker.component.scss | 50 +-
.../webapp/src/assets/styles/_dialogs.scss | 295 +
.../webapp/src/assets/styles/_general.scss | 16 +-
.../resources/webapp/src/assets/styles/_reset.scss | 32 +-
.../resources/webapp/src/assets/styles/_theme.scss | 318 +-
.../styles/_variables.scss} | 12 +-
.../webapp/src/dictionary/aws.dictionary.ts | 3 +-
.../webapp/src/dictionary/azure.dictionary.ts | 3 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 177 +-
.../src/main/resources/webapp/src/styles.scss | 93 +-
.../resources/ExploratoryResourceTest.java | 23 +-
.../resources/InfrastructureInfoResourceTest.java | 62 +-
.../InfrastructureTemplateResourceTest.java | 36 +-
.../epam/dlab/backendapi/roles/UserRolesTest.java | 16 +-
.../service/impl/ComputationalServiceImplTest.java | 67 +-
.../service/impl/EnvironmentServiceImplTest.java | 116 +-
.../service/impl/ExploratoryServiceImplTest.java | 28 +-
.../impl/InfrastructureInfoServiceBaseTest.java | 150 -
.../InfrastructureTemplateServiceBaseTest.java | 27 +-
.../service/impl/SchedulerJobServiceImplTest.java | 12 +-
.../dlab/backendapi/util/RequestBuilderTest.java | 12 +-
467 files changed, 15591 insertions(+), 12097 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 41b400c,e4f7cf5..651afea
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@@ -215,9 -215,9 +215,10 @@@ if __name__ == "__main__"
logging.info('[CONFIGURING DOCKER AT SSN INSTANCE]')
print('[CONFIGURING DOCKER AT SSN INSTANCE]')
additional_config = [{"name": "base", "tag": "latest"},
+ {"name": "project", "tag": "latest"},
{"name": "edge", "tag": "latest"},
{"name": "jupyter", "tag": "latest"},
+ {"name": "jupyter-docker", "tag": "latest"},
{"name": "rstudio", "tag": "latest"},
{"name": "zeppelin", "tag": "latest"},
{"name": "tensor", "tag": "latest"},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
