From 0081ccf277695e5cecc7c30e2fe0f7cb3e743dc2 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Thu, 14 Oct 2021 17:03:32 +0300 Subject: [PATCH] Make increments/units of duration --- data/tariffplans/loadRateTest/Accounts.csv | 3 +-- data/tariffplans/oldaccvsnew/Accounts.csv | 6 +++--- .../sessions_discount_volume/routes1/Accounts.csv | 6 +++--- data/tariffplans/testit/Accounts.csv | 2 +- data/tariffplans/tutaccounts/Accounts.csv | 8 ++++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/data/tariffplans/loadRateTest/Accounts.csv b/data/tariffplans/loadRateTest/Accounts.csv index 974f1187f..d56566c37 100644 --- a/data/tariffplans/loadRateTest/Accounts.csv +++ b/data/tariffplans/loadRateTest/Accounts.csv @@ -1,3 +1,2 @@ #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,*abstract,3600000000000,,,,,, +cgrates.org,1001,,,,VoiceBalance,,;10,*abstract,1h,,,,,, diff --git a/data/tariffplans/oldaccvsnew/Accounts.csv b/data/tariffplans/oldaccvsnew/Accounts.csv index 169f8537d..b1f97e5c5 100644 --- a/data/tariffplans/oldaccvsnew/Accounts.csv +++ b/data/tariffplans/oldaccvsnew/Accounts.csv @@ -1,6 +1,6 @@ #Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs -cgrates.org,1001,*string:~*req.Account:1001,,,VoiceBalance,,;10,*abstract,3600000000000,,,*string:~*req.ToR:*voice;1000000000;0;0,,, -cgrates.org,1002,*string:~*req.Account:1002,,,VoiceBalance,,;10,*abstract,3600000000000,,,*string:~*req.ToR:*voice;1000000000;;,,RP_ANY, +cgrates.org,1001,*string:~*req.Account:1001,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;0;0,,, +cgrates.org,1002,*string:~*req.Account:1002,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;;,,RP_ANY, cgrates.org,1002,,,,MonetaryBalance,,;10,*concrete,100,,,,,, -cgrates.org,1003,*string:~*req.Account:1003,,,VoiceBalance,,;10,*abstract,3600000000000,,,*string:~*req.ToR:*voice;1000000000;;,,, +cgrates.org,1003,*string:~*req.Account:1003,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;;,,, cgrates.org,1003,,,,MonetaryBalance,,;10,*concrete,100,,,,,, diff --git a/data/tariffplans/sessions_discount_volume/routes1/Accounts.csv b/data/tariffplans/sessions_discount_volume/routes1/Accounts.csv index 299163993..ed6762995 100644 --- a/data/tariffplans/sessions_discount_volume/routes1/Accounts.csv +++ b/data/tariffplans/sessions_discount_volume/routes1/Accounts.csv @@ -1,5 +1,5 @@ #Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs -cgrates.org,ACNT_VOL1,,,,ABS_VOLUME1,,;30,*abstract,120000000000,,,;1000000000;0;,,, -cgrates.org,ACNT_VOL1,,,,ABS_VOLUME2,,;20,*abstract,60000000000,,,;1000000000;;,,RP_ABS_VOLUME2, -cgrates.org,ACNT_VOL1,,,,CNCRT_BALANCE1,,;10,*concrete,1000,,*balanceUnlimited:true,;1000000000;;,,RP_SUPPLIER1, +cgrates.org,ACNT_VOL1,,,,ABS_VOLUME1,,;30,*abstract,2m,,,;1s;0;,,, +cgrates.org,ACNT_VOL1,,,,ABS_VOLUME2,,;20,*abstract,1m,,,;1s;;,,RP_ABS_VOLUME2, +cgrates.org,ACNT_VOL1,,,,CNCRT_BALANCE1,,;10,*concrete,1000,,*balanceUnlimited:true,;1s;;,,RP_SUPPLIER1, diff --git a/data/tariffplans/testit/Accounts.csv b/data/tariffplans/testit/Accounts.csv index ae971aa61..809637d87 100644 --- a/data/tariffplans/testit/Accounts.csv +++ b/data/tariffplans/testit/Accounts.csv @@ -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,*monetary,14,fltr1&fltr2;100;fltr3;200,,fltr1&fltr2;1.3;2.3;3.3,attr1;attr2,,*none -cgrates.org,1001,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,, \ No newline at end of file +cgrates.org,1001,,,,VoiceBalance,,;10,*voice,1h,,,,,, \ No newline at end of file diff --git a/data/tariffplans/tutaccounts/Accounts.csv b/data/tariffplans/tutaccounts/Accounts.csv index 374ec116d..dc6548305 100644 --- a/data/tariffplans/tutaccounts/Accounts.csv +++ b/data/tariffplans/tutaccounts/Accounts.csv @@ -1,5 +1,5 @@ #Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs -cgrates.org,1001,*string:~*req.Account:1001,,,MonetaryBalance1,,;30,*concrete,5,,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,*none -cgrates.org,1001,,,,GenericBalance1,,;20,*abstract,3600000000000,*string:~*req.ToR:*data;1.024,,*string:~*req.ToR:*voice;1000000000;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,, -cgrates.org,1001,,,,MonetaryBalance2,,;10,*concrete,3,,,*string:~*req.ToR:*voice;1000000000;0;1,,, -cgrates.org,1002,*string:~*req.Account:1002,;10,,MonetaryBalance1,,,*concrete,10,,,*string:~*req.ToR:*voice;1000000000;0;0.01;;1;0;1,,,*none +cgrates.org,1001,*string:~*req.Account:1001,,,MonetaryBalance1,,;30,*concrete,5,,,*string:~*req.ToR:*voice;1s;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,*none +cgrates.org,1001,,,,GenericBalance1,,;20,*abstract,1h,*string:~*req.ToR:*data;1.024,,*string:~*req.ToR:*voice;1s;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,, +cgrates.org,1001,,,,MonetaryBalance2,,;10,*concrete,3,,,*string:~*req.ToR:*voice;1s;0;1,,, +cgrates.org,1002,*string:~*req.Account:1002,;10,,MonetaryBalance1,,,*concrete,10,,,*string:~*req.ToR:*voice;1s;0;0.01;;1;0;1,,,*none