etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quota: fix tariff type

This commit is contained in:
Abhinandan Prateek 2015-07-22 14:45:18 +05:30
parent cf003cb744
commit 6c944dc409
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
View File

@ -323,7 +323,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
@DB
private QuotaUsageVO updateQuotaRaw(UsageVO usageRecord, BigDecimal aggregationRatio, int ruleType) {
QuotaUsageVO quota_usage = null;
QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.ALLOCATED_VM, usageRecord.getEndDate());
QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(ruleType, usageRecord.getEndDate());
if (tariff != null) {
BigDecimal ruleusage;
BigDecimal onehourcost;
@ -343,7 +343,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
@DB
private QuotaUsageVO updateQuotaNetwork(UsageVO usageRecord, int transferType) {
QuotaUsageVO quota_usage = null;
QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.ALLOCATED_VM, usageRecord.getEndDate());
QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(transferType, usageRecord.getEndDate());
if (tariff != null) {
BigDecimal onegbcost;
BigDecimal rawusageingb;