uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 10:06:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add action type *dynamic_action_plan_accounts and tests for it

Browse Source
This commit is contained in:
arberkatellari
2025-06-03 15:24:57 +02:00
committed by Dan Christian Bogos
parent 2d94ca89bb
commit 801631196d
18 changed files with 733 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

271
general_tests/dynamic_acc_sts_thld_it_test.go
View File

@@ -79,7 +79,7 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
attrs1 := &utils.AttrSetActions{
ActionsId: "ACT_BLOCK_ACC",
Actions: []*utils.TPAction{
{
{ // Action that will block disable the account sent from stats event
Identifier: utils.MetaDisableAccount,
},
},
@@ -96,7 +96,7 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
attrs1 := &utils.AttrSetActions{
ActionsId: "ACT_ENABLE_ACC",
Actions: []*utils.TPAction{
{
{ // Action that will enable the account sent from actionPlans
Identifier: utils.MetaEnableAccount,
},
},
@@ -113,7 +113,7 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
timing := &utils.TPTimingWithAPIOpts{
TPTiming: &utils.TPTiming{
ID: "TM_AFTER_5S",
StartTime: "+5s",
StartTime: "+5s", // timing which will start the moment the action plan is executed. After the duration in StartTime, the Action from the actionPlan will be executed. Action plans executed this way will be triggered only once right when timer finishes
},
}
var reply string
@@ -129,15 +129,11 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
ActionsId: "ACT_DYN_ACT_PLAN_ACC_ENABLE",
Actions: []*utils.TPAction{
{
Identifier: utils.MetaDynamicActionPlan,
ExtraParameters: "ACT_PLAN_5S_ACC_ENABLE;ACT_ENABLE_ACC;TM_AFTER_5S;10;true",
// Dynamic Action Plan which will have in it the specified tenant:accountID. The *tenant and ~*opts.*accountID will be taken from the event which calles this action "ACT_DYN_ACT_PLAN_ACC_ENABLE". In this case its the event processed by "THD_ACNT_<~*req.Account>" threshold. When ACT_DYN_ACT_PLAN_ACC_ENABLE is executed, the action plan "ACT_PLAN_5S_ACC_ENABLE" will be created and the timer "TM_AFTER_5S" for the action "ACT_ENABLE_ACC" inside the action plan will start. Overwrite need to be true so that when the threshold triggers again in the future, the action plan will be renewed along with the timer
Identifier: utils.MetaDynamicActionPlanAccounts,
ExtraParameters: "ACT_PLAN_5S_ACC_ENABLE;ACT_ENABLE_ACC;TM_AFTER_5S;10;true;<*tenant+:+~*opts.*accountID>",
Weight: 5,
},
// {
// Identifier: utils.MetaDynamicAccountAction,
// ExtraParameters: "cgrates.org;<~*opts.*accountID>;ACT_PLAN_5S_ACC_ENABLE;;;",
// Weight: 2,
// },
},
}
var reply string
@@ -153,19 +149,19 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
ActionsId: "ACT_DYN_THRESHOLD_AND_STATS_CREATION",
Actions: []*utils.TPAction{
{
// dynamic threshold for already created dynamic accounts, needed so we can ignore matching thresholds the events (which dont come from stats) where an account has already been dynamicaly created by the initial threhold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT. The threshold itself is only used for blocking
// dynamic threshold for already created dynamic accounts, needed so we can ignore matching thresholds for the events (which dont come from stats) where an account has already been dynamicaly created by the initial threhold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT. The threshold itself is only used for blocking
Identifier: utils.MetaDynamicThreshold,
// get tenant and accountID from event, threshold triggers when the event account matches the already dynamicaly created account. If it matches the filter, it will block other thresholds from matching with the event. Make sure dynamic thresholds weight is higher than the initiative threshold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT
// get *tenant and *accountID from event, threshold triggers when the event account matches the already dynamicaly created account. If it matches the filter, it will block other thresholds from matching with the event. Make sure dynamic thresholds weight is higher than the initiative threshold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT
ExtraParameters: "*tenant;THD_BLOCKER_ACNT_<~*req.Account>;*string:~*opts.*accountID:<~*req.Account>;*now;-1;1;;true;3;;true;;",
},
{
Identifier: utils.MetaDynamicThreshold,
// get tenant and accountID from event, threshold triggers when sum of statID hits 100, after triggers the action, the threshold will be disabled for 5 seconds, make sure dynamic thresholds weight is higher than the initiative threshold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT and blocker threshold THD_BLOCKER_ACNT_<~*req.Account>
// get *tenant and *accountID from event, threshold triggers when sum of statID hits 100, after it triggers the action, the threshold will be disabled for 5 seconds, make sure dynamic thresholds weight is higher than the initiative threshold THD_DYNAMIC_STATS_AND_THRESHOLD_INIT and blocker threshold THD_BLOCKER_ACNT_<~*req.Account>
ExtraParameters: "*tenant;THD_ACNT_<~*req.Account>;*string:~*req.StatID:Stat_<~*req.Account>&*string:~*req.*sum#1:100;*now;-1;1;5s;true;4;ACT_BLOCK_ACC&ACT_DYN_ACT_PLAN_ACC_ENABLE;true;;",
},
{
Identifier: utils.MetaDynamicStats,
// get tenant and accountID from event, stat triggers when an event contains account with dynamicaly created accountID and also has a *accountID field in APIOpts, each encounter that matches the filters will raise the *sum number and call the thresholdIDs specified. when the ttl is reached, *sum will go down also
// get *tenant and *accountID from event, stat triggers when an event contains account with dynamicaly created accountID and also has a *accountID field in APIOpts, each encounter that matches the filters will raise the *sum number and call the thresholdIDs specified. when the ttl is reached, *sum will go down also
ExtraParameters: "*tenant;Stat_<~*req.Account>;*string:~*req.Account:<~*req.Account>&*exists:~*opts.*accountID:;*now;;5s;;*sum#1;;true;false;10;THD_ACNT_<~*req.Account>&THD_BLOCKER_ACNT_<~*req.Account>;",
},
},
@@ -340,6 +336,7 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
},
},
},
AccountIDs: utils.StringMap{"cgrates.org:CreatedAccount": true},
},
}
if len(exp) != 1 || len(rcv) != 1 {
@@ -350,36 +347,220 @@ func TestDynamicAccountWithStatsAndThreshold(t *testing.T) {
}
})
// t.Run("CheckAccountReEnabled", func(t *testing.T) {
// time.Sleep(6 * time.Second)
// var acnt engine.Account
// if err := client.Call(context.Background(), utils.APIerSv2GetAccount,
// &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "CreatedAccount"}, &acnt); err != nil {
// t.Error(err)
// }
// expAcc := &engine.Account{
// ID: "cgrates.org:CreatedAccount",
// BalanceMap: map[string]engine.Balances{
// utils.MetaData: {
// &engine.Balance{
// Uuid: acnt.BalanceMap[utils.MetaData][0].Uuid,
// ID: "",
// Categories: utils.StringMap{},
// SharedGroups: utils.StringMap{},
// TimingIDs: utils.StringMap{},
// Value: 4096,
// ExpirationDate: acnt.BalanceMap[utils.MetaData][0].ExpirationDate,
// Weight: 10,
// DestinationIDs: utils.StringMap{},
// },
// },
// },
// UpdateTime: acnt.UpdateTime,
// Disabled: false,
// }
// if !reflect.DeepEqual(utils.ToJSON(expAcc), utils.ToJSON(acnt)) {
// t.Errorf("Expected <%v>, \nreceived <%v>", utils.ToJSON(expAcc), utils.ToJSON(acnt))
// }
// })
t.Run("CheckAccountReEnabled", func(t *testing.T) {
time.Sleep(6 * time.Second)
var acnt engine.Account
if err := client.Call(context.Background(), utils.APIerSv2GetAccount,
&utils.AttrGetAccount{Tenant: "cgrates.org", Account: "CreatedAccount"}, &acnt); err != nil {
t.Error(err)
}
expAcc := &engine.Account{
ID: "cgrates.org:CreatedAccount",
BalanceMap: map[string]engine.Balances{
utils.MetaData: {
&engine.Balance{
Uuid: acnt.BalanceMap[utils.MetaData][0].Uuid,
ID: "",
Categories: utils.StringMap{},
SharedGroups: utils.StringMap{},
TimingIDs: utils.StringMap{},
Value: 4096,
ExpirationDate: acnt.BalanceMap[utils.MetaData][0].ExpirationDate,
Weight: 10,
DestinationIDs: utils.StringMap{},
},
},
},
UpdateTime: acnt.UpdateTime,
Disabled: false,
}
if !reflect.DeepEqual(utils.ToJSON(expAcc), utils.ToJSON(acnt)) {
t.Errorf("Expected <%v>, \nreceived <%v>", utils.ToJSON(expAcc), utils.ToJSON(acnt))
}
})
t.Run("Make100AuthCalls2", func(t *testing.T) {
args1 := &sessions.V1AuthorizeArgs{
GetMaxUsage: true,
ProcessThresholds: true,
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
Event: map[string]any{
utils.OriginID: "sessDynaprepaid",
utils.OriginHost: "192.168.1.1",
utils.Source: "sessDynaprepaid",
utils.ToR: utils.MetaData,
utils.RequestType: utils.MetaDynaprepaid,
utils.AccountField: "CreatedAccount",
utils.Destination: "+1234567",
utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC),
utils.Usage: 1024,
},
APIOpts: map[string]any{"*accountID": "CreatedAccount"}, // account has to be in apiopts for stats to push it to threhsoldsv1ProcessEvent so that it knows which account to disable
},
}
var rply1 sessions.V1AuthorizeReply
if err := client.Call(context.Background(), utils.SessionSv1AuthorizeEvent,
args1, &rply1); err != nil {
t.Error(err)
return
} else if *rply1.MaxUsage != 1024*time.Nanosecond {
t.Errorf("Expected <%+v>, received <%+v>", 1024*time.Nanosecond, *rply1.MaxUsage)
}
for i := range 100 {
strI := strconv.Itoa(i)
args1 := &sessions.V1AuthorizeArgs{
GetMaxUsage: true,
ProcessStats: true,
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
Event: map[string]any{
utils.OriginID: "sessPrepaid" + strI,
utils.OriginHost: "192.168.1.1",
utils.Source: "sessPrepaid",
utils.ToR: utils.MetaData,
utils.RequestType: utils.MetaPrepaid,
utils.AccountField: "CreatedAccount",
utils.Destination: "+1234567",
utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC),
utils.Usage: 1024,
},
APIOpts: map[string]any{"*accountID": "CreatedAccount"}, // account has to be in apiopts for stats to push it to threhsoldsv1ProcessEvent so that it knows which account to disable
},
}
var rply1 sessions.V1AuthorizeReply
if err := client.Call(context.Background(), utils.SessionSv1AuthorizeEvent,
args1, &rply1); err != nil {
t.Error(err)
return
} else if *rply1.MaxUsage != 1024*time.Nanosecond {
t.Errorf("Expected <%+v>, received <%+v>", 1024*time.Nanosecond, *rply1.MaxUsage)
}
}
})
t.Run("CheckAccountBlocked2", func(t *testing.T) {
// wait for account to be disabled async
time.Sleep(10 * time.Millisecond)
var acnt engine.Account
if err := client.Call(context.Background(), utils.APIerSv2GetAccount,
&utils.AttrGetAccount{Tenant: "cgrates.org", Account: "CreatedAccount"}, &acnt); err != nil {
t.Error(err)
}
expAcc := &engine.Account{
ID: "cgrates.org:CreatedAccount",
BalanceMap: map[string]engine.Balances{
utils.MetaData: {
&engine.Balance{
Uuid: acnt.BalanceMap[utils.MetaData][0].Uuid,
ID: "",
Categories: utils.StringMap{},
SharedGroups: utils.StringMap{},
TimingIDs: utils.StringMap{},
Value: 4096,
ExpirationDate: acnt.BalanceMap[utils.MetaData][0].ExpirationDate,
Weight: 10,
DestinationIDs: utils.StringMap{},
},
},
},
UpdateTime: acnt.UpdateTime,
Disabled: true,
}
if !reflect.DeepEqual(utils.ToJSON(expAcc), utils.ToJSON(acnt)) {
t.Errorf("Expected <%v>, \nreceived <%v>", utils.ToJSON(expAcc), utils.ToJSON(acnt))
}
})
t.Run("CheckCreatedDynamicActionPlan2", func(t *testing.T) {
var reply []string
if err := client.Call(context.Background(), utils.APIerSv1GetActionPlanIDs,
&utils.PaginatorWithTenant{Tenant: "cgrates.org"},
&reply); err != nil {
t.Error(err)
} else if len(reply) != 4 {
t.Errorf("Expected: 4 , received: <%+v>", reply)
}
slices.Sort(reply)
if reply[0] != "ACT_PLAN_5S_ACC_ENABLE" {
t.Errorf("Expected: ACT_PLAN_5S_ACC_ENABLE , received: <%v>", reply[0])
} else if reply[1] != "DYNA_ACC" {
t.Errorf("Expected: DYNA_ACC , received: <%v>", reply[1])
} else if reply[2] != "PACKAGE_1001" {
t.Errorf("Expected: PACKAGE_1001 , received: <%v>", reply[2])
} else if reply[3] != "PACKAGE_1002" {
t.Errorf("Expected: PACKAGE_1002 , received: <%v>", reply[3])
}
var rcv []*engine.ActionPlan
if err := client.Call(context.Background(), utils.APIerSv1GetActionPlan,
&v1.AttrGetActionPlan{ID: "ACT_PLAN_5S_ACC_ENABLE"}, &rcv); err != nil {
t.Error(err)
}
exp := []*engine.ActionPlan{
{
Id: "ACT_PLAN_5S_ACC_ENABLE",
ActionTimings: []*engine.ActionTiming{
{
Uuid: rcv[0].ActionTimings[0].Uuid,
ActionsID: "ACT_ENABLE_ACC",
ExtraData: nil,
Weight: 10,
Timing: &engine.RateInterval{
Timing: &engine.RITiming{
ID: "TM_AFTER_5S",
Years: utils.Years{},
Months: utils.Months{},
MonthDays: utils.MonthDays{},
WeekDays: utils.WeekDays{},
StartTime: "+5s",
},
Rating: nil,
Weight: 0,
},
},
},
AccountIDs: utils.StringMap{"cgrates.org:CreatedAccount": true},
},
}
if len(exp) != 1 || len(rcv) != 1 {
t.Fatalf("expected exp len 1, got <%v>, expected rcv len 1, got <%v>", len(exp), len(rcv))
}
if !reflect.DeepEqual(exp, rcv) {
t.Errorf("expected <%v>, \nreceived <%v>", utils.ToJSON(exp), utils.ToJSON(rcv))
}
})
t.Run("CheckAccountReEnabled2", func(t *testing.T) {
time.Sleep(6 * time.Second)
var acnt engine.Account
if err := client.Call(context.Background(), utils.APIerSv2GetAccount,
&utils.AttrGetAccount{Tenant: "cgrates.org", Account: "CreatedAccount"}, &acnt); err != nil {
t.Error(err)
}
expAcc := &engine.Account{
ID: "cgrates.org:CreatedAccount",
BalanceMap: map[string]engine.Balances{
utils.MetaData: {
&engine.Balance{
Uuid: acnt.BalanceMap[utils.MetaData][0].Uuid,
ID: "",
Categories: utils.StringMap{},
SharedGroups: utils.StringMap{},
TimingIDs: utils.StringMap{},
Value: 4096,
ExpirationDate: acnt.BalanceMap[utils.MetaData][0].ExpirationDate,
Weight: 10,
DestinationIDs: utils.StringMap{},
},
},
},
UpdateTime: acnt.UpdateTime,
Disabled: false,
}
if !reflect.DeepEqual(utils.ToJSON(expAcc), utils.ToJSON(acnt)) {
t.Errorf("Expected <%v>, \nreceived <%v>", utils.ToJSON(expAcc), utils.ToJSON(acnt))
}
})
}

