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 fwv reader and its it test

Browse Source
This commit is contained in:
ionutboangiu
2022-07-25 17:25:39 +03:00
committed by Dan Christian Bogos
parent d9487b6a74
commit c875f8b767
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/conf/samples/ers_internal/cgrates.json
View File

@@ -230,8 +230,9 @@
"run_delay": "-1",
"type": "*file_fwv",
"source_path": "/tmp/fwvErs/in",
"flags": ["*cdrs"],
"processed_path": "/tmp/fwvErs/out",
"flags": ["*cdrs"],
"filters": ["*regex:~*req.0-10:^CDR00000|^CDR00001|^CDR00002"],
"fields": [
{"tag": "FileName", "path": "*cgreq.CdrFileName", "type": "*variable", "value": "~*hdr.95-135", "padding":"*right"},
{"tag": "FileSeqNr", "path": "*cgreq.FileSeqNr", "type": "*variable", "value": "~*hdr.135-141", "padding":"*zeroleft"},

3
data/conf/samples/ers_mongo/cgrates.json
View File

@@ -232,8 +232,9 @@
"run_delay": "-1",
"type": "*file_fwv",
"source_path": "/tmp/fwvErs/in",
"flags": ["*cdrs"],
"processed_path": "/tmp/fwvErs/out",
"flags": ["*cdrs"],
"filters": ["*regex:~*req.0-10:^CDR00000|^CDR00001|^CDR00002"],
"fields": [
{"tag": "FileName", "path": "*cgreq.CdrFileName", "type": "*variable", "value": "~*hdr.95-135", "padding":"*right"},
{"tag": "FileSeqNr", "path": "*cgreq.FileSeqNr", "type": "*variable", "value": "~*hdr.135-141", "padding":"*zeroleft"},

3
data/conf/samples/ers_mysql/cgrates.json
View File

@@ -229,8 +229,9 @@
"run_delay": "-1",
"type": "*file_fwv",
"source_path": "/tmp/fwvErs/in",
"flags": ["*cdrs"],
"processed_path": "/tmp/fwvErs/out",
"flags": ["*cdrs"],
"filters": ["*regex:~*req.0-10:^CDR00000|^CDR00001|^CDR00002"],
"fields": [
{"tag": "FileName", "path": "*cgreq.CdrFileName", "type": "*variable", "value": "~*hdr.95-135", "padding":"*right"},
{"tag": "FileSeqNr", "path": "*cgreq.FileSeqNr", "type": "*variable", "value": "~*hdr.135-141", "padding":"*zeroleft"},

3
data/conf/samples/ers_postgres/cgrates.json
View File

@@ -226,8 +226,9 @@
"run_delay": "-1",
"type": "*file_fwv",
"source_path": "/tmp/fwvErs/in",
"flags": ["*cdrs"],
"processed_path": "/tmp/fwvErs/out",
"flags": ["*cdrs"],
"filters": ["*regex:~*req.0-10:^CDR00000|^CDR00001|^CDR00002"],
"fields": [
{"tag": "FileName", "path": "*cgreq.CdrFileName", "type": "*variable", "value": "~*hdr.95-135", "padding":"*right"},
{"tag": "FileSeqNr", "path": "*cgreq.FileSeqNr", "type": "*variable", "value": "~*hdr.135-141", "padding":"*zeroleft"},

7
ers/filefwv.go
View File

@@ -296,7 +296,7 @@ func (rdr *FWVFileER) processTrailer(file *os.File, rowNr, evsPosted int, absPat
record := string(buf)
rdr.trailerDP = config.NewFWVProvider(record)
agReq := agents.NewAgentRequest(
nil, nil, nil, nil, nil,
utils.MapStorage{}, nil, nil, nil, nil,
rdr.Config().Tenant,
rdr.cgrCfg.GeneralCfg().DefaultTenant,
utils.FirstNonEmpty(rdr.Config().Timezone,
@@ -338,9 +338,10 @@ func (rdr *FWVFileER) processHeader(file *os.File, rowNr, evsPosted int, absPath
}
func (rdr *FWVFileER) createHeaderMap(record string, rowNr, evsPosted int, absPath string, hdrFields []*config.FCTemplate) (err error) {
rdr.offset += rdr.headerOffset // increase the offset
rdr.headerDP = config.NewFWVProvider(record)
agReq := agents.NewAgentRequest(
nil, nil, nil, nil, nil,
utils.MapStorage{}, nil, nil, nil, nil,
rdr.Config().Tenant,
rdr.cgrCfg.GeneralCfg().DefaultTenant,
utils.FirstNonEmpty(rdr.Config().Timezone,
@@ -354,10 +355,8 @@ func (rdr *FWVFileER) createHeaderMap(record string, rowNr, evsPosted int, absPa
utils.Logger.Warning(
fmt.Sprintf("<%s> reading file: <%s> row <%d>, ignoring due to error: <%s>",
utils.ERs, absPath, rowNr, err.Error()))
rdr.offset += rdr.lineLen // increase the offset when exit
return err
}
rdr.offset += rdr.headerOffset // increase the offset
cgrEv := utils.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
rdrEv := rdr.rdrEvents
if _, isPartial := cgrEv.APIOpts[utils.PartialOpt]; isPartial {

2
ers/filefwv_it_test.go
View File

@@ -186,7 +186,7 @@ func testFWVITAnalyseCDRs(t *testing.T) {
var reply []*engine.ExternalCDR
if err := fwvRPC.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{}, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 34 {
} else if len(reply) != 29 {
t.Error("Unexpected number of CDRs returned: ", len(reply))
}
if err := fwvRPC.Call(utils.APIerSv2GetCDRs, &utils.RPCCDRsFilter{OriginIDs: []string{"CDR0000010"}}, &reply); err != nil {