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

Updated integration tests

Browse Source
This commit is contained in:
Trial97
2020-01-17 13:15:48 +02:00
parent ae56de5cf9
commit c17dc6cd46
6 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
engine/attributes.go
View File

@@ -168,14 +168,9 @@ func (alS *AttributeService) processEvent(args *AttrArgsProcessEvent) (
}
rply = &AttrSProcessEventReply{
MatchedProfiles: []string{attrPrf.ID},
CGREvent: &utils.CGREvent{
Tenant: args.Tenant,
ID: args.ID,
Time: args.Time,
Event: make(map[string]interface{}),
},
blocker: attrPrf.Blocker}
evNm := config.NewNavigableMap(map[string]interface{}{utils.MetaReq: args.Event})
CGREvent: args.CGREvent,
blocker: attrPrf.Blocker}
evNm := config.NewNavigableMap(map[string]interface{}{utils.MetaReq: rply.CGREvent.Event})
for _, attribute := range attrPrf.Attributes {
//in case that we have filter for attribute send them to FilterS to be processed
if len(attribute.FilterIDs) != 0 {
@@ -265,9 +260,9 @@ func (alS *AttributeService) processEvent(args *AttrArgsProcessEvent) (
}
if attribute.FieldName == utils.MetaTenant {
if attribute.Type == utils.META_COMPOSED {
args.CGREvent.Tenant += substitute
rply.CGREvent.Tenant += substitute
} else {
args.CGREvent.Tenant = substitute
rply.CGREvent.Tenant = substitute
}
continue
}
@@ -282,18 +277,6 @@ func (alS *AttributeService) processEvent(args *AttrArgsProcessEvent) (
}
evNm.Set(strings.Split(attribute.FieldName, utils.NestingSep), substitute, false, false)
}
var ev interface{}
ev, err = evNm.FieldAsInterface([]string{utils.MetaReq})
if err != nil {
if err.Error() == utils.ErrNotFound.Error() {
return
}
return nil, err
}
var ok bool
if rply.CGREvent.Event, ok = ev.(map[string]interface{}); !ok {
return nil, fmt.Errorf("invalid event")
}
return
}
@@ -327,6 +310,7 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent,
args.ProcessRuns = utils.IntPointer(alS.cgrcfg.AttributeSCfg().ProcessRuns)
}
var apiRply *AttrSProcessEventReply // aggregate response here
args.CGREvent = args.CGREvent.Clone()
for i := 0; i < *args.ProcessRuns; i++ {
var evRply *AttrSProcessEventReply
evRply, err = alS.processEvent(args)
@@ -338,9 +322,6 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent,
}
break
}
if len(evRply.AlteredFields) != 0 {
args.CGREvent = evRply.CGREvent // for next loop
}
if apiRply == nil { // first reply
apiRply = evRply
if apiRply.blocker {