From 4f9d5cb7e70581430e6c8c30ec7d89ec0e8cf72e Mon Sep 17 00:00:00 2001 From: TeoV Date: Mon, 13 Jan 2020 08:00:28 -0500 Subject: [PATCH] Add fwv type in event reader --- cdrc/fwv_it_test.go | 1 + config/config.go | 2 +- data/conf/samples/ers/cgrates.json | 36 +++++ ers/filecsv_it_test.go | 7 +- ers/filefwv.go | 84 ++++++++++-- ers/filefwv_it_test.go | 212 +++++++++++++++++++++++++++++ ers/filexml_it_test.go | 7 +- ers/reader.go | 4 +- 8 files changed, 333 insertions(+), 20 deletions(-) create mode 100644 ers/filefwv_it_test.go diff --git a/cdrc/fwv_it_test.go b/cdrc/fwv_it_test.go index 77ac27781..658278e0f 100644 --- a/cdrc/fwv_it_test.go +++ b/cdrc/fwv_it_test.go @@ -29,6 +29,7 @@ import ( "time" v1 "github.com/cgrates/cgrates/apier/v1" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" diff --git a/config/config.go b/config/config.go index 0ea376a0d..1df01728e 100755 --- a/config/config.go +++ b/config/config.go @@ -302,7 +302,7 @@ var posibleLoaderTypes = utils.NewStringSet([]string{utils.MetaAttributes, utils.MetaDispatchers, utils.MetaDispatcherHosts}) var possibleReaderTypes = utils.NewStringSet([]string{utils.MetaFileCSV, - utils.MetaKafkajsonMap, utils.MetaFileXML, utils.MetaSQL}) + utils.MetaKafkajsonMap, utils.MetaFileXML, utils.MetaSQL, utils.MetaFileFWV}) func (cfg *CGRConfig) LazySanityCheck() { for _, cdrePrfl := range cfg.cdrsCfg.OnlineCDRExports { diff --git a/data/conf/samples/ers/cgrates.json b/data/conf/samples/ers/cgrates.json index d9946cd2a..c2231125e 100644 --- a/data/conf/samples/ers/cgrates.json +++ b/data/conf/samples/ers/cgrates.json @@ -213,6 +213,42 @@ {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.broadWorksCDR.cdrData.basicModule.answerTime", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*usage_difference", "value": "~*req.broadWorksCDR.cdrData.basicModule.releaseTime;~*req.broadWorksCDR.cdrData.basicModule.answerTime", "mandatory": true} ], + }, + { + "id": "FWV1", + "run_delay": -1, + "type": "*file_fwv", + "source_path": "/tmp/fwvErs/in", + "flags": ["*cdrs"], + "processed_path": "/tmp/fwvErs/out", + "header_fields": [ + {"tag": "FileName", "field_id": "CdrFileName", "type": "*composed", "value": "~*req.95-135", "padding":"right"}, + {"tag": "FileSeqNr", "field_id": "FileSeqNr", "type": "*composed", "value": "~*req.135-141", "padding":"zeroleft"}, + {"tag": "AccId1", "field_id": "AccId1", "type": "*composed", "value": "~*req.135-141", "padding":"zeroleft"}, + ], + "content_fields": [ + {"tag": "Tor", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "rated", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0-10", "padding":"right", "mandatory": true}, + {"tag": "OriginHost", "field_id": "OriginHost", "type": "*constant", "value": "0.0.0.0", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*constant", "value": "cgrates.org", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.30-49", "padding":"right", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.30-49", "padding":"right", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.52-80", "padding":"right", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.14-30:s/(\\d{4})(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2})/${1}-${2}-${3} ${4}:${5}:${6}/", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.14-30:s/(\\d{4})(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2})/${1}-${2}-${3} ${4}:${5}:${6}/", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.127-135:s/(\\d{2})(\\d{2})(\\d{2})(\\d{2})/${1}h${2}m${3}s/", "mandatory": true}, + {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*variable", "value": "~*req.138-139", "mandatory": true}, + {"tag": "RetailAmount", "field_id": "RetailAmount", "type": "*variable", "value": "~*req.103-111", "padding":"zeroleft"}, + {"tag": "WholesaleAmount", "field_id": "RetailAmount", "type": "*variable", "value": "~*req.115-123", "padding":"zeroleft"}, + {"tag": "AccId1", "field_id": "AccId1", "type": "*variable", "value": "~*req.3-6", "padding":"zeroleft", "mandatory": true}, + {"tag": "AccId2", "field_id": "AccId2", "type": "*variable", "value": "~*req.14-30", "padding":"right", "mandatory": true}, + ], + "trailer_fields": [ + {"tag": "NrOfCdrs", "type": "metatag", "metatag_id":"total_cdrs", "value": "~*req.142-150"}, + {"tag": "TotalDuration", "type": "metatag", "metatag_id":"total_duration", "value": "~*req.150-162"}, + ], } ], }, diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go index 315ad4d26..2739c3509 100644 --- a/ers/filecsv_it_test.go +++ b/ers/filecsv_it_test.go @@ -113,7 +113,7 @@ func testCsvITCreateCdrDirs(t *testing.T) { "/tmp/ers2/in", "/tmp/ers2/out", "/tmp/init_session/in", "/tmp/init_session/out", "/tmp/terminate_session/in", "/tmp/terminate_session/out", "/tmp/cdrs/in", "/tmp/cdrs/out", "/tmp/ers_with_filters/in", "/tmp/ers_with_filters/out", - "/tmp/xmlErs/in", "/tmp/xmlErs/out"} { + "/tmp/xmlErs/in", "/tmp/xmlErs/out", "/tmp/fwvErs/in", "/tmp/fwvErs/out"} { if err := os.RemoveAll(dir); err != nil { t.Fatal("Error removing folder: ", dir, err) } @@ -335,9 +335,8 @@ func testCsvITProcessedFiles(t *testing.T) { func testCsvITCleanupFiles(t *testing.T) { for _, dir := range []string{"/tmp/ers", - "/tmp/ers2", "/tmp/init_session", - "/tmp/terminate_session", "/tmp/cdrs", - "/tmp/ers_with_filters"} { + "/tmp/ers2", "/tmp/init_session", "/tmp/terminate_session", + "/tmp/cdrs", "/tmp/ers_with_filters", "/tmp/xmlErs", "/tmp/fwvErs"} { if err := os.RemoveAll(dir); err != nil { t.Fatal("Error removing folder: ", dir, err) } diff --git a/ers/filefwv.go b/ers/filefwv.go index 21128e7a1..b69264e92 100644 --- a/ers/filefwv.go +++ b/ers/filefwv.go @@ -21,6 +21,7 @@ package ers import ( "bufio" "fmt" + "io" "io/ioutil" "os" "path" @@ -57,6 +58,7 @@ type FWVFileER struct { cgrCfg *config.CGRConfig cfgIdx int // index of config instance within ERsCfg.Readers fltrS *engine.FilterS + headerMap *config.NavigableMap rdrDir string rdrEvents chan *erEvent // channel to dispatch the events created to rdrError chan error @@ -134,30 +136,48 @@ func (rdr *FWVFileER) processFile(fPath, fName string) (err error) { cntFld := rdr.Config().ContentFields if rdr.offset == 0 { // First time, set the necessary offsets if err := rdr.setLineLen(file); err != nil { - utils.Logger.Err(fmt.Sprintf(" Row 0, error: cannot set lineLen: %s", err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Row 0, error: cannot set lineLen: %s", utils.ERs, err.Error())) + rdr.offset += rdr.lineLen // increase the offset when exit break } if len(rdr.Config().TrailerFields) != 0 { if fi, err := file.Stat(); err != nil { - utils.Logger.Err(fmt.Sprintf(" Row 0, error: cannot get file stats: %s", err.Error())) + utils.Logger.Err(fmt.Sprintf("<%s> Row 0, error: cannot get file stats: %s", utils.ERs, err.Error())) + rdr.offset += rdr.lineLen // increase the offset when exit return err } else { rdr.trailerOffset = fi.Size() - rdr.lineLen } } if len(rdr.Config().HeaderFields) != 0 { - buf := make([]byte, rdr.lineLen) - if nRead, err := file.Read(buf); err != nil { - return err - } else if nRead != len(buf) { - return fmt.Errorf("In header, line len: %d, have read: %d", rdr.lineLen, nRead) + if err = rdr.processHeader(file, rowNr, evsPosted, absPath); err != nil { + utils.Logger.Err(fmt.Sprintf("<%s> Row 0, error reading header: %s", utils.ERs, err.Error())) + return } - cntFld = rdr.Config().HeaderFields + continue } } + if rdr.trailerOffset != 0 && rdr.offset >= rdr.trailerOffset { + if err := rdr.processTrailer(file); err != nil && err != io.EOF { + utils.Logger.Err(fmt.Sprintf("<%s> Read trailer error: %s ", utils.ERs, err.Error())) + } + rdr.offset += rdr.lineLen // increase the offset when exit + break + } + buf := make([]byte, rdr.lineLen) + nRead, err := file.Read(buf) + if err != nil { + rdr.offset += rdr.lineLen // increase the offset when exit + return err + } else if nRead != len(buf) { + utils.Logger.Err(fmt.Sprintf("<%s> Could not read complete line, have instead: %s", utils.ERs, string(buf))) + rdr.offset += rdr.lineLen // increase the offset when exit + break + } rowNr++ // increment the rowNr after checking if it's not the end of file + record := string(buf) agReq := agents.NewAgentRequest( - config.NewFWVProvider("a", utils.EmptyString), reqVars, + config.NewFWVProvider(record, utils.EmptyString), reqVars, nil, nil, rdr.Config().Tenant, rdr.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(rdr.Config().Timezone, @@ -172,8 +192,14 @@ func (rdr *FWVFileER) processFile(fPath, fName string) (err error) { 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 continue } + //backwards compatible with CDRC + if rdr.headerMap != nil { + navMp.Merge(rdr.headerMap) + } + rdr.offset += rdr.lineLen // increase the offset rdr.rdrEvents <- &erEvent{cgrEvent: navMp.AsCGREvent( agReq.Tenant, utils.NestingSep), rdrCfg: rdr.Config()} @@ -217,3 +243,43 @@ func (rdr *FWVFileER) processTrailer(file *os.File) error { } return nil } + +func (rdr *FWVFileER) processHeader(file *os.File, rowNr, evsPosted int, absPath string) error { + buf := make([]byte, rdr.lineLen) + if nRead, err := file.Read(buf); err != nil { + return err + } else if nRead != len(buf) { + return fmt.Errorf("In header, line len: %d, have read: %d", rdr.lineLen, nRead) + } + return rdr.createHeaderMap(string(buf), rowNr, evsPosted, absPath) +} + +func (rdr *FWVFileER) createHeaderMap(record string, rowNr, evsPosted int, absPath string) (err error) { + reqVars := make(map[string]interface{}) + agReq := agents.NewAgentRequest( + config.NewFWVProvider(record, utils.EmptyString), reqVars, + nil, nil, rdr.Config().Tenant, + rdr.cgrCfg.GeneralCfg().DefaultTenant, + utils.FirstNonEmpty(rdr.Config().Timezone, + rdr.cgrCfg.GeneralCfg().DefaultTimezone), + rdr.fltrS) // create an AgentRequest + if pass, err := rdr.fltrS.Pass(agReq.Tenant, rdr.Config().Filters, + agReq); err != nil || !pass { + return nil + } + navMp, err := agReq.AsNavigableMap(rdr.Config().HeaderFields) + if err != nil { + 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.headerMap = navMp + rdr.offset += rdr.lineLen // increase the offset + rdr.rdrEvents <- &erEvent{cgrEvent: navMp.AsCGREvent( + agReq.Tenant, utils.NestingSep), + rdrCfg: rdr.Config()} + evsPosted++ + return +} diff --git a/ers/filefwv_it_test.go b/ers/filefwv_it_test.go new file mode 100644 index 000000000..ed1c8f108 --- /dev/null +++ b/ers/filefwv_it_test.go @@ -0,0 +1,212 @@ +// +build integration + +/* +Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +Copyright (C) ITsysCOM GmbH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see +*/ + +package ers + +import ( + "io/ioutil" + "net/rpc" + "os" + "path" + "testing" + "time" + + v1 "github.com/cgrates/cgrates/apier/v1" + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" +) + +var ( + fwvCfgPath string + fwvCfg *config.CGRConfig + fwvRPC *rpc.Client + + fwvTests = []func(t *testing.T){ + testFWVITCreateCdrDirs, + testFWVITInitConfig, + testFWVITInitCdrDb, + testFWVITResetDataDb, + testFWVITStartEngine, + testFWVITRpcConn, + testFWVITLoadTPFromFolder, + testFWVITHandleCdr1File, + testFWVITAnalyseCDRs, + testFWVITCleanupFiles, + testFWVITKillEngine, + } +) + +func TestFWVReadFile(t *testing.T) { + fwvCfgPath = path.Join(*dataDir, "conf", "samples", "ers") + for _, test := range fwvTests { + t.Run("TestFWVReadFile", test) + } +} + +func testFWVITCreateCdrDirs(t *testing.T) { + for _, dir := range []string{"/tmp/ers/in", "/tmp/ers/out", + "/tmp/ers2/in", "/tmp/ers2/out", "/tmp/init_session/in", "/tmp/init_session/out", + "/tmp/terminate_session/in", "/tmp/terminate_session/out", "/tmp/cdrs/in", + "/tmp/cdrs/out", "/tmp/ers_with_filters/in", "/tmp/ers_with_filters/out", + "/tmp/xmlErs/in", "/tmp/xmlErs/out", "/tmp/fwvErs/in", "/tmp/fwvErs/out"} { + if err := os.RemoveAll(dir); err != nil { + t.Fatal("Error removing folder: ", dir, err) + } + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal("Error creating folder: ", dir, err) + } + } +} + +func testFWVITInitConfig(t *testing.T) { + var err error + if fwvCfg, err = config.NewCGRConfigFromPath(fwvCfgPath); err != nil { + t.Fatal("Got config error: ", err.Error()) + } +} + +// InitDb so we can rely on count +func testFWVITInitCdrDb(t *testing.T) { + if err := engine.InitStorDb(fwvCfg); err != nil { + t.Fatal(err) + } +} + +// Remove data in both rating and accounting db +func testFWVITResetDataDb(t *testing.T) { + if err := engine.InitDataDb(fwvCfg); err != nil { + t.Fatal(err) + } +} + +func testFWVITStartEngine(t *testing.T) { + if _, err := engine.StopStartEngine(fwvCfgPath, *waitRater); err != nil { + t.Fatal(err) + } +} + +// Connect rpc client to rater +func testFWVITRpcConn(t *testing.T) { + var err error + fwvRPC, err = newRPCClient(fwvCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + if err != nil { + t.Fatal("Could not connect to rater: ", err.Error()) + } +} + +func testFWVITLoadTPFromFolder(t *testing.T) { + //add a default charger + chargerProfile := &v1.ChargerWithCache{ + ChargerProfile: &engine.ChargerProfile{ + Tenant: "cgrates.org", + ID: "Default", + RunID: utils.MetaDefault, + AttributeIDs: []string{"*none"}, + Weight: 20, + }, + } + var result string + if err := fwvRPC.Call(utils.ApierV1SetChargerProfile, chargerProfile, &result); err != nil { + t.Error(err) + } else if result != utils.OK { + t.Error("Unexpected reply returned", result) + } +} + +var fwvContent = `HDR0001DDB ABC Some Connect A.B. DDB-Some-10022-20120711-309.CDR 00030920120711100255 +CDR0000010 0 20120708181506000123451234 0040123123120 004 000018009980010001ISDN ABC 10Buiten uw regio EHV 00000009190000000009 +CDR0000020 0 20120708190945000123451234 0040123123120 004 000016009980010001ISDN ABC 10Buiten uw regio EHV 00000009190000000009 +CDR0000030 0 20120708191009000123451234 0040123123120 004 000020009980010001ISDN ABC 10Buiten uw regio EHV 00000009190000000009 +CDR0000040 0 20120708231043000123451234 0040123123120 004 000011009980010001ISDN ABC 10Buiten uw regio EHV 00000009190000000009 +CDR0000050 0 20120709122216000123451235 004212 004 000217009980010001ISDN ABC 10Buiten uw regio HMR 00000000190000000000 +CDR0000060 0 20120709130542000123451236 0012323453 004 000019009980010001ISDN ABC 35Sterdiensten AP 00000000190000000000 +CDR0000070 0 20120709140032000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000080 0 20120709140142000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000090 0 20120709150305000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000100 0 20120709150414000123451237 0040012323453100 001 000057009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000110 0 20120709150531000123451237 0040012323453100 001 000059009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000120 0 20120709150635000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000130 0 20120709151756000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000140 0 20120709154549000123451237 0040012323453100 001 000052009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000150 0 20120709154701000123451237 0040012323453100 001 000121009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000160 0 20120709154842000123451237 0040012323453100 001 000055009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000170 0 20120709154956000123451237 0040012323453100 001 000115009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000180 0 20120709155131000123451237 0040012323453100 001 000059009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000190 0 20120709155236000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000200 0 20120709160309000123451237 0040012323453100 001 000100009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000210 0 20120709160415000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000220 0 20120709161739000123451237 0040012323453100 001 000058009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000230 0 20120709170356000123123459 0040123234531 004 000012002760010001ISDN 276 10Buiten uw regio TB 00000009190000000009 +CDR0000240 0 20120709181036000123123450 0012323453 004 000042009980010001ISDN ABC 05Binnen uw regio AP 00000010190000000010 +CDR0000250 0 20120709191245000123123458 0040123232350 004 000012002760000001PSTN 276 10Buiten uw regio TB 00000009190000000009 +CDR0000260 0 20120709202324000123123459 0040123234531 004 000011002760010001ISDN 276 10Buiten uw regio TB 00000009190000000009 +CDR0000270 0 20120709211756000123451237 0040012323453100 001 000051009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000280 0 20120709211852000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000290 0 20120709212904000123123458 0040123232350 004 000012002760000001PSTN 276 10Buiten uw regio TB 00000009190000000009 +CDR0000300 0 20120709073707000123123459 0040123234531 004 000012002760010001ISDN 276 10Buiten uw regio TB 00000009190000000009 +CDR0000310 0 20120709085451000123451237 0040012323453100 001 000744009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000320 0 20120709091756000123451237 0040012323453100 001 000050009980030001ISDN ABD 20Internationaal NLB 00000000190000000000 +CDR0000330 0 20120710070434000123123458 0040123232350 004 000012002760000001PSTN 276 10Buiten uw regio TB 00000009190000000009 +TRL0001DDB ABC Some Connect A.B. DDB-Some-10022-20120711-309.CDR 0003090000003300000030550000000001000000000100Y +` + +// The default scenario, out of cdrc defined in .cfg file +func testFWVITHandleCdr1File(t *testing.T) { + fileName := "file1.xml" + tmpFilePath := path.Join("/tmp", fileName) + if err := ioutil.WriteFile(tmpFilePath, []byte(fwvContent), 0644); err != nil { + t.Fatal(err.Error()) + } + if err := os.Rename(tmpFilePath, path.Join("/tmp/fwvErs/in", fileName)); err != nil { + t.Fatal("Error moving file to processing directory: ", err) + } + time.Sleep(100 * time.Millisecond) +} + +func testFWVITAnalyseCDRs(t *testing.T) { + var reply []*engine.ExternalCDR + if err := fwvRPC.Call(utils.ApierV2GetCDRs, utils.RPCCDRsFilter{}, &reply); err != nil { + t.Error("Unexpected error: ", err.Error()) + } else if len(reply) != 4 { + t.Error("Unexpected number of CDRs returned: ", len(reply)) + } + if err := fwvRPC.Call(utils.ApierV2GetCDRs, utils.RPCCDRsFilter{OriginIDs: []string{"CDR0000010"}}, &reply); err != nil { + t.Error("Unexpected error: ", err.Error()) + } else if len(reply) != 1 { + t.Error("Unexpected number of CDRs returned: ", len(reply)) + } +} + +func testFWVITCleanupFiles(t *testing.T) { + for _, dir := range []string{"/tmp/ers", + "/tmp/ers2", "/tmp/init_session", "/tmp/terminate_session", + "/tmp/cdrs", "/tmp/ers_with_filters", "/tmp/xmlErs", "/tmp/fwvErs"} { + if err := os.RemoveAll(dir); err != nil { + t.Fatal("Error removing folder: ", dir, err) + } + } +} + +func testFWVITKillEngine(t *testing.T) { + if err := engine.KillEngine(*waitRater); err != nil { + t.Error(err) + } +} diff --git a/ers/filexml_it_test.go b/ers/filexml_it_test.go index 9fcbad22f..e5127a225 100644 --- a/ers/filexml_it_test.go +++ b/ers/filexml_it_test.go @@ -65,7 +65,7 @@ func testXMLITCreateCdrDirs(t *testing.T) { "/tmp/ers2/in", "/tmp/ers2/out", "/tmp/init_session/in", "/tmp/init_session/out", "/tmp/terminate_session/in", "/tmp/terminate_session/out", "/tmp/cdrs/in", "/tmp/cdrs/out", "/tmp/ers_with_filters/in", "/tmp/ers_with_filters/out", - "/tmp/xmlErs/in", "/tmp/xmlErs/out"} { + "/tmp/xmlErs/in", "/tmp/xmlErs/out", "/tmp/fwvErs/in", "/tmp/fwvErs/out"} { if err := os.RemoveAll(dir); err != nil { t.Fatal("Error removing folder: ", dir, err) } @@ -286,9 +286,8 @@ func testXmlITAnalyseCDRs(t *testing.T) { func testXMLITCleanupFiles(t *testing.T) { for _, dir := range []string{"/tmp/ers", - "/tmp/ers2", "/tmp/init_session", - "/tmp/terminate_session", "/tmp/cdrs", - "/tmp/ers_with_filters", "/tmp/xmlErs"} { + "/tmp/ers2", "/tmp/init_session", "/tmp/terminate_session", + "/tmp/cdrs", "/tmp/ers_with_filters", "/tmp/xmlErs", "/tmp/fwvErs"} { if err := os.RemoveAll(dir); err != nil { t.Fatal("Error removing folder: ", dir, err) } diff --git a/ers/reader.go b/ers/reader.go index 1f141f433..abd8c72ab 100644 --- a/ers/reader.go +++ b/ers/reader.go @@ -40,8 +40,8 @@ func NewEventReader(cfg *config.CGRConfig, cfgIdx int, err = fmt.Errorf("unsupported reader type: <%s>", cfg.ERsCfg().Readers[cfgIdx].Type) case utils.MetaFileCSV: return NewCSVFileER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) - //case utils.MetaFileXML: - // return NewXMLFileER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) + case utils.MetaFileXML: + return NewXMLFileER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) case utils.MetaFileFWV: return NewFWVFileERER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) case utils.MetaKafkajsonMap: