This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1571 by this push:
new 0612a4a Added changes for azure remote billing
0612a4a is described below
commit 0612a4a406266e1fec42a36690b74d4801b01a89
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Thu Mar 19 19:04:46 2020 +0200
Added changes for azure remote billing
---
.../com/epam/dlab/billing/azure/AzureInvoiceCalculationService.java | 6 +++---
.../epam/dlab/billing/azure/config/BillingConfigurationAzure.java | 1 +
services/billing-azure/src/main/resources/application.yml | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureInvoiceCalculationService.java
b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureInvoiceCalculationService.java
index 02ec569..b3eec4f 100644
---
a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureInvoiceCalculationService.java
+++
b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/AzureInvoiceCalculationService.java
@@ -177,7 +177,7 @@ public class AzureInvoiceCalculationService {
private boolean isBillableDlabResource(UsageAggregateRecord record) {
String dlabId =
record.getProperties().getParsedInstanceData().getMicrosoftResources().getTags().get("Name");
- return dlabId != null && !dlabId.isEmpty();
+ return dlabId != null && !dlabId.isEmpty() &&
dlabId.startsWith(billingConfigurationAzure.getSbn());
}
private AzureDailyResourceInvoice calculateInvoice(Map<String, Meter>
rates, UsageAggregateRecord record, String dlabId) {
@@ -191,8 +191,8 @@ public class AzureInvoiceCalculationService {
if (rate != null) {
return
AzureDailyResourceInvoice.builder()
.dlabId(dlabId)
-
.usageStartDate(record.getProperties().getUsageStartTime())
-
.usageEndDate(record.getProperties().getUsageEndTime())
+
.usageStartDate(getDay(record.getProperties().getUsageStartTime()))
+
.usageEndDate(getDay(record.getProperties().getUsageEndTime()))
.meterCategory(record.getProperties().getMeterCategory())
.cost(BillingCalculationUtils.round(rate *
record.getProperties().getQuantity(), 3))
.day(getDay(record.getProperties().getUsageStartTime()))
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 2130192..0a28828 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
@@ -27,6 +27,7 @@ import org.springframework.context.annotation.Configuration;
@ConfigurationProperties("dlab")
@Data
public class BillingConfigurationAzure {
+ private String sbn;
private long initialDelay;
private long period;
diff --git a/services/billing-azure/src/main/resources/application.yml
b/services/billing-azure/src/main/resources/application.yml
index 25e680c..ebc4dac 100644
--- a/services/billing-azure/src/main/resources/application.yml
+++ b/services/billing-azure/src/main/resources/application.yml
@@ -34,7 +34,8 @@ keycloak:
auth-server-url: http://52.11.45.11:8080/auth
dlab:
- billingEnabled: false
+ sbn: <CONF_SERVICE_BASE_NAME>
+ billingEnabled: true
clientId: <CLIENT_ID>
clientSecret: <CLIENT_SECRET>
tenantId: <TENANT_ID>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
