diff --git a/engine/account.go b/engine/account.go index 075711891..1e289359d 100644 --- a/engine/account.go +++ b/engine/account.go @@ -37,7 +37,7 @@ const ( CREDIT = "*monetary" SMS = "*sms" DATA = "*data" - MINUTES = "*call_duration" + MINUTES = "*voice" // action trigger threshold types TRIGGER_MIN_COUNTER = "*min_counter" TRIGGER_MAX_COUNTER = "*max_counter" diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index b4dfc9f7a..9ee930b59 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -142,10 +142,10 @@ SG3,*any,*lowest, actions = ` MINI,*topup_reset,*monetary,*out,10,*unlimited,,,10,,,10 -MINI,*topup,*call_duration,*out,100,*unlimited,NAT,test,10,,,10 +MINI,*topup,*voice,*out,100,*unlimited,NAT,test,10,,,10 SHARED,*topup,*monetary,*out,100,*unlimited,,,10,SG1,,10 TOPUP10_AC,*topup_reset,*monetary,*out,1,*unlimited,*any,,10,,,10 -TOPUP10_AC1,*topup_reset,*call_duration,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10 +TOPUP10_AC1,*topup_reset,*voice,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10 SE0,*topup_reset,*monetary,*out,0,*unlimited,,,10,SG2,,10 SE10,*topup_reset,*monetary,*out,10,*unlimited,,,5,SG2,,10 SE10,*topup,*monetary,*out,10,*unlimited,,,10,,,10 @@ -162,8 +162,8 @@ TOPUP_SHARED10_AT,SE10,ASAP,10 TOPUP_EMPTY_AT,EE0,ASAP,10 ` actionTriggers = ` -STANDARD_TRIGGER,*call_duration,*out,*min_counter,10,false,GERMANY_O2,SOME_1,10 -STANDARD_TRIGGER,*call_duration,*out,*max_balance,200,false,GERMANY,SOME_2,10 +STANDARD_TRIGGER,*voice,*out,*min_counter,10,false,GERMANY_O2,SOME_1,10 +STANDARD_TRIGGER,*voice,*out,*max_balance,200,false,GERMANY,SOME_2,10 STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,,LOG_WARNING,10 STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,,LOG_WARNING,10 STANDARD_TRIGGERS,*monetary,*out,*max_counter,5,false,FS_USERS,LOG_WARNING,10 diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go index 5c4d67e8b..18083c445 100644 --- a/general_tests/ddazmbl1_test.go +++ b/general_tests/ddazmbl1_test.go @@ -53,7 +53,7 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10` sharedGroups := `` lcrs := `` actions := `TOPUP10_AC,*topup_reset,*monetary,*out,10,*unlimited,*any,,10,,,10 -TOPUP10_AC1,*topup_reset,*call_duration,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` +TOPUP10_AC1,*topup_reset,*voice,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` actionPlans := `TOPUP10_AT,TOPUP10_AC,ASAP,10 TOPUP10_AT,TOPUP10_AC1,ASAP,10` actionTriggers := `` diff --git a/general_tests/ddazmbl2_test.go b/general_tests/ddazmbl2_test.go index 9088d204a..6639e2d5d 100644 --- a/general_tests/ddazmbl2_test.go +++ b/general_tests/ddazmbl2_test.go @@ -53,7 +53,7 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10` sharedGroups := `` lcrs := `` actions := `TOPUP10_AC,*topup_reset,*monetary,*out,0,*unlimited,*any,,10,,,10 -TOPUP10_AC1,*topup_reset,*call_duration,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` +TOPUP10_AC1,*topup_reset,*voice,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` actionPlans := `TOPUP10_AT,TOPUP10_AC,ASAP,10 TOPUP10_AT,TOPUP10_AC1,ASAP,10` actionTriggers := `` diff --git a/general_tests/ddazmbl3_test.go b/general_tests/ddazmbl3_test.go index 15963b650..7e806c8b9 100644 --- a/general_tests/ddazmbl3_test.go +++ b/general_tests/ddazmbl3_test.go @@ -52,7 +52,7 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10` *out,cgrates.org,call,discounted_minutes,2013-01-06T00:00:00Z,RP_UK_Mobile_BIG5_PKG,` sharedGroups := `` lcrs := `` - actions := `TOPUP10_AC1,*topup_reset,*call_duration,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` + actions := `TOPUP10_AC1,*topup_reset,*voice,*out,40,*unlimited,DST_UK_Mobile_BIG5,discounted_minutes,10,,,10` actionPlans := `TOPUP10_AT,TOPUP10_AC1,ASAP,10` actionTriggers := `` accountActions := `cgrates.org,12345,*out,TOPUP10_AT,`