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

Update integration test in agents

Browse Source
This commit is contained in:
TeoV
2021-01-14 11:57:58 +02:00
committed by Dan Christian Bogos
parent ef13fbc6ec
commit 2bfb234804
19 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agents/diamagent.go
View File

@@ -313,8 +313,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuthorize,

3
agents/dnsagent.go
View File

@@ -177,8 +177,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuthorize,

3
agents/httpagent.go
View File

@@ -112,8 +112,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuthorize,

3
agents/radagent.go
View File

@@ -170,8 +170,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuthorize,

3
agents/sipagent.go
View File

@@ -377,8 +377,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor,
if err = agReq.SetFields(reqProcessor.RequestFields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
var reqType string
for _, typ := range []string{
utils.MetaDryRun, utils.MetaAuthorize, /*

3
config/navigablemap.go
View File

@@ -176,7 +176,7 @@ func NMAsXMLElements(nm *utils.OrderedNavigableMap) (ents []*XMLElement, err err
// NMAsCGREvent builds a CGREvent considering Time as time.Now()
// and Event as linear map[string]interface{} with joined paths
// treats particular case when the value of map is []*NMItem - used in agents/AgentRequest
func NMAsCGREvent(nM *utils.OrderedNavigableMap, tnt string, pathSep string) (cgrEv *utils.CGREvent) {
func NMAsCGREvent(nM *utils.OrderedNavigableMap, tnt string, pathSep string, opts *utils.OrderedNavigableMap) (cgrEv *utils.CGREvent) {
if nM == nil {
return
}
@@ -189,6 +189,7 @@ func NMAsCGREvent(nM *utils.OrderedNavigableMap, tnt string, pathSep string) (cg
ID: utils.UUIDSha1Prefix(),
Time: utils.TimePointer(time.Now()),
Event: make(map[string]interface{}),
Opts: NMAsMapInterface(opts, pathSep),
}
for ; el != nil; el = el.Next() {
branchPath := el.Value

8
config/navigablemap_test.go
View File

@@ -242,13 +242,13 @@ func TestNMAsXMLElements(t *testing.T) {
func TestNMAsCGREvent(t *testing.T) {
if cgrEv := NMAsCGREvent(nil, "cgrates.org",
utils.NestingSep); cgrEv != nil {
utils.NestingSep,nil); cgrEv != nil {
t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(nil), utils.ToJSON(cgrEv.Event))
}
nM := utils.NewOrderedNavigableMap()
if cgrEv := NMAsCGREvent(nM, "cgrates.org",
utils.NestingSep); cgrEv != nil {
utils.NestingSep,nil); cgrEv != nil {
t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(nil), utils.ToJSON(cgrEv.Event))
}
@@ -329,8 +329,8 @@ func TestNMAsCGREvent(t *testing.T) {
"FirstLevel2.Field6": "Value6",
"Field4": "Val4",
}
if cgrEv := NMAsCGREvent(nM, "cgrates.org",
utils.NestingSep); cgrEv.Tenant != "cgrates.org" ||
if cgrEv := NMAsCGREvent(nM, "cgrates.org",
utils.NestingSep,utils.NewOrderedNavigableMap()); cgrEv.Tenant != "cgrates.org" ||
cgrEv.Time == nil ||
!reflect.DeepEqual(eEv, cgrEv.Event) {
t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(eEv), utils.ToJSON(cgrEv.Event))

3
ers/amqp.go
View File

@@ -200,8 +200,7 @@ func (rdr *AMQPER) processMessage(msg []byte) (err error) {
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/amqpv1.go
View File

@@ -175,8 +175,7 @@ func (rdr *AMQPv1ER) processMessage(msg []byte) (err error) {
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/filecsv.go
View File

@@ -185,8 +185,7 @@ func (rdr *CSVFileER) processFile(fPath, fName string) (err error) {
utils.ERs, absPath, rowNr, err.Error()))
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

9
ers/filefwv.go
View File

@@ -218,8 +218,7 @@ func (rdr *FWVFileER) processFile(fPath, fName string) (err error) {
return
}
rdr.offset += rdr.lineLen // increase the offset
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),
@@ -307,8 +306,7 @@ func (rdr *FWVFileER) processTrailer(file *os.File, rowNr, evsPosted int, absPat
utils.ERs, absPath, rowNr, err.Error()))
return err
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),
@@ -350,8 +348,7 @@ func (rdr *FWVFileER) createHeaderMap(record string, rowNr, evsPosted int, absPa
return err
}
rdr.offset += rdr.headerOffset // increase the offset
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/filejson.go
View File

@@ -166,8 +166,7 @@ func (rdr *JSONFileER) processFile(fPath, fName string) (err error) {
utils.ERs, absPath, err.Error()))
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/filexml.go
View File

@@ -164,8 +164,7 @@ func (rdr *XMLFileER) processFile(fPath, fName string) (err error) {
utils.ERs, absPath, rowNr, err.Error()))
continue
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/flatstore.go
View File

@@ -214,8 +214,7 @@ func (rdr *FlatstoreER) processFile(fPath, fName string) (err error) {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/kafka.go
View File

@@ -172,8 +172,7 @@ func (rdr *KafkaER) processMessage(msg []byte) (err error) {
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/partial_csv.go
View File

@@ -217,8 +217,7 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) {
cgrID := utils.Sha1(orgID, orgHost)
// take Partial field from NavigableMap
partial, _ := agReq.CGRRequest.FieldAsString([]string{utils.Partial})
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
if val, has := rdr.cache.Get(cgrID); !has {
if utils.IsSliceMember([]string{"false", utils.EmptyString}, partial) { // complete CDR
rdr.rdrEvents <- &erEvent{

3
ers/s3.go
View File

@@ -129,8 +129,7 @@ func (rdr *S3ER) processMessage(body []byte) (err error) {
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/sql.go
View File

@@ -249,8 +249,7 @@ func (rdr *SQLEventReader) processMessage(msg map[string]interface{}) (err error
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),

3
ers/sqs.go
View File

@@ -115,8 +115,7 @@ func (rdr *SQSER) processMessage(body []byte) (err error) {
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
return
}
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep)
cgrEv.Opts = config.NMAsMapInterface(agReq.Opts, utils.NestingSep)
cgrEv := config.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdr.rdrEvents <- &erEvent{
cgrEvent: cgrEv,
rdrCfg: rdr.Config(),