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

Add opts field for attributes cfg struct and fix compilation errors

Browse Source
This commit is contained in:
ionutboangiu
2021-11-02 16:46:44 +02:00
committed by Dan Christian Bogos
parent 96edabe539
commit 48feaf2bed
30 changed files with 554 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
engine/attributes.go
View File

@@ -163,9 +163,6 @@ func (attrReply *AttrSProcessEventReply) Digest() (rplyDigest string) {
// AttrArgsProcessEvent arguments used for proccess event
type AttrArgsProcessEvent struct {
AttributeIDs []string
Context *string // attach the event to a context
ProcessRuns *int // number of loops for ProcessEvent
*utils.CGREvent
clnb bool //rpcclonable
}
@@ -185,27 +182,8 @@ func (attr *AttrArgsProcessEvent) RPCClone() (interface{}, error) {
// Clone creates a clone of the object
func (attr *AttrArgsProcessEvent) Clone() *AttrArgsProcessEvent {
var attrIDs []string
if attr.AttributeIDs != nil {
attrIDs = make([]string, len(attr.AttributeIDs))
for i, id := range attr.AttributeIDs {
attrIDs[i] = id
}
}
var ctx *string
if attr.Context != nil {
ctx = utils.StringPointer(*attr.Context)
}
var procRuns *int
if attr.ProcessRuns != nil {
procRuns = new(int)
*procRuns = *attr.ProcessRuns
}
return &AttrArgsProcessEvent{
AttributeIDs: attrIDs,
Context: ctx,
ProcessRuns: procRuns,
CGREvent: attr.CGREvent.Clone(),
CGREvent: attr.CGREvent.Clone(),
}
}
@@ -213,8 +191,18 @@ func (attr *AttrArgsProcessEvent) Clone() *AttrArgsProcessEvent {
func (alS *AttributeService) processEvent(tnt string, args *AttrArgsProcessEvent, evNm utils.MapStorage, dynDP utils.DataProvider,
lastID string, processedPrfNo map[string]int, profileRuns int) (
rply *AttrSProcessEventReply, err error) {
context := alS.cgrcfg.AttributeSCfg().Opts.Context
if opt, has := args.APIOpts[utils.OptsContext]; has {
context = utils.StringPointer(utils.IfaceAsString(opt))
}
attrIDs := alS.cgrcfg.AttributeSCfg().Opts.ProfileIDs
if opt, has := args.APIOpts[utils.OptsAttributesProfileIDs]; has {
if attrIDs, err = utils.IfaceAsSliceString(opt); err != nil {
return
}
}
var attrPrf *AttributeProfile
if attrPrf, err = alS.attributeProfileForEvent(tnt, args.Context, args.AttributeIDs, args.Time, evNm, lastID, processedPrfNo, profileRuns); err != nil {
if attrPrf, err = alS.attributeProfileForEvent(tnt, context, attrIDs, args.Time, evNm, lastID, processedPrfNo, profileRuns); err != nil {
return
}
rply = &AttrSProcessEventReply{
@@ -283,7 +271,17 @@ func (alS *AttributeService) V1GetAttributeForEvent(args *AttrArgsProcessEvent,
if tnt == utils.EmptyString {
tnt = alS.cgrcfg.GeneralCfg().DefaultTenant
}
attrPrf, err := alS.attributeProfileForEvent(tnt, args.Context, args.AttributeIDs, args.Time, utils.MapStorage{
context := alS.cgrcfg.AttributeSCfg().Opts.Context
if opt, has := args.APIOpts[utils.OptsContext]; has {
context = utils.StringPointer(utils.IfaceAsString(opt))
}
attrIDs := alS.cgrcfg.AttributeSCfg().Opts.ProfileIDs
if opt, has := args.APIOpts[utils.OptsAttributesProfileIDs]; has {
if attrIDs, err = utils.IfaceAsSliceString(opt); err != nil {
return
}
}
attrPrf, err := alS.attributeProfileForEvent(tnt, context, attrIDs, args.Time, utils.MapStorage{
utils.MetaReq: args.CGREvent.Event,
utils.MetaOpts: args.APIOpts,
utils.MetaVars: utils.MapStorage{
@@ -314,11 +312,15 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent,
tnt = alS.cgrcfg.GeneralCfg().DefaultTenant
}
processRuns := alS.cgrcfg.AttributeSCfg().ProcessRuns
if args.ProcessRuns != nil && *args.ProcessRuns != 0 {
processRuns = *args.ProcessRuns
processRuns := alS.cgrcfg.AttributeSCfg().Opts.ProcessRuns
if opt, has := args.APIOpts[utils.OptsAttributesProcessRuns]; has {
var val int64
if val, err = utils.IfaceAsTInt64(opt); err != nil {
return
}
processRuns = int(val)
}
profileRuns := alS.cgrcfg.AttributeSCfg().ProfileRuns
profileRuns := alS.cgrcfg.AttributeSCfg().Opts.ProfileRuns
if opt, has := args.APIOpts[utils.OptsAttributesProfileRuns]; has {
var val int64
if val, err = utils.IfaceAsTInt64(opt); err != nil {

73
engine/attributes_test.go
View File

@@ -63,35 +63,15 @@ func TestAttributesShutdown(t *testing.T) {
utils.Logger.SetLogLevel(0)
}
func TestAttributesSetCloneable(t *testing.T) {
attr := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR_ID"},
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(1),
clnb: true,
}
exp := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR_ID"},
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(1),
clnb: false,
}
attr.SetCloneable(false)
if !reflect.DeepEqual(attr, exp) {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", exp, attr)
}
}
func TestAttributesRPCClone(t *testing.T) {
attr := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR_ID"},
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Event: make(map[string]interface{}),
APIOpts: make(map[string]interface{}),
Event: make(map[string]interface{}),
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaAny,
utils.OptsAttributesProfileIDs: []string{"ATTR_ID"},
},
},
clnb: true,
}
@@ -99,12 +79,13 @@ func TestAttributesRPCClone(t *testing.T) {
rcv, err := attr.RPCClone()
exp := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR_ID"},
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Event: make(map[string]interface{}),
APIOpts: make(map[string]interface{}),
Event: make(map[string]interface{}),
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaAny,
utils.OptsAttributesProfileIDs: []string{"ATTR_ID"},
},
},
clnb: false,
}
@@ -249,8 +230,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); err != nil {
t.Errorf("Expected <%+v>, received <%+v>", nil, err)
} else if sort.Strings(rply.AlteredFields); !reflect.DeepEqual(expected, rply) {
@@ -292,8 +275,10 @@ 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); err == nil || err.Error() != expErr {
t.Errorf("Expected <%+v>, received <%+v>", expErr, err)
}
@@ -335,8 +320,10 @@ 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); err == nil || err.Error() != expErr {
t.Errorf("Expected <%+v>, received <%+v>", expErr, err)
}
@@ -377,8 +364,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); err == nil || err.Error() != expErr {
t.Errorf("Expected <%+v>, received <%+v>", expErr, err)
}
@@ -1162,15 +1151,17 @@ func TestAttributesV1ProcessEventMultipleRuns1(t *testing.T) {
}
args := &AttrArgsProcessEvent{
AttributeIDs: []string{"ATTR1", "ATTR2"},
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(3),
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "AttrProcessEventMultipleRuns",
Event: map[string]interface{}{
"Password": "passwd",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 3,
utils.OptsContext: utils.MetaAny,
utils.OptsAttributesProfileIDs: []string{"ATTR1", "ATTR2"},
},
},
}
reply := &AttrSProcessEventReply{}
@@ -1268,12 +1259,14 @@ func TestAttributesV1ProcessEventMultipleRuns2(t *testing.T) {
}
args := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaAny),
ProcessRuns: utils.IntPointer(3),
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "AttrProcessEventMultipleRuns",
Event: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 3,
utils.OptsContext: utils.MetaAny,
},
},
}