53
general_tests/dynamic_thresholds_it_test.go
View File

@@ -179,7 +179,7 @@ func testDynThdCheckForAction(t *testing.T) {
func testDynThdCheckForDestination(t *testing.T) {
var rply *engine.Destination
if err := dynThdRpc.Call(context.Background(), utils.APIerSv1GetDestination, "1005", &rply); err == nil || err.Error() != utils.ErrNotFound.Error() {
if err := dynThdRpc.Call(context.Background(), utils.APIerSv1GetDestination, "DYNAMICLY_DST_1005", &rply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
}
@@ -233,7 +233,7 @@ func testDynThdSetAction(t *testing.T) {
},
{
Identifier: utils.MetaDynamicDestination,
ExtraParameters: "DST_1005;1005",
ExtraParameters: "DYNAMICLY_DST_1005;1005",
},
}}
if err := dynThdRpc.Call(context.Background(), utils.APIerSv2SetActions,
@@ -591,50 +591,13 @@ func testDynThdCheckForDynCreatedAction(t *testing.T) {
func testDynThdCheckForDynCreatedDestination(t *testing.T) {
time.Sleep(50 * time.Millisecond)
args := &v2.AttrGetActions{ActionIDs: []string{"DYNAMICLY_DST_1005"}}
result1 := make(map[string]engine.Actions)
if err := dynThdRpc.Call(context.Background(), utils.APIerSv2GetActions, args, &result1); err != nil {
t.Fatal(err)
var result1 *engine.Destination
if err := dynThdRpc.Call(context.Background(), utils.APIerSv1GetDestination, "DYNAMICLY_DST_1005", &result1); err != nil {
t.Error(err)
}
exp := map[string]engine.Actions{
"DYNAMICLY_ACT_1002": {
{
Id: "DYNAMICLY_ACT_1002",
ActionType: utils.CDRLog,
ExtraParameters: "{\"Account\":\"1002\",\"RequestType\":\"*pseudoprepaid\",\"Subject\":\"DifferentThanAccount\", \"ToR\":\"~ActionType:s/^\\*(.*)$/did_$1/\"}",
Filters: []string{"*string:~*req.Account:1002", "filter2"},
ExpirationString: utils.MetaUnlimited,
Weight: 10,
Balance: &engine.BalanceFilter{
Uuid: result1["DYNAMICLY_ACT_1002"][0].Balance.Uuid,
ID: utils.StringPointer("balID"),
Type: utils.StringPointer(utils.MetaMonetary),
Value: &utils.ValueFormula{
Method: utils.EmptyString,
Params: nil,
Static: 10,
},
ExpirationDate: nil,
Weight: utils.Float64Pointer(10),
DestinationIDs: &utils.StringMap{"1002": true, "1003": true},
RatingSubject: utils.StringPointer("SPECIAL_1002"),
Categories: &utils.StringMap{"call": true, "data": true},
SharedGroups: &utils.StringMap{"SHARED_A": true, "SHARED_B": true},
TimingIDs: &utils.StringMap{utils.MetaDaily: true},
Timings: []*engine.RITiming{{
ID: utils.MetaDaily,
Years: utils.Years{},
Months: utils.Months{},
MonthDays: utils.MonthDays{},
WeekDays: utils.WeekDays{},
StartTime: result1["DYNAMICLY_ACT_1002"][0].Balance.Timings[0].StartTime, //depends on time it ran
}},
Disabled: utils.BoolPointer(false),
Factors: nil,
Blocker: utils.BoolPointer(true),
},
},
},
exp := &engine.Destination{
Id: "DYNAMICLY_DST_1005",
Prefixes: []string{"1005"},
}
if !reflect.DeepEqual(exp, result1) {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", utils.ToJSON(exp), utils.ToJSON(result1))