You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/13 08:19:47 UTC
[incubator-dlab] branch develop updated (fe5e433 -> adedd5e)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from fe5e433 Merge pull request #301 from apache/fix-dataproc
add 310b9c5 DLAB-000 billing mock on gcp implemented
add 5a9566f DLAB-23 added gcp billing + refactored current billing implementation
add 105ef3a DLAB-23 billing updated for aws
add ccfa823 DLAB-23 dictionary updated
add 236e8b6 DLAB-23 added billing for gcp
add 0522016 DLAB-000 license headers updated
add 217462d DLAB-23 billing updated
add f5563be DLAB-23 fixed merge conflicts
add eed9091 DLAB-23 pom fixed
add f79696d DLAB-23 removed copping billing jar
add 807bbe4 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 82e2820 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 99b7c2d DLAB-23 added billing on GCP
add a42e071 DLAB-23 added possibility to export billing on GCP
add 461b6b7 DLAB-23 added project to billable resource
add b2ccd81 DLAB-23 additional log added
add c012d21 Devops gcp billing
add 1971736 Devops gcp billing. Added billing_dataset_name.
add d43c4f4 Devops gcp billing. Added RedHat support.
add 8320e93 Fixed MongoDB password parsing.
add db65309 Set billing service on 8088 port in billing.yml
add e319c0e Fixed blling.yml
add 8d4a972 Merge pull request #298 from apache/bil-devops
new adedd5e Merge pull request #302 from apache/bil-2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../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 +-
.../gcp/conf/BillingApplicationConfiguration.java | 20 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 20 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java | 15 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../epam/dlab/billing/gcp/documents/Project.java} | 15 +-
.../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} | 20 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../billing/gcp/repository/BillingRepository.java | 12 +-
.../billing/gcp/repository/ProjectRepository.java | 15 +-
.../gcp/repository/UserInstanceRepository.java} | 14 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 33 +-
.../dlab/billing/gcp/service/BillingService.java} | 7 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +++++
.../billing-gcp/src/main/resources/application.yml | 18 +
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 75 ++--
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../BillingResourceGcp.java} | 28 +-
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
48 files changed, 1671 insertions(+), 984 deletions(-)
rename services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{BillingApplicationGcp.java => BillingGcpApplication.java} (58%)
copy integration-tests/src/main/java/com/epam/dlab/automation/docker/NetworkSettings.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/BillingApplicationConfiguration.java (65%)
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/DlabConfiguration.java} (69%)
copy integration-tests/src/main/java/com/epam/dlab/automation/docker/Networks.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java (78%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java} (80%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/UserInstance.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingData.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java
copy services/{dlab-model/src/main/java/com/epam/dlab/dto/InfrastructureMetaInfoDTO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java} (69%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java
copy integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingRepository.java (72%)
copy integration-tests/src/main/java/com/epam/dlab/automation/cloud/gcp/GcpInstanceState.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/ProjectRepository.java (76%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfoDAO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/UserInstanceRepository.java} (70%)
copy services/{security-service/src/main/java/com/epam/dlab/auth/core/SimpleConnection.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/scheduler/BillingScheduler.java} (58%)
copy services/{dlab-mongo-migration/src/main/java/com/epam/dlab/migration/DbMigration.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java} (88%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
create mode 100644 services/billing-gcp/src/main/resources/application.yml
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{azure/AzureBillingFilter.java => gcp/GcpBillingFilter.java} (78%)
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/{azure/BillingResourceAzure.java => gcp/BillingResourceGcp.java} (77%)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #302 from apache/bil-2
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit adedd5e2327090829a549d30567f005e79880ff5
Merge: fe5e433 8d4a972
Author: bhliva <bo...@ukr.net>
AuthorDate: Fri Sep 13 11:19:42 2019 +0300
Merge pull request #302 from apache/bil-2
Billing for GCP added
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../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 +-
.../gcp/conf/BillingApplicationConfiguration.java} | 27 +-
.../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 +-
.../BillingScheduler.java} | 21 +-
.../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 +
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 75 ++--
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 ++++
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
48 files changed, 1747 insertions(+), 943 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org