10
engine/cdrs.go
View File

@@ -381,12 +381,12 @@ func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREvent) (err error) {
}
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.FirstNonEmpty(
utils.IfaceAsString(cgrEv.APIOpts[utils.OptsContext]),
utils.MetaCDRs)),
CGREvent: cgrEv,
ProcessRuns: processRuns,
CGREvent: cgrEv,
}
if attrArgs.CGREvent.APIOpts[utils.OptsContext] == utils.EmptyString {
attrArgs.CGREvent.APIOpts[utils.OptsContext] = utils.MetaCDRs
}
attrArgs.CGREvent.APIOpts[utils.OptsAttributesProcessRuns] = processRuns
if err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().AttributeSConns, nil,
utils.AttributeSv1ProcessEvent,
attrArgs, &rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 {

12
engine/chargers.go
View File

@@ -131,13 +131,13 @@ func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply
}
args := &AttrArgsProcessEvent{
AttributeIDs: cP.AttributeIDs,
Context: utils.StringPointer(utils.FirstNonEmpty(
utils.IfaceAsString(clonedEv.APIOpts[utils.OptsContext]),
utils.MetaChargers)),
ProcessRuns: processRuns,
CGREvent: clonedEv,
CGREvent: clonedEv,
}
args.CGREvent.APIOpts[utils.OptsAttributesProfileIDs] = cP.AttributeIDs
if args.CGREvent.APIOpts[utils.OptsContext] == utils.EmptyString {
args.CGREvent.APIOpts[utils.OptsContext] = utils.MetaChargers
}
args.CGREvent.APIOpts[utils.OptsAttributesProcessRuns] = processRuns
var evReply AttrSProcessEventReply
if err = cS.connMgr.Call(cS.cfg.ChargerSCfg().AttributeSConns, nil,
utils.AttributeSv1ProcessEvent, args, &evReply); err != nil {

10
engine/routes.go
View File

@@ -590,12 +590,12 @@ func (rpS *RouteService) V1GetRoutes(args *ArgsGetRoutes, reply *SortedRoutesLis
}
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.FirstNonEmpty(
utils.IfaceAsString(args.CGREvent.Event[utils.OptsContext]),
utils.MetaRoutes)),
CGREvent: args.CGREvent,
ProcessRuns: processRuns,
CGREvent: args.CGREvent,
}
if attrArgs.CGREvent.APIOpts[utils.OptsContext] == utils.EmptyString {
attrArgs.CGREvent.APIOpts[utils.OptsContext] = utils.MetaRoutes
}
attrArgs.CGREvent.APIOpts[utils.OptsAttributesProcessRuns] = processRuns
var rplyEv AttrSProcessEventReply
if err := rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().AttributeSConns, nil,
utils.AttributeSv1ProcessEvent, attrArgs, &rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 {

292
engine/z_attributes_test.go
View File

@@ -33,7 +33,6 @@ var (
dmAtr *DataManager
attrEvs = []*AttrArgsProcessEvent{
{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching AttributeProfile1
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -43,36 +42,45 @@ var (
"UsageInterval": "1s",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
},
{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching AttributeProfile2
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Attribute": "AttributeProfile2",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
},
{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching AttributeProfilePrefix
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Attribute": "AttributeProfilePrefix",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
},
{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching AttributeProfilePrefix
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"DistinctMatch": 20,
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
},
}
@@ -150,7 +158,7 @@ var (
func TestAttributePopulateAttrService(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
cfg.AttributeSCfg().StringIndexedFields = nil
cfg.AttributeSCfg().PrefixIndexedFields = nil
data := NewInternalDB(nil, nil, true, config.CgrConfig().DataDbCfg().Items)
@@ -238,8 +246,13 @@ func TestAttributeCache(t *testing.T) {
}
func TestAttributeProfileForEvent(t *testing.T) {
atrp, err := attrS.attributeProfileForEvent(attrEvs[0].Tenant, attrEvs[0].Context,
attrEvs[0].AttributeIDs, attrEvs[0].Time, utils.MapStorage{
context := utils.StringPointer(utils.IfaceAsString(attrEvs[0].APIOpts[utils.OptsContext]))
var attrIDs []string
if attrIDs, err = utils.IfaceAsSliceString(attrEvs[0].APIOpts[utils.OptsAttributesProfileIDs]); err != nil {
t.Error(err)
}
atrp, err := attrS.attributeProfileForEvent(attrEvs[0].Tenant, context,
attrIDs, attrEvs[0].Time, utils.MapStorage{
utils.MetaReq: attrEvs[0].CGREvent.Event,
utils.MetaOpts: attrEvs[0].APIOpts,
utils.MetaVars: utils.MapStorage{
@@ -252,8 +265,12 @@ func TestAttributeProfileForEvent(t *testing.T) {
if !reflect.DeepEqual(atrPs[0], atrp) {
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(atrPs[0]), utils.ToJSON(atrp))
}
atrp, err = attrS.attributeProfileForEvent(attrEvs[1].Tenant, attrEvs[1].Context,
attrEvs[1].AttributeIDs, attrEvs[1].Time, utils.MapStorage{
context = utils.StringPointer(utils.IfaceAsString(attrEvs[1].APIOpts[utils.OptsContext]))
if attrIDs, err = utils.IfaceAsSliceString(attrEvs[1].APIOpts[utils.OptsAttributesProfileIDs]); err != nil {
t.Error(err)
}
atrp, err = attrS.attributeProfileForEvent(attrEvs[1].Tenant, context,
attrIDs, attrEvs[1].Time, utils.MapStorage{
utils.MetaReq: attrEvs[1].CGREvent.Event,
utils.MetaOpts: attrEvs[1].APIOpts,
utils.MetaVars: utils.MapStorage{
@@ -266,9 +283,12 @@ func TestAttributeProfileForEvent(t *testing.T) {
if !reflect.DeepEqual(atrPs[1], atrp) {
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(atrPs[1]), utils.ToJSON(atrp))
}
atrp, err = attrS.attributeProfileForEvent(attrEvs[2].Tenant, attrEvs[2].Context,
attrEvs[2].AttributeIDs, attrEvs[2].Time, utils.MapStorage{
context = utils.StringPointer(utils.IfaceAsString(attrEvs[2].APIOpts[utils.OptsContext]))
if attrIDs, err = utils.IfaceAsSliceString(attrEvs[2].APIOpts[utils.OptsAttributesProfileIDs]); err != nil {
t.Error(err)
}
atrp, err = attrS.attributeProfileForEvent(attrEvs[2].Tenant, context,
attrIDs, attrEvs[2].Time, utils.MapStorage{
utils.MetaReq: attrEvs[2].CGREvent.Event,
utils.MetaOpts: attrEvs[2].APIOpts,
utils.MetaVars: utils.MapStorage{
@@ -323,7 +343,7 @@ func TestAttributeProcessEventWithNotFound(t *testing.T) {
func TestAttributeProcessEventWithIDs(t *testing.T) {
attrEvs[3].CGREvent.Event["Account"] = "1010" //Field added in event after process
attrEvs[3].AttributeIDs = []string{"AttributeIDMatch"}
attrEvs[3].CGREvent.APIOpts[utils.OptsAttributesProfileIDs] = []string{"AttributeIDMatch"}
eRply := &AttrSProcessEventReply{
MatchedProfiles: []string{"cgrates.org:AttributeIDMatch"},
AlteredFields: []string{utils.MetaReq + utils.NestingSep + "Account"},
@@ -559,14 +579,16 @@ func TestAttributeProcessWithMultipleRuns1(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -672,14 +694,16 @@ func TestAttributeProcessWithMultipleRuns2(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -781,14 +805,16 @@ func TestAttributeProcessWithMultipleRuns3(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(2),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -871,14 +897,16 @@ func TestAttributeProcessWithMultipleRuns4(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -983,14 +1011,16 @@ func TestAttributeMultipleProcessWithBlocker(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1094,14 +1124,16 @@ func TestAttributeMultipleProcessWithBlocker2(t *testing.T) {
t.Errorf("Error: %+v", err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1164,14 +1196,16 @@ func TestAttributeProcessValue(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Field1": "Value1",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1243,14 +1277,16 @@ func TestAttributeAttributeFilterIDs(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"PassField": "Test",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1316,14 +1352,16 @@ func TestAttributeProcessEventConstant(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Field1": "Value1",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1392,8 +1430,6 @@ func TestAttributeProcessEventVariable(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1401,6 +1437,10 @@ func TestAttributeProcessEventVariable(t *testing.T) {
"Field1": "Value1",
"TheField": "TheVal",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1475,8 +1515,6 @@ func TestAttributeProcessEventComposed(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1484,6 +1522,10 @@ func TestAttributeProcessEventComposed(t *testing.T) {
"Field1": "Value1",
"TheField": "TheVal",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1548,8 +1590,6 @@ func TestAttributeProcessEventSum(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1558,6 +1598,10 @@ func TestAttributeProcessEventSum(t *testing.T) {
"TheField": "TheVal",
"NumField": "20",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1623,8 +1667,6 @@ func TestAttributeProcessEventUsageDifference(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1634,6 +1676,10 @@ func TestAttributeProcessEventUsageDifference(t *testing.T) {
"UnixTimeStamp": "1554364297",
"UnixTimeStamp2": "1554364287",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1700,8 +1746,6 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -1711,6 +1755,10 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
"Multiplier": "2",
"Pow": "3",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -1745,7 +1793,7 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
func BenchmarkAttributeProcessEventConstant(b *testing.B) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: cfg}, cfg)
@@ -1782,14 +1830,16 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) {
b.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Field1": "Value1",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
var reply AttrSProcessEventReply
@@ -1803,7 +1853,7 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) {
func BenchmarkAttributeProcessEventVariable(b *testing.B) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: cfg}, cfg)
@@ -1841,14 +1891,16 @@ func BenchmarkAttributeProcessEventVariable(b *testing.B) {
b.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Field1": "Value1",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
var reply AttrSProcessEventReply
@@ -1892,7 +1944,7 @@ func TestGetAttributeProfileFromInline(t *testing.T) {
func TestProcessAttributeConstant(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
attrS = NewAttributeService(dmAtr, &FilterS{dm: dmAtr, cfg: cfg}, cfg)
@@ -1915,7 +1967,6 @@ func TestProcessAttributeConstant(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_CONSTANT
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeConstant",
@@ -1923,6 +1974,9 @@ func TestProcessAttributeConstant(t *testing.T) {
"Field1": "Val1",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -1949,7 +2003,7 @@ func TestProcessAttributeConstant(t *testing.T) {
func TestProcessAttributeVariable(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -1973,7 +2027,6 @@ func TestProcessAttributeVariable(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_VARIABLE
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeVariable",
@@ -1982,7 +2035,9 @@ func TestProcessAttributeVariable(t *testing.T) {
"RandomField": "Val2",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2010,7 +2065,7 @@ func TestProcessAttributeVariable(t *testing.T) {
func TestProcessAttributeComposed(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2039,7 +2094,6 @@ func TestProcessAttributeComposed(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_COMPOSED
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeComposed",
@@ -2049,7 +2103,9 @@ func TestProcessAttributeComposed(t *testing.T) {
"RandomField2": "Concatenated",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2077,7 +2133,7 @@ func TestProcessAttributeComposed(t *testing.T) {
func TestProcessAttributeUsageDifference(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2101,7 +2157,6 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_USAGE_DIFF
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeUsageDifference",
@@ -2111,7 +2166,9 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
"RandomField2": "1514804400",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2139,7 +2196,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
func TestProcessAttributeSum(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2163,7 +2220,6 @@ func TestProcessAttributeSum(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_SUM
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeSum",
@@ -2173,7 +2229,9 @@ func TestProcessAttributeSum(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2201,7 +2259,7 @@ func TestProcessAttributeSum(t *testing.T) {
func TestProcessAttributeDiff(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2225,7 +2283,6 @@ func TestProcessAttributeDiff(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_DIFF
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeDiff",
@@ -2235,7 +2292,9 @@ func TestProcessAttributeDiff(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2263,7 +2322,7 @@ func TestProcessAttributeDiff(t *testing.T) {
func TestProcessAttributeMultiply(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2287,7 +2346,6 @@ func TestProcessAttributeMultiply(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_MULTIPLY
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeMultiply",
@@ -2297,7 +2355,9 @@ func TestProcessAttributeMultiply(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2325,7 +2385,7 @@ func TestProcessAttributeMultiply(t *testing.T) {
func TestProcessAttributeDivide(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2349,7 +2409,6 @@ func TestProcessAttributeDivide(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_DIVIDE
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeDivide",
@@ -2359,7 +2418,9 @@ func TestProcessAttributeDivide(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2387,7 +2448,7 @@ func TestProcessAttributeDivide(t *testing.T) {
func TestProcessAttributeValueExponent(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2411,7 +2472,6 @@ func TestProcessAttributeValueExponent(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_VAL_EXP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeValueExponent",
@@ -2421,7 +2481,9 @@ func TestProcessAttributeValueExponent(t *testing.T) {
"RandomField2": "5",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2449,7 +2511,7 @@ func TestProcessAttributeValueExponent(t *testing.T) {
func TestProcessAttributeUnixTimeStamp(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2473,7 +2535,6 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_UNIX_TIMESTAMP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeUnixTimeStamp",
@@ -2483,7 +2544,9 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
"RandomField2": "2013-12-30T15:00:01Z",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2511,7 +2574,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
func TestProcessAttributePrefix(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2535,7 +2598,6 @@ func TestProcessAttributePrefix(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_VAL_EXP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeValueExponent",
@@ -2544,7 +2606,9 @@ func TestProcessAttributePrefix(t *testing.T) {
"Field2": "Val2",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2572,7 +2636,7 @@ func TestProcessAttributePrefix(t *testing.T) {
func TestProcessAttributeSuffix(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2596,7 +2660,6 @@ func TestProcessAttributeSuffix(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_VAL_EXP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeValueExponent",
@@ -2605,7 +2668,9 @@ func TestProcessAttributeSuffix(t *testing.T) {
"Field2": "Val2",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eNM := utils.MapStorage{
@@ -2634,7 +2699,7 @@ func TestProcessAttributeSuffix(t *testing.T) {
func TestAttributeIndexSelectsFalse(t *testing.T) {
// change the IndexedSelects to false
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
cfg.AttributeSCfg().StringIndexedFields = nil
cfg.AttributeSCfg().PrefixIndexedFields = nil
cfg.AttributeSCfg().IndexedSelects = false
@@ -2673,14 +2738,16 @@ func TestAttributeIndexSelectsFalse(t *testing.T) {
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(1),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"Account": "1007",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 1,
utils.OptsContext: utils.MetaSessionS,
},
},
}
@@ -2693,7 +2760,7 @@ func TestAttributeIndexSelectsFalse(t *testing.T) {
func TestProcessAttributeWithSameWeight(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.AttributeSCfg().ProcessRuns = 1
cfg.AttributeSCfg().Opts.ProcessRuns = 1
data := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
Cache.Clear(nil)
@@ -2734,8 +2801,6 @@ func TestProcessAttributeWithSameWeight(t *testing.T) {
t.Error(err)
}
ev := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(2),
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{ //matching ATTR_UNIX_TIMESTAMP
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "TestProcessAttributeUnixTimeStamp",
@@ -2744,6 +2809,10 @@ func TestProcessAttributeWithSameWeight(t *testing.T) {
"RandomField": "1",
utils.Weight: "20.0",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
utils.OptsContext: utils.MetaSessionS,
},
},
}
var rcv AttrSProcessEventReply
@@ -2819,14 +2888,16 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -2841,6 +2912,9 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) {
"Field1": "Value1",
"Field2": "Value2",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
},
},
}
var reply AttrSProcessEventReply
@@ -2913,14 +2987,16 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) {
t.Error(err)
}
attrArgs := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(4),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
Event: map[string]interface{}{
"InitialField": "InitialValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := &AttrSProcessEventReply{
@@ -2935,6 +3011,9 @@ func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) {
"Field1": "Value1",
"Field2": "Value2",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 4,
},
},
}
var reply AttrSProcessEventReply
@@ -2980,11 +3059,12 @@ func TestAttributeMetaTenant(t *testing.T) {
t.Error(err)
}
args := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &utils.CGREvent{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
Event: map[string]interface{}{},
APIOpts: map[string]interface{}{},
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
Event: map[string]interface{}{},
APIOpts: map[string]interface{}{
utils.OptsContext: utils.MetaSessionS,
},
},
}
eRply := AttrSProcessEventReply{
@@ -3078,13 +3158,15 @@ func TestAttributesPorcessEventMatchingProcessRuns(t *testing.T) {
attr := NewAttributeService(dm, fltrS, cfg)
args := &AttrArgsProcessEvent{
ProcessRuns: utils.IntPointer(2),
Context: utils.StringPointer(utils.MetaAny),
CGREvent: &utils.CGREvent{
Event: map[string]interface{}{
"Account": "pc_test",
"CompanyName": "MY_company_will_be_changed",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProcessRuns: 2,
utils.OptsContext: utils.MetaSessionS,
},
},
}
reply := &AttrSProcessEventReply{}
@@ -3098,7 +3180,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(args, reply); err != nil {
@@ -3151,8 +3235,6 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
t.Error(err)
}
args := &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(40),
CGREvent: &utils.CGREvent{
Tenant: cfg.GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -3161,6 +3243,8 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProfileRuns: 2,
utils.OptsAttributesProcessRuns: 40,
utils.OptsContext: utils.MetaSessionS,
},
},
}
@@ -3178,6 +3262,7 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProfileRuns: 2,
utils.OptsAttributesProcessRuns: 40,
},
},
}
@@ -3191,8 +3276,6 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
}
args = &AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
ProcessRuns: utils.IntPointer(40),
CGREvent: &utils.CGREvent{
Tenant: cfg.GeneralCfg().DefaultTenant,
ID: utils.GenUUID(),
@@ -3201,6 +3284,8 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProfileRuns: 1,
utils.OptsAttributesProcessRuns: 40,
utils.OptsContext: utils.MetaSessionS,
},
},
}
@@ -3218,6 +3303,7 @@ func TestAttributeMultipleProfileRunns(t *testing.T) {
},
APIOpts: map[string]interface{}{
utils.OptsAttributesProfileRuns: 1,
utils.OptsAttributesProcessRuns: 40,
},
},
}