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

Finish implementation for ees *file_csv format

Browse Source
This commit is contained in:
TeoV
2020-06-01 16:55:36 +03:00
committed by Dan Christian Bogos
parent 50511c0eab
commit 31387e2fe2
14 changed files with 612 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config_defaults.go
View File

@@ -379,7 +379,7 @@ const CGRATES_CFG_JSON = `
{"tag": "SetupTime", "path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"},
{"tag": "AnswerTime", "path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"},
{"tag": "Usage", "path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"},
{"tag": "Cost", "path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4},
{"tag": "Cost", "path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost{*round:4}"},
],
},
],

9
config/config_json_test.go
View File

@@ -1956,11 +1956,10 @@ func TestDfEventExporterCfg(t *testing.T) {
Value: utils.StringPointer(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage),
},
{
Tag: utils.StringPointer(utils.Cost),
Path: utils.StringPointer("*exp.Cost"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.COST),
Rounding_decimals: utils.IntPointer(4),
Tag: utils.StringPointer(utils.Cost),
Path: utils.StringPointer("*exp.Cost"),
Type: utils.StringPointer(utils.MetaVariable),
Value: utils.StringPointer(utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.COST + "{*round:4}"),
},
}
eCfg := &EEsJsonCfg{

44
config/config_test.go
View File

@@ -1977,12 +1977,11 @@ func TestCgrCdfEventExporter(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
Fields: []*FCTemplate{
@@ -2078,12 +2077,11 @@ func TestCgrCdfEventExporter(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
headerFields: []*FCTemplate{},
@@ -2258,12 +2256,11 @@ func TestCgrCfgEventExporterDefault(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
Fields: []*FCTemplate{
@@ -2359,12 +2356,11 @@ func TestCgrCfgEventExporterDefault(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
headerFields: []*FCTemplate{},

22
config/eescfg_test.go
View File

@@ -256,12 +256,11 @@ func TestEventExporterSameID(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
contentFields: []*FCTemplate{
@@ -357,12 +356,11 @@ func TestEventExporterSameID(t *testing.T) {
Layout: time.RFC3339,
},
{
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
RoundingDecimals: utils.IntPointer(4),
Tag: utils.Cost,
Path: "*exp.Cost",
Type: utils.MetaVariable,
Value: NewRSRParsersMustCompile("~*req.Cost{*round:4}", true, utils.INFIELD_SEP),
Layout: time.RFC3339,
},
},
headerFields: []*FCTemplate{},