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 2019/10/11 13:20:04 UTC
[incubator-dlab] branch DLAB-1179 updated: [DLAB-1179] Added
required parameters to billing.yml
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1179
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1179 by this push:
new c35ce6d [DLAB-1179] Added required parameters to billing.yml
c35ce6d is described below
commit c35ce6d6de3338f8e939b24928a046646b5ef009
Author: ofuks <ol...@gmail.com>
AuthorDate: Fri Oct 11 16:19:45 2019 +0300
[DLAB-1179] Added required parameters to billing.yml
---
services/billing-azure/billing.yml | 4 ++++
.../dlab/billing/azure/AzureBillableResourcesService.java | 12 +++++++-----
.../com/epam/dlab/billing/azure/BillingSchedulerAzure.java | 5 ++++-
.../dlab/billing/azure/config/BillingConfigurationAzure.java | 4 ++++
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/services/billing-azure/billing.yml b/services/billing-azure/billing.yml
index c149cb8..b89d939 100644
--- a/services/billing-azure/billing.yml
+++ b/services/billing-azure/billing.yml
@@ -53,6 +53,10 @@ aggregationOutputMongoDataSource:
password: <MONGODB_PASSWORD>
database: dlabdb
+ssnStorageAccountTagName: AZURE_SSN_STORAGE_ACCOUNT_TAG
+sharedStorageAccountTagName: AZURE_SHARED_STORAGE_ACCOUNT_TAG
+datalakeTagName: AZURE_DATALAKE_TAG
+
# Logging configuration.
logging:
# Default logging level
diff --git a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
index 9fdcb32..a311109 100644
--- a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
+++ b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureBillableResourcesService.java
@@ -60,17 +60,19 @@ public class AzureBillableResourcesService {
* Constructs the service class
*
* @param mongoDbBillingClient mongodb client to retrieve all billable resources
+ * TODO add parameters(@param)
*/
- public AzureBillableResourcesService(MongoDbBillingClient mongoDbBillingClient) {
+ public AzureBillableResourcesService(MongoDbBillingClient mongoDbBillingClient, String sharedStorageAccountTagName,
+ String ssnStorageAccountTagName, String azureDataLakeTagName) {
this.mongoDbBillingClient = mongoDbBillingClient;
this.serviceBaseName = getConfigurationSettingValue(MongoKeyWords.SERVICE_BASE_NAME_KEY)
.replace('_', '-').toLowerCase();
- this.sharedStorageAccountTagName = getConfigurationSettingValue(MongoKeyWords.SHARED_STORAGE_ACCOUNT_TAG_KEY);
- this.ssnStorageAccountTagName = getConfigurationSettingValue(MongoKeyWords.SSN_STORAGE_ACCOUNT_TAG_KEY);
- this.azureDataLakeTagName = getConfigurationSettingValueOrEmpty(MongoKeyWords.DATA_LAKE_TAG_NAME);
-
+ this.sharedStorageAccountTagName = sharedStorageAccountTagName;
+ this.ssnStorageAccountTagName = ssnStorageAccountTagName;
+ this.azureDataLakeTagName = azureDataLakeTagName;
+ log.warn("TEST_TEST " + sharedStorageAccountTagName + ssnStorageAccountTagName + azureDataLakeTagName);
}
diff --git a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingSchedulerAzure.java b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingSchedulerAzure.java
index cdb2c0f..d0b4dba 100644
--- a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingSchedulerAzure.java
+++ b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/BillingSchedulerAzure.java
@@ -214,7 +214,10 @@ public class BillingSchedulerAzure {
private boolean run(BillingPeriod billingPeriod) {
- AzureBillableResourcesService azureBillableResourcesService = new AzureBillableResourcesService(client);
+ AzureBillableResourcesService azureBillableResourcesService = new AzureBillableResourcesService(client,
+ billingConfigurationAzure.getSharedStorageAccountTagName(),
+ billingConfigurationAzure.getSsnStorageAccountTagName(),
+ billingConfigurationAzure.getDatalakeTagName());
Set<AzureDlabBillableResource> billableResources = azureBillableResourcesService.getBillableResources();
AzureInvoiceCalculationService azureInvoiceCalculationService
diff --git a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/config/BillingConfigurationAzure.java b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/config/BillingConfigurationAzure.java
index a58f4ba..4bd69ce 100644
--- a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/config/BillingConfigurationAzure.java
+++ b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/config/BillingConfigurationAzure.java
@@ -39,6 +39,10 @@ public class BillingConfigurationAzure {
private String regionInfo;
private boolean billingEnabled;
+ private String ssnStorageAccountTagName;
+ private String sharedStorageAccountTagName;
+ private String datalakeTagName;
+
private LoggingConfigurationFactory logging;
private AggregationOutputMongoDataSource aggregationOutputMongoDataSource;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org