You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/02/04 13:40:27 UTC
[incubator-dlab] 01/01: Merge branch 'DLAB-1357' into
odahu-integration
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c625c6bf4b758375468b33f97b618084ca6439f8
Merge: f3922f1 7c211ea
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Tue Feb 4 15:39:13 2020 +0200
Merge branch 'DLAB-1357' into odahu-integration
RELEASE_NOTES.md | 94 ++++-------
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../src/general/conf/dlab.ini | 14 +-
.../files/aws/dataengine-service_description.json | 4 +-
.../src/general/files/aws/jupyter_description.json | 4 +-
.../src/general/files/aws/rstudio_description.json | 4 +-
.../general/files/aws/zeppelin_description.json | 4 +-
.../general/files/azure/jupyter_description.json | 4 +-
.../general/files/azure/rstudio_description.json | 4 +-
.../general/files/azure/zeppelin_description.json | 4 +-
.../files/gcp/dataengine-service_description.json | 4 +-
.../src/general/files/gcp/jupyter_description.json | 4 +-
.../src/general/files/gcp/rstudio_description.json | 4 +-
.../general/files/gcp/zeppelin_description.json | 4 +-
.../src/general/lib/os/debian/notebook_lib.py | 2 +-
.../src/general/lib/os/debian/ssn_lib.py | 2 +-
.../src/general/lib/os/fab.py | 4 +-
.../src/general/lib/os/redhat/notebook_lib.py | 2 +-
.../scripts/aws/dataengine-service_jars_parser.py | 14 +-
.../src/general/scripts/aws/project_prepare.py | 25 +--
.../scripts/gcp/dataengine-service_jars_parser.py | 14 +-
.../src/ssn/files/aws/mongo_roles.json | 3 +-
.../src/ssn/files/azure/mongo_roles.json | 3 +-
.../src/ssn/files/gcp/mongo_roles.json | 3 +-
.../src/ssn/scripts/configure_docker.py | 9 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 1 +
.../com/epam/dlab/dto/aws/AwsCloudSettings.java | 2 -
.../aws/computational/ComputationalCreateAws.java | 15 ++
.../computational/SparkComputationalCreateAws.java | 7 +
.../epam/dlab/dto/azure/AzureCloudSettings.java | 2 -
.../SparkComputationalCreateAzure.java | 7 +
.../com/epam/dlab/dto/base/odahu/OdahuResult.java} | 32 ++--
.../dlab/dto/exploratory/ExploratoryCreateDTO.java | 15 ++
.../com/epam/dlab/dto/gcp/GcpCloudSettings.java | 2 -
.../gcp/computational/ComputationalCreateGcp.java | 15 ++
.../computational/SparkComputationalCreateGcp.java | 7 +
.../com/epam/dlab/dto/odahu/ActionOdahuDTO.java} | 30 ++--
.../com/epam/dlab/dto/odahu/CreateOdahuDTO.java} | 32 ++--
.../epam/dlab/dto/project/ProjectCreateDTO.java | 2 -
.../java/com/epam/dlab/model/ResourceEnum.java | 3 +-
services/provisioning-service/provisioning.yml | 1 -
.../epam/dlab/backendapi/CloudConfiguration.java | 1 -
.../backendapi/ProvisioningServiceApplication.java | 4 +
.../backendapi/core/commands/CommandBuilder.java | 3 -
.../core/commands/CommandExecutorMockAsync.java | 2 +-
.../response/handlers/OdahuCallbackHandler.java | 85 ++++++++++
.../healthcheck/ProvisioningHealthCheck.java} | 27 ++--
.../dlab/backendapi/modules/ProductionModule.java | 3 +
.../backendapi/modules/ProvisioningDevModule.java | 6 +-
.../dlab/backendapi/resources/OdahuResource.java | 70 +++++++++
.../ProvisioningHealthCheckResource.java} | 32 ++--
.../dlab/backendapi/service/OdahuService.java} | 15 +-
.../backendapi/service/impl/OdahuServiceImpl.java | 115 ++++++++++++++
.../resources/mock_response/gcp/odahu_create.json | 19 +++
.../resources/mock_response/gcp/odahu_start.json | 9 ++
.../resources/mock_response/gcp/odahu_stop.json | 9 ++
.../mock_response/gcp/odahu_terminate.json | 9 ++
services/self-service/self-service.yml | 3 +
.../dlab/backendapi/SelfServiceApplication.java | 2 +
.../com/epam/dlab/backendapi/dao/EndpointDAO.java | 24 +++
.../epam/dlab/backendapi/dao/EndpointDAOImpl.java | 39 ++++-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 59 ++++++-
.../OdahuDAO.java} | 22 +--
.../com/epam/dlab/backendapi/dao/OdahuDAOImpl.java | 124 +++++++++++++++
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +
.../dlab/backendapi/domain/CreateProjectDTO.java | 3 +
.../epam/dlab/backendapi/domain/EndpointDTO.java | 31 +++-
.../backendapi/domain/EndpointResourcesDTO.java} | 25 ++-
.../dlab/backendapi/domain/OdahuActionDTO.java} | 28 ++--
.../OdahuCreateDTO.java} | 31 ++--
.../OdahuDTO.java} | 26 +--
.../epam/dlab/backendapi/domain/ProjectDTO.java | 8 +-
.../dlab/backendapi/domain/UpdateProjectDTO.java | 4 +-
.../epam/dlab/backendapi/modules/DevModule.java | 2 +
.../dlab/backendapi/modules/ProductionModule.java | 2 +
.../backendapi/resources/EndpointResource.java | 57 ++++++-
.../resources/InfrastructureInfoResource.java | 2 +-
.../dlab/backendapi/resources/OdahuResource.java | 97 ++++++++++++
.../dlab/backendapi/resources/ProjectResource.java | 21 ++-
.../resources/callback/OdahuCallback.java | 59 +++++++
.../resources/dto/ProjectActionFormDTO.java | 7 +-
.../resources/dto/ProjectInfrastructureInfo.java | 4 +
.../endpoint/CheckEndpointStatusScheduler.java | 60 +++++++
.../dlab/backendapi/service/EndpointService.java | 18 ++-
.../service/InfrastructureInfoService.java | 2 +-
...structureInfoService.java => OdahuService.java} | 26 ++-
.../dlab/backendapi/service/ProjectService.java | 10 ++
.../service/impl/ComputationalServiceImpl.java | 23 +--
.../service/impl/EndpointServiceImpl.java | 98 +++++++++++-
.../service/impl/EnvironmentServiceImpl.java | 28 +++-
.../service/impl/ExploratoryServiceImpl.java | 7 +-
.../impl/InfrastructureInfoServiceBase.java | 30 ++--
.../backendapi/service/impl/OdahuServiceImpl.java | 174 +++++++++++++++++++++
.../service/impl/ProjectServiceImpl.java | 80 +++++++---
.../epam/dlab/backendapi/util/RequestBuilder.java | 76 +++++++--
.../src/main/resources/mongo/aws/mongo_roles.json | 3 +-
.../main/resources/mongo/azure/mongo_roles.json | 3 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 3 +-
.../src/main/resources/webapp/angular.json | 8 +-
.../src/main/resources/webapp/package-lock.json | 75 ++++-----
.../src/main/resources/webapp/package.json | 5 +-
.../app/administration/administration.module.ts | 6 +-
.../create-legion-cluster.component.html | 93 +++++++++++
.../create-legion-cluster.component.scss | 7 +
.../create-legion-cluster.component.ts | 104 ++++++++++++
.../create-legion-claster}/index.ts | 25 ++-
.../{project => legion-deployment}/index.ts | 24 +--
.../legion-deployment-data.service.ts | 27 ++++
.../legion-deployment.component.html | 50 ++++++
.../legion-deployment.component.scss | 0
.../legion-deployment.component.ts | 61 ++++++++
.../legion-list/legion-list.component.html | 94 +++++++++++
.../legion-list/legion-list.component.scss | 77 +++++++++
.../legion-list/legion-list.component.ts | 48 ++++++
.../management/endpoints/endpoints.component.html | 29 +++-
.../management/endpoints/endpoints.component.scss | 12 +-
.../management/endpoints/endpoints.component.ts | 143 +++++++++++++++--
.../src/app/administration/management/index.ts | 9 +-
.../manage-environment-dilog.component.html | 24 ++-
.../manage-environment-dilog.component.scss | 7 +-
.../manage-environment-dilog.component.ts | 26 ++-
.../management-grid/management-grid.component.html | 2 +-
.../management-grid/management-grid.component.scss | 11 +-
.../management-grid/management-grid.component.ts | 12 +-
.../management/management.component.scss | 2 +-
.../webapp/src/app/administration/project/index.ts | 6 +-
.../project-form/project-form.component.html | 17 +-
.../project/project-form/project-form.component.ts | 14 +-
.../project-list/project-list.component.html | 75 +++++----
.../project-list/project-list.component.scss | 60 ++++++-
.../project/project-list/project-list.component.ts | 83 ++++++++--
.../administration/project/project.component.ts | 29 ++--
.../app/administration/roles/roles.component.ts | 13 +-
.../main/resources/webapp/src/app/app.module.ts | 2 +
.../resources/webapp/src/app/app.routing.module.ts | 11 ++
.../resources/webapp/src/app/core/core.module.ts | 2 +
.../src/app/core/directives/scrollTo.directive.ts | 2 +-
.../services/applicationServiceFacade.service.ts | 36 +++++
.../src/app/core/services/endpoint.service.ts | 16 ++
.../webapp/src/app/core/services/index.ts | 1 +
.../app/core/services/legion-deployment.service.ts | 35 +++++
.../src/app/core/services/progress-bar.service.ts | 19 +++
.../webapp/src/app/core/util/checkUtils.ts | 8 +
.../resources/webapp/src/app/core/util/patterns.ts | 5 +-
.../src/app/reporting/reporting.component.ts | 9 +-
.../app/reporting/toolbar/toolbar.component.html | 5 +-
...oolbar.component.css => toolbar.component.scss} | 115 ++++++++------
.../src/app/reporting/toolbar/toolbar.component.ts | 22 +--
.../cluster-details/cluster-details.component.html | 2 +-
.../create-environment.component.scss | 2 +-
.../detail-dialog/detail-dialog.component.html | 21 ++-
.../detail-dialog/detail-dialog.component.ts | 9 +-
.../install-libraries.component.html | 12 +-
.../install-libraries.component.scss | 34 ++--
.../install-libraries.component.ts | 11 +-
.../resources-grid/resources-grid.component.html | 33 +++-
.../resources-grid/resources-grid.component.scss | 5 +
.../resources-grid/resources-grid.component.ts | 49 ++++--
.../resources-grid/resources-grid.model.ts | 90 +++++++----
.../src/app/shared/bubble/bubble.component.css | 2 +-
.../multi-select-dropdown.component.html | 2 +-
.../webapp/src/app/shared/material.module.ts | 6 +-
.../edge-action-dialog.component.ts | 70 +++++++++
.../index.ts | 16 +-
.../modal-dialog/notification-dialog/index.ts | 3 +-
.../notification-dialog.component.ts | 173 ++++++++++++--------
.../modal-dialog/odahu-action-dialog/index.ts | 15 ++
.../odahu-action-dialog.component.ts | 43 +++++
.../webapp/src/app/shared/navbar/index.ts | 6 +-
.../src/app/shared/navbar/navbar.component.html | 63 +++++---
.../src/app/shared/navbar/navbar.component.scss | 26 ++-
.../src/app/shared/navbar/navbar.component.ts | 16 +-
.../administration.module.ts => swagger/index.ts} | 14 +-
.../webapp/src/app/swagger/swagger.component.html | 20 +++
.../swagger.component.scss} | 19 ---
.../swagger.component.ts} | 35 +++--
.../webapp/src/assets/styles/_dialogs.scss | 8 +
.../resources/webapp/src/assets/styles/_theme.scss | 12 ++
.../webapp/src/assets/styles/app-loading.scss | 5 +
.../webapp/src/assets/svg/swagger-logo.svg | 8 +
.../src/main/resources/webapp/src/styles.scss | 4 +
.../resources/InfrastructureInfoResourceTest.java | 15 +-
.../service/impl/ComputationalServiceImplTest.java | 58 +++++--
.../service/impl/EnvironmentServiceImplTest.java | 2 +-
.../service/impl/ExploratoryServiceImplTest.java | 37 +++--
.../service/impl/GitCredentialServiceImplTest.java | 2 +-
.../impl/ImageExploratoryServiceImplTest.java | 2 +-
.../InfrastructureTemplateServiceBaseTest.java | 6 +-
.../service/impl/LibraryServiceImplTest.java | 2 +-
.../service/impl/UserGroupServiceImplTest.java | 8 +-
191 files changed, 3737 insertions(+), 942 deletions(-)
diff --cc infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 44e61e3,727f97e..a489f5e
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@@ -195,12 -176,11 +198,14 @@@ if __name__ == "__main__"
if not ensure_docker_daemon(args.dlab_path, args.os_user, args.region):
sys.exit(1)
+ print("Preparing odahu image")
+ prepare_odahu_image(args.nexus_username, args.nexus_password, args.nexus_url, args.dlab_path)
+
print("Building dlab images")
- if not build_docker_images(deeper_config, args.region, args.dlab_path):
- sys.exit(1)
+ count = 0
+ while not build_docker_images(deeper_config, args.region, args.dlab_path) and count < 5:
+ count += 1
+ time.sleep(5)
print("Configuring guacamole")
if not configure_guacamole():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org