uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-16 21:59:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ld_process_match_ac_it_test and panic in accounts

Browse Source
This commit is contained in:
porosnicuadrian
2021-10-04 14:42:47 +03:00
committed by Dan Christian Bogos
parent 06961f22f6
commit 403cb64093
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/abstractbalance.go
View File

@@ -115,7 +115,7 @@ func (aB *abstractBalance) debitAbstracts(ctx *context.Context, usage *decimal.B
costIcrm, dbted); err != nil {
return
} else if ecCost.Abstracts.Compare(utils.NewDecimal(0, 0)) == 0 { // no debit performed
return
return ecCost, nil
}
}
var dbtUnits *decimal.Big

2
accounts/accounts.go
View File

@@ -131,7 +131,6 @@ func (aS *AccountS) matchingAccountsForEvent(ctx *context.Context, tnt string, c
// accountsDebit will debit an usage out of multiple accounts
func (aS *AccountS) accountsDebit(ctx *context.Context, acnts []*utils.AccountWithWeight,
cgrEv *utils.CGREvent, concretes, store bool) (ec *utils.EventCharges, err error) {
var usage *decimal.Big
if usage, err = engine.FilterDecimalBigCfgOpts(ctx, cgrEv.Tenant, cgrEv.AsDataProvider(), aS.fltrS,
aS.cfg.AccountSCfg().Opts.Usage); err != nil {
@@ -316,7 +315,6 @@ func (aS *AccountS) V1DebitAbstracts(ctx *context.Context, args *utils.CGREvent,
if procEC, err = aS.accountsDebit(ctx, acnts, args, false, true); err != nil {
return
}
var rcvEec *utils.ExtEventCharges
if rcvEec, err = procEC.AsExtEventCharges(); err != nil {
return

2
data/conf/samples/ld_process_match_rt_mysql/cgrates.json
View File

@@ -48,6 +48,7 @@
"ees_conns": ["conn1"]
},
"chargers": {
"enabled": true,
"attributes_conns": ["*internal"],
@@ -62,6 +63,7 @@
"accounts": {
"enabled": true,
"rates_conns": ["*internal"],
},
"rpc_conns": {

4
data/tariffplans/loadRateTest/Accounts.csv
View File

@@ -1,3 +1,3 @@
#Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs
cgrates.org,ACC_PRF_1,,;20,,MonetaryBalance,,;10,*concrete,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none
cgrates.org,1001,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,,
#cgrates.org,ACC_PRF_1,,;20,,MonetaryBalance,,;10,*concrete,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none
cgrates.org,1001,,,,VoiceBalance,,;10,*abstract,3600000000000,,,,,,
1 #Tenant ID FilterIDs Weights Opts BalanceID BalanceFilterIDs BalanceWeights BalanceType BalanceUnits BalanceUnitFactors BalanceOpts BalanceCostIncrements BalanceAttributeIDs BalanceRateProfileIDs ThresholdIDs
2 cgrates.org #cgrates.org ACC_PRF_1 ;20 MonetaryBalance ;10 *concrete 14 fltr1&fltr2;100;fltr3;200 fltr1&fltr2;1.3;2.3;3.3 attr1;attr2 *none
3 cgrates.org 1001 VoiceBalance ;10 *voice *abstract 3600000000000

4
general_tests/ld_process_match_ac_it_test.go
View File

@@ -41,11 +41,11 @@ var (
testLdPrMatchAcLoadConfig,
testLdPrMatchAcResetDataDB,
testLdPrMatchAcResetStorDb,
testLdPrMatchAcStartEngine,
// testLdPrMatchAcStartEngine,
testLdPrMatchAcRPCConn,
testLdPrMatchAcLoadTP,
testLdPrMatchAcCDRSProcessEvent,
testLdPrMatchAcStopCgrEngine,
// testLdPrMatchAcStopCgrEngine,
}
)