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

Add default_opts for attributes

Browse Source
This commit is contained in:
ionutboangiu
2021-08-26 10:28:13 +03:00
committed by Dan Christian Bogos
parent 8270d81e57
commit 6d091ea30e
20 changed files with 392 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/attributes.go
View File

@@ -130,7 +130,6 @@ func (attrReply *AttrSProcessEventReply) Digest() (rplyDigest string) {
// AttrArgsProcessEvent arguments used for proccess event
type AttrArgsProcessEvent struct {
AttributeIDs []string
ProcessRuns *int // number of loops for ProcessEvent
*utils.CGREvent
clnb bool //rpcclonable
}
@@ -157,14 +156,8 @@ func (attr *AttrArgsProcessEvent) Clone() *AttrArgsProcessEvent {
attrIDs[i] = id
}
}
var procRuns *int
if attr.ProcessRuns != nil {
procRuns = new(int)
*procRuns = *attr.ProcessRuns
}
return &AttrArgsProcessEvent{
AttributeIDs: attrIDs,
ProcessRuns: procRuns,
CGREvent: attr.CGREvent.Clone(),
}
}
@@ -270,10 +263,15 @@ func (alS *AttributeService) V1ProcessEvent(ctx *context.Context, args *AttrArgs
tnt = alS.cgrcfg.GeneralCfg().DefaultTenant
}
processRuns := alS.cgrcfg.AttributeSCfg().ProcessRuns
if args.ProcessRuns != nil && *args.ProcessRuns != 0 {
processRuns = *args.ProcessRuns
var processRuns int64
if v, has := args.APIOpts[utils.OptsAttributesProcessRuns]; has {
if processRuns, err = utils.IfaceAsTInt64(v); err != nil {
return
}
} else if processRuns, err = utils.IfaceAsTInt64(alS.cgrcfg.AttributeSCfg().DefaultOpts[utils.OptsAttributesProcessRuns]); err != nil {
return
}
args.CGREvent = args.CGREvent.Clone()
processedPrf := make(utils.StringSet)
eNV := utils.MapStorage{
@@ -295,7 +293,7 @@ func (alS *AttributeService) V1ProcessEvent(ctx *context.Context, args *AttrArgs
alteredFields := make(utils.StringSet)
dynDP := newDynamicDP(ctx, alS.cgrcfg.AttributeSCfg().ResourceSConns,
alS.cgrcfg.AttributeSCfg().StatSConns, alS.cgrcfg.AttributeSCfg().AdminSConns, args.Tenant, eNV)
for i := 0; i < processRuns; i++ {
for i := int64(0); i < processRuns; i++ {
(eNV[utils.MetaVars].(utils.MapStorage))[utils.OptsAttributesProcessRuns] = i + 1
var evRply *AttrSProcessEventReply
evRply, err = alS.processEvent(ctx, tnt, args, eNV, dynDP, lastID)

40
engine/attributes_test.go
View File

@@ -96,8 +96,10 @@ func TestAttributesV1ProcessEvent(t *testing.T) {
Event: map[string]interface{}{
utils.AccountField: "adrian@itsyscom.com",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
ProcessRuns: utils.IntPointer(2),
}
rply := &AttrSProcessEventReply{}
expected := &AttrSProcessEventReply{
@@ -110,7 +112,9 @@ func TestAttributesV1ProcessEvent(t *testing.T) {
utils.AccountField: "andrei.itsyscom.com",
"Password": "CGRATES.ORG",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
blocker: false,
}
@@ -191,15 +195,17 @@ func TestAttributesV1ProcessEventErrorMetaSum(t *testing.T) {
Event: map[string]interface{}{
utils.AccountField: "adrian@itsyscom.com",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
ProcessRuns: utils.IntPointer(2),
}
rply := &AttrSProcessEventReply{}
err = alS.V1ProcessEvent(context.Background(), args, rply)
sort.Strings(rply.AlteredFields)
expErr := "SERVER_ERROR: NotEnoughParameters"
if err == nil || err.Error() != expErr {
t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err)
t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expErr, err)
}
}
@@ -271,15 +277,17 @@ func TestAttributesV1ProcessEventErrorMetaDifference(t *testing.T) {
Event: map[string]interface{}{
utils.AccountField: "adrian@itsyscom.com",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
ProcessRuns: utils.IntPointer(2),
}
rply := &AttrSProcessEventReply{}
err = alS.V1ProcessEvent(context.Background(), args, rply)
sort.Strings(rply.AlteredFields)
expErr := "SERVER_ERROR: NotEnoughParameters"
if err == nil || err.Error() != expErr {
t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err)
t.Errorf("\nExpected <%+v>, \nReceived <%+v>", expErr, err)
}
}
@@ -351,8 +359,10 @@ func TestAttributesV1ProcessEventErrorMetaValueExponent(t *testing.T) {
Event: map[string]interface{}{
utils.AccountField: "adrian@itsyscom.com",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
ProcessRuns: utils.IntPointer(2),
}
rply := &AttrSProcessEventReply{}
err = alS.V1ProcessEvent(context.Background(), args, rply)
@@ -708,13 +718,15 @@ func TestAttributesV1ProcessEventMultipleRuns1(t *testing.T) {
args := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR1", "ATTR2"},
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "AttrProcessEventMultipleRuns",
Event: map[string]interface{}{
"Password": "passwd",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
},
},
}
reply := &AttrSProcessEventReply{}
@@ -728,7 +740,9 @@ func TestAttributesV1ProcessEventMultipleRuns1(t *testing.T) {
"Password": "CGRateS.org",
utils.RequestType: utils.MetaPostpaid,
},
APIOpts: make(map[string]interface{}),
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -814,11 +828,13 @@ func TestAttributesV1ProcessEventMultipleRuns2(t *testing.T) {
}
args := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(3),
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "AttrProcessEventMultipleRuns",
Event: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 3,
},
},
}
@@ -834,7 +850,9 @@ func TestAttributesV1ProcessEventMultipleRuns2(t *testing.T) {
"PaypalAccount": "cgrates@paypal.com",
utils.RequestType: utils.MetaPostpaid,
},
APIOpts: make(map[string]interface{}),
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 3,
},
},
}
if err := alS.V1ProcessEvent(context.Background(), args, reply); err != nil {

9
engine/cdrs.go
View File

@@ -155,18 +155,11 @@ func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREvent) (err error) {
cgrEv.APIOpts = make(map[string]interface{})
}
cgrEv.APIOpts[utils.Subsys] = utils.MetaCDRs
var processRuns *int
if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has {
if v, err := utils.IfaceAsTInt64(val); err == nil {
processRuns = utils.IntPointer(int(v))
}
}
cgrEv.APIOpts[utils.OptsContext] = utils.FirstNonEmpty(
utils.IfaceAsString(cgrEv.APIOpts[utils.OptsContext]),
utils.MetaCDRs)
attrArgs := &AttrArgsProcessEvent{
CGREvent: cgrEv,
ProcessRuns: processRuns,
CGREvent: cgrEv,
}
if err = cdrS.connMgr.Call(context.TODO(), cdrS.cgrCfg.CdrsCfg().AttributeSConns,
utils.AttributeSv1ProcessEvent,

7
engine/chargers.go
View File

@@ -103,12 +103,6 @@ type ChrgSProcessEventReply struct {
func (cS *ChargerService) processEvent(ctx *context.Context, tnt string, cgrEv *utils.CGREvent) (rply []*ChrgSProcessEventReply, err error) {
var cPs ChargerProfiles
var processRuns *int
if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has {
if v, err := utils.IfaceAsTInt64(val); err == nil {
processRuns = utils.IntPointer(int(v))
}
}
if cPs, err = cS.matchingChargerProfilesForEvent(ctx, tnt, cgrEv); err != nil {
return nil, err
}
@@ -131,7 +125,6 @@ func (cS *ChargerService) processEvent(ctx *context.Context, tnt string, cgrEv *
utils.MetaChargers)
args := &AttrArgsProcessEvent{
AttributeIDs: cP.AttributeIDs,
ProcessRuns: processRuns,
CGREvent: clonedEv,
}
var evReply AttrSProcessEventReply

13
engine/routes.go
View File

@@ -577,23 +577,12 @@ func (rpS *RouteService) V1GetRoutes(ctx *context.Context, args *ArgsGetRoutes,
args.APIOpts = make(map[string]interface{})
}
args.APIOpts[utils.Subsys] = utils.MetaRoutes
var processRuns *int
if val, has := args.APIOpts[utils.OptsAttributesProcessRuns]; has {
if v, err := utils.IfaceAsTInt64(val); err == nil {
processRuns = utils.IntPointer(int(v))
}
} else if val, has = rpS.cgrcfg.RouteSCfg().DefaultOpts[utils.OptsAttributesProcessRuns]; has {
if v, err := utils.IfaceAsTInt64(val); err == nil {
processRuns = utils.IntPointer(int(v))
}
}
args.CGREvent.APIOpts[utils.OptsContext] = utils.FirstNonEmpty(
utils.IfaceAsString(args.CGREvent.APIOpts[utils.OptsContext]),
utils.IfaceAsString(rpS.cgrcfg.RouteSCfg().DefaultOpts[utils.OptsContext]),
utils.MetaRoutes)
attrArgs := &AttrArgsProcessEvent{
CGREvent: args.CGREvent,
ProcessRuns: processRuns,
CGREvent: args.CGREvent,
}
var rplyEv AttrSProcessEventReply
if err := rpS.connMgr.Call(ctx, rpS.cgrcfg.RouteSCfg().AttributeSConns,

77
engine/z_attributes_test.go
View File

@@ -80,7 +80,8 @@ var (
"DistinctMatch": 20,
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 0,
},
},
},
@@ -139,7 +140,6 @@ var (
func TestAttributePopulateAttrService(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
defaultCfg.AttributeSCfg().StringIndexedFields = nil
defaultCfg.AttributeSCfg().PrefixIndexedFields = nil
data := NewInternalDB(nil, nil, true)
@@ -305,7 +305,7 @@ func TestAttributeProcessEventWithNotFound(t *testing.T) {
}
if _, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM,
newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString); err == nil || err != utils.ErrNotFound {
t.Errorf("Error: %+v", err)
t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ErrNotFound, err)
}
}
@@ -541,7 +541,6 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -549,7 +548,8 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -644,7 +644,6 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -652,7 +651,8 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -743,7 +743,6 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(2),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -751,7 +750,8 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 2,
},
},
}
@@ -827,7 +827,6 @@ func TestAttributeProcessWithMultipleRuns4(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -835,7 +834,8 @@ func TestAttributeProcessWithMultipleRuns4(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -929,7 +929,6 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -937,7 +936,8 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -1030,7 +1030,6 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1038,7 +1037,8 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -1098,7 +1098,6 @@ func TestAttributeProcessValue(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1175,7 +1174,6 @@ func TestAttributeAttributeFilterIDs(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1246,7 +1244,6 @@ func TestAttributeProcessEventConstant(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1320,7 +1317,6 @@ func TestAttributeProcessEventVariable(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1401,7 +1397,6 @@ func TestAttributeProcessEventComposed(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1472,7 +1467,6 @@ func TestAttributeProcessEventSum(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1545,7 +1539,6 @@ func TestAttributeProcessEventUsageDifference(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1620,7 +1613,6 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1667,7 +1659,6 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
func BenchmarkAttributeProcessEventConstant(b *testing.B) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: defaultCfg}, defaultCfg)
@@ -1700,7 +1691,6 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) {
b.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1723,7 +1713,6 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) {
func BenchmarkAttributeProcessEventVariable(b *testing.B) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: defaultCfg}, defaultCfg)
@@ -1757,7 +1746,6 @@ func BenchmarkAttributeProcessEventVariable(b *testing.B) {
b.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1809,7 +1797,6 @@ func TestGetAttributeProfileFromInline(t *testing.T) {
func TestProcessAttributeConstant(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: defaultCfg}, defaultCfg)
@@ -1867,7 +1854,6 @@ func TestProcessAttributeConstant(t *testing.T) {
func TestProcessAttributeVariable(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -1928,7 +1914,6 @@ func TestProcessAttributeVariable(t *testing.T) {
func TestProcessAttributeComposed(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -1995,7 +1980,6 @@ func TestProcessAttributeComposed(t *testing.T) {
func TestProcessAttributeUsageDifference(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2057,7 +2041,6 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
func TestProcessAttributeSum(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2119,7 +2102,6 @@ func TestProcessAttributeSum(t *testing.T) {
func TestProcessAttributeDiff(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2181,7 +2163,6 @@ func TestProcessAttributeDiff(t *testing.T) {
func TestProcessAttributeMultiply(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2243,7 +2224,6 @@ func TestProcessAttributeMultiply(t *testing.T) {
func TestProcessAttributeDivide(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2305,7 +2285,6 @@ func TestProcessAttributeDivide(t *testing.T) {
func TestProcessAttributeValueExponent(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2367,7 +2346,6 @@ func TestProcessAttributeValueExponent(t *testing.T) {
func TestProcessAttributeUnixTimeStamp(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2429,7 +2407,6 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
func TestProcessAttributePrefix(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2490,7 +2467,6 @@ func TestProcessAttributePrefix(t *testing.T) {
func TestProcessAttributeSuffix(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2552,7 +2528,6 @@ func TestProcessAttributeSuffix(t *testing.T) {
func TestAttributeIndexSelectsFalse(t *testing.T) {
// change the IndexedSelects to false
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
defaultCfg.AttributeSCfg().StringIndexedFields = nil
defaultCfg.AttributeSCfg().PrefixIndexedFields = nil
defaultCfg.AttributeSCfg().IndexedSelects = false
@@ -2587,7 +2562,6 @@ func TestAttributeIndexSelectsFalse(t *testing.T) {
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -2609,7 +2583,6 @@ func TestAttributeIndexSelectsFalse(t *testing.T) {
func TestProcessAttributeWithSameWeight(t *testing.T) {
defaultCfg := config.NewDefaultCGRConfig()
defaultCfg.AttributeSCfg().ProcessRuns = 1
data := NewInternalDB(nil, nil, true)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2648,7 +2621,6 @@ func TestProcessAttributeWithSameWeight(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(2),
CGREvent: &utils.CGREvent{ //matching ATTR_UNIX_TIMESTAMP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeUnixTimeStamp",
@@ -2658,7 +2630,8 @@ func TestProcessAttributeWithSameWeight(t *testing.T) {
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 2,
},
},
}
@@ -2727,7 +2700,6 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -2735,7 +2707,8 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -2815,7 +2788,6 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -2823,7 +2795,8 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) {
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
utils.OptsContext: utils.MetaSessionS,
utils.OptsAttributesProcessRuns: 4,
},
},
}
@@ -2974,12 +2947,14 @@ func TestAttributesPorcessEventMatchingProcessRuns(t *testing.T) {
attr := NewAttributeService(dm, fltrS, cfg)
args := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(2),
CGREvent: &utils.CGREvent{
Event: map[string]interface{}{
"Account": "pc_test",
"CompanyName": "MY_company_will_be_changed",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
}
reply := &AttrSProcessEventReply{}
@@ -2993,7 +2968,9 @@ func TestAttributesPorcessEventMatchingProcessRuns(t *testing.T) {
"CompanyName": "ITSYS COMMUNICATIONS SRL",
"Password": "CGRateS.org",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
},
},
}
if err := attr.V1ProcessEvent(context.Background(), args, reply); err != nil {