Calculate hours per month according to each month

Author: Stephan Krug

framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java

@@ -18,6 +18,9 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -89,11 +92,11 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
 
     private TimeZone _usageTimezone;
     private int _aggregationDuration = 0;
-
-    static final BigDecimal s_hoursInMonth = BigDecimal.valueOf(DateUtil.HOURS_IN_A_MONTH);
     static final BigDecimal GiB_DECIMAL = BigDecimal.valueOf(ByteScaleUtils.GiB);
     List<Account.Type> lockablesAccountTypes = Arrays.asList(Account.Type.NORMAL, Account.Type.DOMAIN_ADMIN);
 
+    static BigDecimal hoursInCurrentMonth;
+
     public QuotaManagerImpl() {
         super();
     }
@@ -270,6 +273,8 @@ public boolean calculateQuotaUsage() {
 
         s_logger.info(String.format("Starting quota usage calculation for accounts [%s].", accountsToString));
 
+        setHoursInCurrentMonth();
+
         Map<Integer, Pair<List<QuotaTariffVO>, Boolean>> mapQuotaTariffsPerUsageType = createMapQuotaTariffsPerUsageType();
 
         for (AccountVO account : accounts) {
@@ -533,7 +538,7 @@ protected QuotaUsageVO createQuotaUsageAccordingToUsageUnit(UsageVO usageRecord,
 
     protected BigDecimal getUsageValueAccordingToUsageUnitType(UsageVO usageRecord, BigDecimal aggregatedQuotaTariffsValue, String quotaUnit) {
         BigDecimal rawUsage = BigDecimal.valueOf(usageRecord.getRawUsage());
-        BigDecimal costPerHour = aggregatedQuotaTariffsValue.divide(s_hoursInMonth, 8, RoundingMode.HALF_EVEN);
+        BigDecimal costPerHour = aggregatedQuotaTariffsValue.divide(hoursInCurrentMonth, 8, RoundingMode.HALF_EVEN);
 
         switch (UsageUnitTypes.getByDescription(quotaUnit)) {
             case COMPUTE_MONTH:
@@ -558,6 +563,14 @@ protected BigDecimal getUsageValueAccordingToUsageUnitType(UsageVO usageRecord,
         }
     }
 
+    protected void setHoursInCurrentMonth() {
+        LocalDate currentDate = LocalDate.now();
+        Month currentMonth = currentDate.getMonth();
+        int hoursInMonth = YearMonth.of(currentDate.getYear(), currentMonth).lengthOfMonth() * 24;
+        hoursInCurrentMonth = new BigDecimal(hoursInMonth);
+        s_logger.debug(String.format("Considering [%s] as the total hours in the current month [%s] for the Quota calculation.", hoursInCurrentMonth, currentMonth));
+    }
+
     @Override
     public boolean isLockable(AccountVO account) {
         return lockablesAccountTypes.contains(account.getType());

framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java

@@ -143,6 +143,7 @@ public void getUsageValueAccordingToUsageUnitTypeTestAllTypes() {
         Mockito.doReturn(10.0).when(usageVoMock).getRawUsage();
         Mockito.doReturn(ByteScaleUtils.GiB).when(usageVoMock).getSize();
         BigDecimal aggregatedQuotaTariffsValue = new BigDecimal(400);
+        quotaManagerImplSpy.hoursInCurrentMonth = new BigDecimal(720);
 
         Arrays.asList(UsageUnitTypes.values()).forEach(type -> {
            BigDecimal result = quotaManagerImplSpy.getUsageValueAccordingToUsageUnitType(usageVoMock, aggregatedQuotaTariffsValue, type.toString());