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 efa12a573e59474341eee9811226b7f3c30ed7b3
Merge: 19f1fb3 b4bfca3
Author: Dyoma33 <demian.mysakove...@gmail.com>
AuthorDate: Wed Sep 18 15:42:30 2019 +0300
Merge branch 'develop' into DLAB-433
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../files/gcp/tensor-rstudio_description.json | 34 +-
.../src/general/lib/aws/actions_lib.py | 75 ++--
.../src/general/lib/azure/actions_lib.py | 2 +-
.../src/general/lib/gcp/actions_lib.py | 31 +-
.../src/general/lib/os/debian/common_lib.py | 37 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/fab.py | 3 +
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../scripts/aws/common_create_notebook_image.py | 2 +-
.../scripts/aws/common_create_role_policy.py | 4 +-
.../scripts/aws/common_create_security_group.py | 2 +-
.../general/scripts/aws/common_prepare_notebook.py | 5 +-
.../scripts/aws/dataengine-service_create.py | 9 -
.../scripts/aws/dataengine-service_prepare.py | 10 +-
.../general/scripts/aws/deeplearning_configure.py | 16 +-
.../src/general/scripts/aws/edge_configure.py | 4 +-
.../src/general/scripts/aws/jupyter_configure.py | 12 +-
.../src/general/scripts/aws/project_prepare.py | 19 +-
.../src/general/scripts/aws/rstudio_configure.py | 12 +-
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/general/scripts/aws/ssn_prepare.py | 11 +-
.../scripts/aws/tensor-rstudio_configure.py | 18 +-
.../src/general/scripts/aws/tensor_configure.py | 16 +-
.../src/general/scripts/aws/zeppelin_configure.py | 16 +-
.../scripts/azure/common_create_notebook_image.py | 2 +-
.../scripts/azure/common_prepare_notebook.py | 15 +-
.../general/scripts/azure/dataengine_configure.py | 6 +-
.../general/scripts/azure/dataengine_prepare.py | 16 +-
.../src/general/scripts/azure/dataengine_start.py | 4 +-
.../src/general/scripts/azure/dataengine_stop.py | 4 +-
.../general/scripts/azure/dataengine_terminate.py | 4 +-
.../scripts/azure/deeplearning_configure.py | 30 +-
.../src/general/scripts/azure/edge_configure.py | 4 +-
.../src/general/scripts/azure/edge_start.py | 5 +-
.../src/general/scripts/azure/edge_stop.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 24 +-
.../src/general/scripts/azure/project_terminate.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 34 +-
.../src/general/scripts/azure/ssn_prepare.py | 4 +
.../src/general/scripts/azure/tensor_configure.py | 30 +-
.../general/scripts/azure/zeppelin_configure.py | 28 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../gcp/common_notebook_configure_dataengine.py | 4 +-
.../scripts/gcp/dataengine-service_create.py | 2 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/dataengine_start.py | 4 +-
.../src/general/scripts/gcp/dataengine_stop.py | 4 +-
.../general/scripts/gcp/dataengine_terminate.py | 4 +-
.../general/scripts/gcp/deeplearning_configure.py | 24 +-
.../src/general/scripts/gcp/edge_terminate.py | 6 +-
.../src/general/scripts/gcp/jupyter_configure.py | 18 +-
.../src/general/scripts/gcp/project_terminate.py | 10 +-
.../src/general/scripts/gcp/rstudio_configure.py | 18 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../src/general/scripts/gcp/ssn_prepare.py | 4 +
.../scripts/gcp/ssn_terminate_gcp_resources.py | 4 +-
.../scripts/gcp/tensor-rstudio_configure.py | 22 +-
.../src/general/scripts/gcp/tensor_configure.py | 22 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 18 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
pom.xml | 18 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 ++--
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../BillingApplicationConfiguration.java} | 17 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 24 +-
.../BillingDAO.java} | 10 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../Project.java} | 13 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +++
.../epam/dlab/billing/gcp/model/BillingData.java | 70 ++++
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 25 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../BillingRepository.java} | 10 +-
.../ProjectRepository.java} | 9 +-
.../UserInstanceRepository.java} | 11 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 27 +-
.../BillingService.java} | 8 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +++++
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
.../mock_response/azure/project_create.json | 57 +++
.../mock_response/azure/project_terminate.json | 12 +
.../com/epam/dlab/auth/dao/LdapUserDAOImpl.java | 2 +-
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 26 +-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../epam/dlab/backendapi/modules/DevModule.java | 19 +
.../backendapi/modules/GcpSelfServiceModule.java | 75 ++--
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/UserGroupResource.java | 1 +
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 ++++
.../com/epam/dlab/backendapi/roles/UserRoles.java | 18 +-
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../service/impl/ProjectServiceImpl.java | 3 +-
.../service/impl/UserGroupServiceImpl.java | 10 +
.../epam/dlab/backendapi/util/RequestBuilder.java | 6 +
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../project-form/project-form.component.html | 8 +-
.../project-form/project-form.component.scss | 12 +
.../project/project-form/project-form.component.ts | 4 +-
.../administration/project/project.component.ts | 7 +-
.../app/administration/roles/roles.component.scss | 6 +
.../app/administration/roles/roles.component.ts | 7 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 4 +-
.../resources/webapp/src/app/core/util/patterns.ts | 3 +-
.../reporting-grid/reporting-grid.component.html | 24 +-
.../reporting-grid/reporting-grid.component.scss | 17 +
.../reporting-grid/reporting-grid.component.ts | 16 +-
.../src/app/reporting/reporting.component.ts | 21 +-
.../cluster-details/cluster-details.component.html | 108 +++--
...utational-resource-create-dialog.component.html | 14 +-
...mputational-resource-create-dialog.component.ts | 29 +-
.../computational-resource-create.model.ts | 2 +-
.../computational-resources-list.component.scss | 18 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.html | 4 +-
.../install-libraries.component.scss | 85 +++-
.../resources-grid/resources-grid.component.html | 86 +++-
.../resources-grid/resources-grid.component.scss | 41 +-
.../resources-grid/resources-grid.component.ts | 39 +-
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../confirmation-dialog.component.ts | 13 +-
.../resources/webapp/src/assets/styles/_theme.scss | 17 +-
.../webapp/src/dictionary/aws.dictionary.ts | 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 8 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 10 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
157 files changed, 2788 insertions(+), 1489 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
