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

Renamed attributes vars fields

Browse Source
This commit is contained in:
Trial97
2021-07-08 17:00:42 +03:00
committed by Dan Christian Bogos
parent 0ae35438a2
commit 28425b99da
4 changed files with 190 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/attributes.go
View File

@@ -82,6 +82,7 @@ func (alS *AttributeService) attributeProfileForEvent(ctx *context.Context, tnt
}
return nil, err
}
(evNm[utils.MetaVars].(utils.MapStorage))[utils.MetaAttrPrfTenantID] = aPrfl.TenantID()
if pass, err := alS.filterS.Pass(ctx, tnt, aPrfl.FilterIDs,
evNm); err != nil {
return nil, err
@@ -244,7 +245,7 @@ func (alS *AttributeService) V1GetAttributeForEvent(ctx *context.Context, args *
utils.MetaReq: args.CGREvent.Event,
utils.MetaOpts: args.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}, utils.EmptyString)
if err != nil {
@@ -276,8 +277,8 @@ func (alS *AttributeService) V1ProcessEvent(ctx *context.Context, args *AttrArgs
processedPrf := make(utils.StringSet)
eNV := utils.MapStorage{
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.ProcessedProfileIDs: processedPrf,
utils.OptsAttributesProcessRuns: 0,
utils.MetaProcessedProfileIDs: processedPrf,
},
utils.MetaTenant: tnt,
}
@@ -294,7 +295,7 @@ func (alS *AttributeService) V1ProcessEvent(ctx *context.Context, args *AttrArgs
dynDP := newDynamicDP(ctx, alS.cgrcfg.AttributeSCfg().ResourceSConns,
alS.cgrcfg.AttributeSCfg().StatSConns, alS.cgrcfg.AttributeSCfg().AdminSConns, args.Tenant, eNV)
for i := 0; i < processRuns; i++ {
(eNV[utils.MetaVars].(utils.MapStorage))[utils.ProcessRuns] = i + 1
(eNV[utils.MetaVars].(utils.MapStorage))[utils.OptsAttributesProcessRuns] = i + 1
var evRply *AttrSProcessEventReply
evRply, err = alS.processEvent(ctx, tnt, args, eNV, dynDP, lastID)
if err != nil {

3
engine/attributes_test.go
View File

@@ -519,7 +519,8 @@ func TestAttributesattributeProfileForEventErrPass(t *testing.T) {
lastID := ""
evNm = utils.MapStorage{
utils.MetaReq: 1,
utils.MetaReq: 1,
utils.MetaVars: utils.MapStorage{},
}
if rcv, err := alS.attributeProfileForEvent(context.Background(), tnt, []string{"ATTR_1"}, evNm, lastID); err == nil || err != utils.ErrWrongPath {

36
engine/z_attributes_test.go
View File

@@ -231,7 +231,7 @@ func TestAttributeProfileForEvent(t *testing.T) {
utils.MetaReq: attrEvs[0].CGREvent.Event,
utils.MetaOpts: attrEvs[0].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}, utils.EmptyString)
if err != nil {
@@ -245,7 +245,7 @@ func TestAttributeProfileForEvent(t *testing.T) {
utils.MetaReq: attrEvs[1].CGREvent.Event,
utils.MetaOpts: attrEvs[1].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}, utils.EmptyString)
if err != nil {
@@ -260,7 +260,7 @@ func TestAttributeProfileForEvent(t *testing.T) {
utils.MetaReq: attrEvs[2].CGREvent.Event,
utils.MetaOpts: attrEvs[2].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}, utils.EmptyString)
if err != nil {
@@ -282,7 +282,7 @@ func TestAttributeProcessEvent(t *testing.T) {
utils.MetaReq: attrEvs[0].CGREvent.Event,
utils.MetaOpts: attrEvs[0].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[0], eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -300,7 +300,7 @@ func TestAttributeProcessEventWithNotFound(t *testing.T) {
utils.MetaReq: attrEvs[3].CGREvent.Event,
utils.MetaOpts: attrEvs[3].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
if _, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM,
@@ -321,7 +321,7 @@ func TestAttributeProcessEventWithIDs(t *testing.T) {
utils.MetaReq: attrEvs[3].CGREvent.Event,
utils.MetaOpts: attrEvs[3].APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
if atrp, err := attrS.processEvent(context.TODO(), attrEvs[0].Tenant, attrEvs[3], eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString); err != nil {
@@ -1847,7 +1847,7 @@ func TestProcessAttributeConstant(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -1907,7 +1907,7 @@ func TestProcessAttributeVariable(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -1974,7 +1974,7 @@ func TestProcessAttributeComposed(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2036,7 +2036,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2098,7 +2098,7 @@ func TestProcessAttributeSum(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2160,7 +2160,7 @@ func TestProcessAttributeDiff(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2222,7 +2222,7 @@ func TestProcessAttributeMultiply(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2284,7 +2284,7 @@ func TestProcessAttributeDivide(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2346,7 +2346,7 @@ func TestProcessAttributeValueExponent(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2408,7 +2408,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2469,7 +2469,7 @@ func TestProcessAttributePrefix(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)
@@ -2530,7 +2530,7 @@ func TestProcessAttributeSuffix(t *testing.T) {
utils.MetaReq: ev.CGREvent.Event,
utils.MetaOpts: ev.APIOpts,
utils.MetaVars: utils.MapStorage{
utils.ProcessRuns: 0,
utils.OptsAttributesProcessRuns: 0,
},
}
rcv, err := attrS.processEvent(context.TODO(), ev.Tenant, ev, eNM, newDynamicDP(context.TODO(), nil, nil, nil, "cgrates.org", eNM), utils.EmptyString)