From 2bfb234804578f1f319c36bbf23ecf4c927b72ae Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 14 Jan 2021 11:57:58 +0200 Subject: [PATCH] Update integration test in agents --- agents/diamagent.go | 3 +-- agents/dnsagent.go | 3 +-- agents/httpagent.go | 3 +-- agents/radagent.go | 3 +-- agents/sipagent.go | 3 +-- config/navigablemap.go | 3 ++- config/navigablemap_test.go | 8 ++++---- ers/amqp.go | 3 +-- ers/amqpv1.go | 3 +-- ers/filecsv.go | 3 +-- ers/filefwv.go | 9 +++------ ers/filejson.go | 3 +-- ers/filexml.go | 3 +-- ers/flatstore.go | 3 +-- ers/kafka.go | 3 +-- ers/partial_csv.go | 3 +-- ers/s3.go | 3 +-- ers/sql.go | 3 +-- ers/sqs.go | 3 +-- 19 files changed, 25 insertions(+), 43 deletions(-) diff --git a/agents/diamagent.go b/agents/diamagent.go index c9dca6dfb..dd87be829 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -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, diff --git a/agents/dnsagent.go b/agents/dnsagent.go index 07953e75a..ae8d445a6 100644 --- a/agents/dnsagent.go +++ b/agents/dnsagent.go @@ -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, diff --git a/agents/httpagent.go b/agents/httpagent.go index c61ed1ae0..ddcf5dc34 100644 --- a/agents/httpagent.go +++ b/agents/httpagent.go @@ -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, diff --git a/agents/radagent.go b/agents/radagent.go index d465576f1..ff2897b78 100644 --- a/agents/radagent.go +++ b/agents/radagent.go @@ -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, diff --git a/agents/sipagent.go b/agents/sipagent.go index ea946cb99..7e3aa2f66 100644 --- a/agents/sipagent.go +++ b/agents/sipagent.go @@ -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, /* diff --git a/config/navigablemap.go b/config/navigablemap.go index 59425ea37..713602d82 100644 --- a/config/navigablemap.go +++ b/config/navigablemap.go @@ -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 diff --git a/config/navigablemap_test.go b/config/navigablemap_test.go index bbddd7dea..a4b0edd7a 100644 --- a/config/navigablemap_test.go +++ b/config/navigablemap_test.go @@ -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)) diff --git a/ers/amqp.go b/ers/amqp.go index 827d171f7..7015af813 100644 --- a/ers/amqp.go +++ b/ers/amqp.go @@ -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(), diff --git a/ers/amqpv1.go b/ers/amqpv1.go index 514bf5429..539d22e7d 100644 --- a/ers/amqpv1.go +++ b/ers/amqpv1.go @@ -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(), diff --git a/ers/filecsv.go b/ers/filecsv.go index 290c9c1ec..09f9a23ac 100644 --- a/ers/filecsv.go +++ b/ers/filecsv.go @@ -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(), diff --git a/ers/filefwv.go b/ers/filefwv.go index b4bb0a1a2..8f15b3238 100644 --- a/ers/filefwv.go +++ b/ers/filefwv.go @@ -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(), diff --git a/ers/filejson.go b/ers/filejson.go index 24632ab11..4ecafdc6b 100644 --- a/ers/filejson.go +++ b/ers/filejson.go @@ -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(), diff --git a/ers/filexml.go b/ers/filexml.go index 2a1233224..81be93136 100644 --- a/ers/filexml.go +++ b/ers/filexml.go @@ -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(), diff --git a/ers/flatstore.go b/ers/flatstore.go index 949175109..69c0189a3 100644 --- a/ers/flatstore.go +++ b/ers/flatstore.go @@ -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(), diff --git a/ers/kafka.go b/ers/kafka.go index 6de521d30..ef583c643 100644 --- a/ers/kafka.go +++ b/ers/kafka.go @@ -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(), diff --git a/ers/partial_csv.go b/ers/partial_csv.go index 9eedecb3d..f0eb40e8f 100644 --- a/ers/partial_csv.go +++ b/ers/partial_csv.go @@ -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{ diff --git a/ers/s3.go b/ers/s3.go index 0e70be233..22f04651b 100644 --- a/ers/s3.go +++ b/ers/s3.go @@ -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(), diff --git a/ers/sql.go b/ers/sql.go index df5ff78f5..adf0fed55 100644 --- a/ers/sql.go +++ b/ers/sql.go @@ -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(), diff --git a/ers/sqs.go b/ers/sqs.go index 4587c00e7..b077e456d 100644 --- a/ers/sqs.go +++ b/ers/sqs.go @@ -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(),