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

Starting adding absolute path to cdre

Browse Source
This commit is contained in:
Trial97
2020-01-28 18:11:30 +02:00
committed by Dan Christian Bogos
parent a2dc836075
commit ab3fb01e7d
143 changed files with 5612 additions and 5509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/cdr.go
View File

@@ -458,6 +458,9 @@ func (cdr *CDR) AsExportRecord(exportFields []*config.FCTemplate,
nM := config.NewNavigableMap(nil)
nM.Set([]string{utils.MetaReq}, cdr.AsMapStringIface(), false, false)
for _, cfgFld := range exportFields {
if !strings.HasPrefix(cfgFld.Path, utils.MetaExp) {
continue
}
if pass, err := filterS.Pass(cdr.Tenant,
cfgFld.Filters, nM); err != nil {
return []string{}, err
@@ -495,7 +498,7 @@ func (cdr *CDR) AsExportMap(exportFields []*config.FCTemplate, httpSkipTLSCheck
err.Error(), utils.ToJSON(cfgFld), utils.ToJSON(cdr)))
return nil, err
}
expMap[cfgFld.FieldId] += fmtOut
expMap[cfgFld.Path] += fmtOut
}
return
}

107
engine/cdr_test.go
View File

@@ -674,8 +674,13 @@ func TestCDRAsExportRecord(t *testing.T) {
}
prsr := config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.Destination, true, utils.INFIELD_SEP)
cfgCdrFld := &config.FCTemplate{Tag: "destination", Type: utils.META_COMPOSED,
FieldId: utils.Destination, Value: prsr, Timezone: "UTC"}
cfgCdrFld := &config.FCTemplate{
Tag: "destination",
Path: "*exp.Destination",
Type: utils.META_COMPOSED,
Value: prsr,
Timezone: "UTC",
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != cdr.Destination {
@@ -686,8 +691,14 @@ func TestCDRAsExportRecord(t *testing.T) {
t.Error(err)
}
cfgCdrFld = &config.FCTemplate{Tag: "Destination", Type: utils.META_COMPOSED,
FieldId: utils.Destination, Value: prsr, MaskDestID: "MASKED_DESTINATIONS", MaskLen: 3}
cfgCdrFld = &config.FCTemplate{
Tag: "Destination",
Path: "*exp.Destination",
Type: utils.META_COMPOSED,
Value: prsr,
MaskDestID: "MASKED_DESTINATIONS",
MaskLen: 3,
}
eDst := "+4986517174***"
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
@@ -695,8 +706,13 @@ func TestCDRAsExportRecord(t *testing.T) {
t.Errorf("Expecting:\n%s\nReceived:\n%s", eDst, expRecord[0])
}
cfgCdrFld = &config.FCTemplate{Tag: "MaskedDest", Type: utils.MetaMaskedDestination,
Value: prsr, MaskDestID: "MASKED_DESTINATIONS"}
cfgCdrFld = &config.FCTemplate{
Tag: "MaskedDest",
Path: "*exp.MaskedDest",
Type: utils.MetaMaskedDestination,
Value: prsr,
MaskDestID: "MASKED_DESTINATIONS",
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != "1" {
@@ -705,8 +721,14 @@ func TestCDRAsExportRecord(t *testing.T) {
defaultCfg, _ := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, true, defaultCfg.DataDbCfg().Items)
dmForCDR := NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
cfgCdrFld = &config.FCTemplate{Tag: "destination", Type: utils.META_COMPOSED,
FieldId: utils.Destination, Value: prsr, Filters: []string{"*string:~*req.Tenant:itsyscom.com"}, Timezone: "UTC"}
cfgCdrFld = &config.FCTemplate{
Tag: "destination",
Path: "*exp.Destination",
Type: utils.META_COMPOSED,
Value: prsr,
Filters: []string{"*string:~*req.Tenant:itsyscom.com"},
Timezone: "UTC",
}
if rcrd, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, &FilterS{dm: dmForCDR, cfg: defaultCfg}); err != nil {
t.Error(err)
} else if len(rcrd) != 0 {
@@ -716,8 +738,14 @@ func TestCDRAsExportRecord(t *testing.T) {
// Test MetaDateTime
prsr = config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"stop_time", true, utils.INFIELD_SEP)
layout := "2006-01-02 15:04:05"
cfgCdrFld = &config.FCTemplate{Tag: "stop_time", Type: utils.MetaDateTime,
FieldId: "stop_time", Value: prsr, Layout: layout, Timezone: "UTC"}
cfgCdrFld = &config.FCTemplate{
Tag: "stop_time",
Type: utils.MetaDateTime,
Path: "*exp.stop_time",
Value: prsr,
Layout: layout,
Timezone: "UTC",
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, &FilterS{dm: dmForCDR, cfg: defaultCfg}); err != nil {
t.Error(err)
} else if expRecord[0] != "2014-06-11 19:19:00" {
@@ -725,9 +753,15 @@ func TestCDRAsExportRecord(t *testing.T) {
}
// Test filter
cfgCdrFld = &config.FCTemplate{Tag: "stop_time", Type: utils.MetaDateTime,
FieldId: "stop_time", Value: prsr, Filters: []string{"*string:~*req.Tenant:itsyscom.com"},
Layout: layout, Timezone: "UTC"}
cfgCdrFld = &config.FCTemplate{
Tag: "stop_time",
Type: utils.MetaDateTime,
Path: "*exp.stop_time",
Value: prsr,
Filters: []string{"*string:~*req.Tenant:itsyscom.com"},
Layout: layout,
Timezone: "UTC",
}
if rcrd, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, &FilterS{dm: dmForCDR, cfg: defaultCfg}); err != nil {
t.Error(err)
} else if len(rcrd) != 0 {
@@ -735,24 +769,37 @@ func TestCDRAsExportRecord(t *testing.T) {
}
prsr = config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"fieldextr2", true, utils.INFIELD_SEP)
cfgCdrFld = &config.FCTemplate{Tag: "stop_time", Type: utils.MetaDateTime,
FieldId: "stop_time", Value: prsr, Layout: layout, Timezone: "UTC"}
cfgCdrFld = &config.FCTemplate{
Tag: "stop_time",
Type: utils.MetaDateTime,
Path: "*exp.stop_time",
Value: prsr,
Layout: layout,
Timezone: "UTC"}
// Test time parse error
if _, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err == nil {
t.Error("Should give error here, got none.")
}
prsr = config.NewRSRParsersMustCompile("~CostDetails.CGRID", true, utils.INFIELD_SEP)
cfgCdrFld = &config.FCTemplate{Tag: "CGRIDFromCostDetails", Type: utils.META_COMPOSED,
FieldId: "CGRIDFromCostDetails", Value: prsr}
cfgCdrFld = &config.FCTemplate{
Tag: "CGRIDFromCostDetails",
Type: utils.META_COMPOSED,
Path: "*exp.CGRIDFromCostDetails",
Value: prsr,
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != cdr.CostDetails.CGRID {
t.Errorf("Expecting:\n%s\nReceived:\n%s", cdr.CostDetails.CGRID, expRecord)
}
prsr = config.NewRSRParsersMustCompile("~CostDetails.AccountSummary.ID", true, utils.INFIELD_SEP)
cfgCdrFld = &config.FCTemplate{Tag: "AccountID", Type: utils.META_COMPOSED,
FieldId: "CustomAccountID", Value: prsr}
cfgCdrFld = &config.FCTemplate{
Tag: "AccountID",
Type: utils.META_COMPOSED,
Path: "*exp.CustomAccountID",
Value: prsr,
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != cdr.CostDetails.AccountSummary.ID {
@@ -761,8 +808,12 @@ func TestCDRAsExportRecord(t *testing.T) {
expected := `{"3d99c91":{"DestinationID":"CustomDestination","DestinationPrefix":"26377","RatingPlanID":"RP_ZW_v1"}}`
prsr = config.NewRSRParsersMustCompile("~CostDetails.RatingFilters", true, utils.INFIELD_SEP)
cfgCdrFld = &config.FCTemplate{Tag: "DestinationID", Type: utils.META_COMPOSED,
FieldId: "CustomDestinationID", Value: prsr}
cfgCdrFld = &config.FCTemplate{
Tag: "DestinationID",
Type: utils.META_COMPOSED,
Path: "*exp.CustomDestinationID",
Value: prsr,
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != expected {
@@ -771,8 +822,12 @@ func TestCDRAsExportRecord(t *testing.T) {
expected = "RP_ZW_v1"
prsr = config.NewRSRParsersMustCompile("~CostDetails.RatingFilters:s/RatingPlanID\"\\s?\\:\\s?\"([^\"]*)\".*/$1/", true, utils.INFIELD_SEP)
cfgCdrFld = &config.FCTemplate{Tag: "DestinationID", Type: utils.META_COMPOSED,
FieldId: "CustomDestinationID", Value: prsr}
cfgCdrFld = &config.FCTemplate{
Tag: "DestinationID",
Type: utils.META_COMPOSED,
Path: "*exp.CustomDestinationID",
Value: prsr,
}
if expRecord, err := cdr.AsExportRecord([]*config.FCTemplate{cfgCdrFld}, false, nil, nil); err != nil {
t.Error(err)
} else if expRecord[0] != expected {
@@ -798,11 +853,11 @@ func TestCDRAsExportMap(t *testing.T) {
"FieldExtra1": "val_extr1",
}
expFlds := []*config.FCTemplate{
&config.FCTemplate{FieldId: utils.CGRID, Type: utils.META_COMPOSED,
&config.FCTemplate{Path: utils.CGRID, Type: utils.META_COMPOSED,
Value: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+utils.CGRID, true, utils.INFIELD_SEP)},
&config.FCTemplate{FieldId: utils.Destination, Type: utils.META_COMPOSED,
&config.FCTemplate{Path: utils.Destination, Type: utils.META_COMPOSED,
Value: config.NewRSRParsersMustCompile("~Destination:s/^\\+(\\d+)$/00${1}/", true, utils.INFIELD_SEP)},
&config.FCTemplate{FieldId: "FieldExtra1", Type: utils.META_COMPOSED,
&config.FCTemplate{Path: "FieldExtra1", Type: utils.META_COMPOSED,
Value: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"field_extr1", true, utils.INFIELD_SEP)},
}
if cdrMp, err := cdr.AsExportMap(expFlds, false, nil, nil); err != nil {

47
engine/cdre.go
View File

@@ -29,6 +29,7 @@ import (
"path"
"path/filepath"
"strconv"
"strings"
"sync"
"time"
@@ -143,7 +144,10 @@ func (cdre *CDRExporter) metaHandler(tag, arg string) (string, error) {
// Compose and cache the header
func (cdre *CDRExporter) composeHeader() (err error) {
for _, cfgFld := range cdre.exportTemplate.HeaderFields {
for _, cfgFld := range cdre.exportTemplate.Fields {
if !strings.HasPrefix(cfgFld.Path, utils.MetaHdr) {
continue
}
if len(cfgFld.Filters) != 0 {
//check filter if pass
}
@@ -189,7 +193,10 @@ func (cdre *CDRExporter) composeHeader() (err error) {
// Compose and cache the trailer
func (cdre *CDRExporter) composeTrailer() (err error) {
for _, cfgFld := range cdre.exportTemplate.TrailerFields {
for _, cfgFld := range cdre.exportTemplate.Fields {
if !strings.HasPrefix(cfgFld.Path, utils.MetaTrl) {
continue
}
if len(cfgFld.Filters) != 0 {
//check filter if pass
}
@@ -242,7 +249,7 @@ func (cdre *CDRExporter) postCdr(cdr *CDR) (err error) {
}
case utils.MetaHTTPjsonMap, utils.MetaAMQPjsonMap, utils.MetaAMQPV1jsonMap, utils.MetaSQSjsonMap, utils.MetaKafkajsonMap, utils.MetaS3jsonMap:
var expMp map[string]string
if expMp, err = cdr.AsExportMap(cdre.exportTemplate.ContentFields, cdre.httpSkipTLSCheck, nil, cdre.filterS); err != nil {
if expMp, err = cdr.AsExportMap(cdre.exportTemplate.Fields, cdre.httpSkipTLSCheck, nil, cdre.filterS); err != nil {
return
}
if body, err = json.Marshal(expMp); err != nil {
@@ -250,7 +257,7 @@ func (cdre *CDRExporter) postCdr(cdr *CDR) (err error) {
}
case utils.MetaHTTPPost:
var expMp map[string]string
if expMp, err = cdr.AsExportMap(cdre.exportTemplate.ContentFields, cdre.httpSkipTLSCheck, nil, cdre.filterS); err != nil {
if expMp, err = cdr.AsExportMap(cdre.exportTemplate.Fields, cdre.httpSkipTLSCheck, nil, cdre.filterS); err != nil {
return
}
vals := url.Values{}
@@ -321,7 +328,7 @@ func (cdre *CDRExporter) processCDR(cdr *CDR) (err error) {
switch cdre.exportFormat {
case utils.MetaFileFWV, utils.MetaFileCSV:
var cdrRow []string
cdrRow, err = cdr.AsExportRecord(cdre.exportTemplate.ContentFields, cdre.httpSkipTLSCheck, cdre.cdrs, cdre.filterS)
cdrRow, err = cdr.AsExportRecord(cdre.exportTemplate.Fields, cdre.httpSkipTLSCheck, cdre.cdrs, cdre.filterS)
if len(cdrRow) == 0 && err == nil { // No CDR data, most likely no configuration fields defined
return
}
@@ -373,25 +380,23 @@ func (cdre *CDRExporter) processCDR(cdr *CDR) (err error) {
return
}
// Builds header, content and trailers
// processCDRs proccess every cdr
func (cdre *CDRExporter) processCDRs() (err error) {
var wg sync.WaitGroup
isSync := cdre.exportTemplate.Synchronous ||
utils.SliceHasMember([]string{utils.MetaFileCSV, utils.MetaFileFWV}, cdre.exportTemplate.ExportFormat)
for _, cdr := range cdre.cdrs {
if cdr == nil || len(cdr.CGRID) == 0 { // CDR needs to exist and it's CGRID needs to be populated
continue
}
if len(cdre.exportTemplate.Filters) != 0 {
if cdre.exportTemplate.Tenant == "" {
cdre.exportTemplate.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
}
cgrDp := config.NewNavigableMap(map[string]interface{}{utils.MetaReq: cdr.AsMapStringIface()})
if pass, err := cdre.filterS.Pass(cdre.exportTemplate.Tenant,
cdre.exportTemplate.Filters, cgrDp); err != nil || !pass {
continue // Not passes filters, ignore this CDR
}
}
if cdre.synchronous ||
utils.SliceHasMember([]string{utils.MetaFileCSV, utils.MetaFileFWV}, cdre.exportFormat) {
if isSync {
wg.Add(1) // wait for synchronous or file ones since these need to be done before continuing
}
go func(cdre *CDRExporter, cdr *CDR) {
@@ -404,24 +409,12 @@ func (cdre *CDRExporter) processCDRs() (err error) {
cdre.positiveExports = append(cdre.positiveExports, cdr.CGRID)
cdre.Unlock()
}
if cdre.synchronous ||
utils.SliceHasMember([]string{utils.MetaFileCSV, utils.MetaFileFWV}, cdre.exportFormat) {
if isSync {
wg.Done()
}
}(cdre, cdr)
}
wg.Wait()
// Process header and trailer after processing cdrs since the metatag functions can access stats out of built cdrs
if cdre.exportTemplate.HeaderFields != nil {
if err = cdre.composeHeader(); err != nil {
return
}
}
if cdre.exportTemplate.TrailerFields != nil {
if err = cdre.composeTrailer(); err != nil {
return
}
}
return
}
@@ -489,6 +482,12 @@ func (cdre *CDRExporter) ExportCDRs() (err error) {
if contLen == 0 {
return
}
if err = cdre.composeHeader(); err != nil {
return
}
if err = cdre.composeTrailer(); err != nil {
return
}
var expFormat string
switch cdre.exportFormat {
case utils.MetaFileFWV:

18
engine/cdrecsv_test.go
View File

@@ -52,6 +52,12 @@ func TestCsvCdrWriter(t *testing.T) {
if err = cdre.processCDRs(); err != nil {
t.Error(err)
}
if err = cdre.composeHeader(); err != nil {
t.Error(err)
}
if err = cdre.composeTrailer(); err != nil {
t.Error(err)
}
csvWriter := csv.NewWriter(writer)
if err := cdre.writeCsv(csvWriter); err != nil {
t.Error("Unexpected error: ", err)
@@ -90,6 +96,12 @@ func TestAlternativeFieldSeparator(t *testing.T) {
if err = cdre.processCDRs(); err != nil {
t.Error(err)
}
if err = cdre.composeHeader(); err != nil {
t.Error(err)
}
if err = cdre.composeTrailer(); err != nil {
t.Error(err)
}
csvWriter := csv.NewWriter(writer)
if err := cdre.writeCsv(csvWriter); err != nil {
t.Error("Unexpected error: ", err)
@@ -108,7 +120,7 @@ func TestExportVoiceWithConvert(t *testing.T) {
writer := &bytes.Buffer{}
cfg, _ := config.NewDefaultCGRConfig()
cdreCfg := cfg.CdreProfiles[utils.MetaDefault]
cdreCfg.ContentFields = []*config.FCTemplate{
cdreCfg.Fields = []*config.FCTemplate{
{Tag: "ToR", Type: "*composed",
Value: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"ToR", true, utils.INFIELD_SEP)},
{Tag: "OriginID", Type: "*composed",
@@ -205,7 +217,7 @@ func TestExportWithFilter(t *testing.T) {
cfg, _ := config.NewDefaultCGRConfig()
cdreCfg := cfg.CdreProfiles[utils.MetaDefault]
cdreCfg.Filters = []string{"*string:~*req.Tenant:cgrates.org"}
cdreCfg.ContentFields = []*config.FCTemplate{
cdreCfg.Fields = []*config.FCTemplate{
{Tag: "ToR", Type: "*composed",
Value: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"ToR", true, utils.INFIELD_SEP)},
{Tag: "OriginID", Type: "*composed",
@@ -301,7 +313,7 @@ func TestExportWithFilter2(t *testing.T) {
cfg, _ := config.NewDefaultCGRConfig()
cdreCfg := cfg.CdreProfiles[utils.MetaDefault]
cdreCfg.Filters = []string{"*string:~*req.Tenant:cgrates.org", "*lte:~*req.Cost:0.5"}
cdreCfg.ContentFields = []*config.FCTemplate{
cdreCfg.Fields = []*config.FCTemplate{
{Tag: "ToR", Type: "*composed",
Value: config.NewRSRParsersMustCompile(utils.DynamicDataPrefix+"ToR", true, utils.INFIELD_SEP)},
{Tag: "OriginID", Type: "*composed",

71
engine/cdrefwv_test.go
View File

@@ -27,23 +27,27 @@ import (
"github.com/cgrates/cgrates/utils"
)
var hdrJsnCfgFlds = []*config.FcTemplateJsonCfg{
var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
{
Tag: utils.StringPointer("TypeOfRecord"),
Path: utils.StringPointer("*hdr.TypeOfRecord"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("10"),
Width: utils.IntPointer(2)},
{
Tag: utils.StringPointer("Filler1"),
Path: utils.StringPointer("*hdr.Filler1"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(3)},
{
Tag: utils.StringPointer("DistributorCode"),
Path: utils.StringPointer("*hdr.DistributorCode"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("VOI"),
Width: utils.IntPointer(3)},
{
Tag: utils.StringPointer("FileSeqNr"),
Path: utils.StringPointer("*hdr.FileSeqNr"),
Type: utils.StringPointer(utils.META_HANDLER),
Value: utils.StringPointer(metaExportID),
Width: utils.IntPointer(5),
@@ -51,35 +55,38 @@ var hdrJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("zeroleft")},
{
Tag: utils.StringPointer("LastCdr"),
Path: utils.StringPointer("*hdr.LastCdr"),
Type: utils.StringPointer(utils.META_HANDLER),
Width: utils.IntPointer(12),
Value: utils.StringPointer(metaLastCDRAtime),
Layout: utils.StringPointer("020106150400")},
{
Tag: utils.StringPointer("FileCreationfTime"),
Path: utils.StringPointer("*hdr.FileCreationfTime"),
Type: utils.StringPointer(utils.META_HANDLER),
Value: utils.StringPointer(metaTimeNow),
Width: utils.IntPointer(12),
Layout: utils.StringPointer("020106150400")},
{
Tag: utils.StringPointer("FileVersion"),
Path: utils.StringPointer("*hdr.FileVersion"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("01"),
Width: utils.IntPointer(2)},
{
Tag: utils.StringPointer("Filler2"),
Path: utils.StringPointer("*hdr.Filler2"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(105)},
}
var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
{
Tag: utils.StringPointer("TypeOfRecord"),
Path: utils.StringPointer("*exp.TypeOfRecord"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("20"),
Width: utils.IntPointer(2)},
{
Tag: utils.StringPointer("Account"),
Path: utils.StringPointer("*exp.Account"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.Account),
Width: utils.IntPointer(12),
@@ -87,6 +94,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("Subject"),
Path: utils.StringPointer("*exp.Subject"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.Subject),
Width: utils.IntPointer(5),
@@ -94,6 +102,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("CLI"),
Path: utils.StringPointer("*exp.CLI"),
Type: utils.StringPointer(utils.META_COMPOSED),
Width: utils.IntPointer(15),
Value: utils.StringPointer("cli"),
@@ -101,6 +110,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("Destination"),
Path: utils.StringPointer("*exp.Destination"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.Destination),
Width: utils.IntPointer(24),
@@ -108,17 +118,20 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("ToR"),
Path: utils.StringPointer("*exp.ToR"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("02"),
Width: utils.IntPointer(2)},
{
Tag: utils.StringPointer("SubtypeTOR"),
Path: utils.StringPointer("*exp.SubtypeTOR"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("11"),
Padding: utils.StringPointer("right"),
Width: utils.IntPointer(4)},
{
Tag: utils.StringPointer("SetupTime"),
Path: utils.StringPointer("*exp.SetupTime"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.SetupTime),
Width: utils.IntPointer(12),
@@ -127,6 +140,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Layout: utils.StringPointer("020106150400")},
{
Tag: utils.StringPointer("Duration"),
Path: utils.StringPointer("*exp.Duration"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.Usage),
Width: utils.IntPointer(6),
@@ -135,15 +149,18 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Layout: utils.StringPointer(utils.SECONDS)},
{
Tag: utils.StringPointer("DataVolume"),
Path: utils.StringPointer("*exp.DataVolume"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(6)},
{
Tag: utils.StringPointer("TaxCode"),
Path: utils.StringPointer("*exp.TaxCode"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("1"),
Width: utils.IntPointer(1)},
{
Tag: utils.StringPointer("OperatorCode"),
Path: utils.StringPointer("*exp.OperatorCode"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("opercode"),
Width: utils.IntPointer(2),
@@ -151,6 +168,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("ProductId"),
Path: utils.StringPointer("*exp.ProductId"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~productid"),
Width: utils.IntPointer(5),
@@ -158,25 +176,30 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("NetworkId"),
Path: utils.StringPointer("*exp.NetworkId"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("3"),
Width: utils.IntPointer(1)},
{
Tag: utils.StringPointer("CallId"),
Path: utils.StringPointer("*exp.CallId"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~" + utils.OriginID),
Width: utils.IntPointer(16),
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("Filler"),
Path: utils.StringPointer("*exp.Filler"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(8)},
{
Tag: utils.StringPointer("Filler"),
Path: utils.StringPointer("*exp.Filler"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(8)},
{
Tag: utils.StringPointer("TerminationCode"),
Path: utils.StringPointer("*exp.TerminationCode"),
Type: utils.StringPointer(utils.META_COMPOSED),
Value: utils.StringPointer("~operator;~product"),
Width: utils.IntPointer(5),
@@ -184,6 +207,7 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("right")},
{
Tag: utils.StringPointer("Cost"),
Path: utils.StringPointer("*exp.Cost"),
Type: utils.StringPointer(utils.META_COMPOSED),
Width: utils.IntPointer(9),
Value: utils.StringPointer("~" + utils.COST),
@@ -191,27 +215,29 @@ var contentJsnCfgFlds = []*config.FcTemplateJsonCfg{
Rounding_decimals: utils.IntPointer(5)},
{
Tag: utils.StringPointer("DestinationPrivacy"),
Path: utils.StringPointer("*exp.DestinationPrivacy"),
Type: utils.StringPointer(utils.MetaMaskedDestination),
Width: utils.IntPointer(1)},
}
var trailerJsnCfgFlds = []*config.FcTemplateJsonCfg{
{
Tag: utils.StringPointer("TypeOfRecord"),
Path: utils.StringPointer("*trl.TypeOfRecord"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("90"),
Width: utils.IntPointer(2)},
{
Tag: utils.StringPointer("Filler1"),
Path: utils.StringPointer("*trl.Filler1"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(3)},
{
Tag: utils.StringPointer("DistributorCode"),
Path: utils.StringPointer("*trl.DistributorCode"),
Type: utils.StringPointer(utils.META_CONSTANT),
Value: utils.StringPointer("VOI"),
Width: utils.IntPointer(3)},
{
Tag: utils.StringPointer("FileSeqNr"),
Path: utils.StringPointer("*trl.FileSeqNr"),
Type: utils.StringPointer(utils.META_HANDLER),
Value: utils.StringPointer(metaExportID),
Width: utils.IntPointer(5),
@@ -219,12 +245,14 @@ var trailerJsnCfgFlds = []*config.FcTemplateJsonCfg{
Padding: utils.StringPointer("zeroleft")},
{
Tag: utils.StringPointer("NumberOfRecords"),
Path: utils.StringPointer("*trl.NumberOfRecords"),
Type: utils.StringPointer(utils.META_HANDLER),
Value: utils.StringPointer(metaNrCDRs),
Width: utils.IntPointer(6),
Padding: utils.StringPointer("zeroleft")},
{
Tag: utils.StringPointer("CdrsDuration"),
Path: utils.StringPointer("*trl.CdrsDuration"),
Type: utils.StringPointer(utils.META_HANDLER),
Value: utils.StringPointer(metaDurCDRs),
Width: utils.IntPointer(8),
@@ -232,43 +260,38 @@ var trailerJsnCfgFlds = []*config.FcTemplateJsonCfg{
Layout: utils.StringPointer(utils.SECONDS)},
{
Tag: utils.StringPointer("FirstCdrTime"),
Path: utils.StringPointer("*trl.FirstCdrTime"),
Type: utils.StringPointer(utils.META_HANDLER),
Width: utils.IntPointer(12),
Value: utils.StringPointer(metaFirstCDRAtime),
Layout: utils.StringPointer("020106150400")},
{
Tag: utils.StringPointer("LastCdrTime"),
Path: utils.StringPointer("*trl.LastCdrTime"),
Type: utils.StringPointer(utils.META_HANDLER),
Width: utils.IntPointer(12),
Value: utils.StringPointer(metaLastCDRAtime),
Layout: utils.StringPointer("020106150400")},
{
Tag: utils.StringPointer("Filler2"),
Path: utils.StringPointer("*trl.Filler2"),
Type: utils.StringPointer(utils.META_FILLER),
Width: utils.IntPointer(93)},
}
var hdrCfgFlds, contentCfgFlds, trailerCfgFlds []*config.FCTemplate
var contentCfgFlds []*config.FCTemplate
// Write one CDR and test it's results only for content buffer
func TestWriteCdr(t *testing.T) {
var err error
wrBuf := &bytes.Buffer{}
cfg, _ := config.NewDefaultCGRConfig()
if hdrCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(hdrJsnCfgFlds, utils.INFIELD_SEP); err != nil {
t.Error(err)
}
if contentCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(contentJsnCfgFlds, utils.INFIELD_SEP); err != nil {
t.Error(err)
}
if trailerCfgFlds, err = config.FCTemplatesFromFCTemplatesJsonCfg(trailerJsnCfgFlds, utils.INFIELD_SEP); err != nil {
t.Error(err)
}
cdreCfg := &config.CdreCfg{
ExportFormat: utils.MetaFileFWV,
HeaderFields: hdrCfgFlds,
ContentFields: contentCfgFlds,
TrailerFields: trailerCfgFlds,
ExportFormat: utils.MetaFileFWV,
Fields: contentCfgFlds,
}
cdr := &CDR{
CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()),
@@ -290,6 +313,12 @@ func TestWriteCdr(t *testing.T) {
if err = cdre.processCDRs(); err != nil {
t.Error(err)
}
if err = cdre.composeHeader(); err != nil {
t.Error(err)
}
if err = cdre.composeTrailer(); err != nil {
t.Error(err)
}
eHeader := "10 VOIfwv_107111308420018011511340001 \n"
eContentOut := "201001 1001 1002 0211 07111308420010 1 3dsafdsaf 0002.34570\n"
eTrailer := "90 VOIfwv_100000100000010071113084200071113084200 \n"
@@ -332,10 +361,8 @@ func TestWriteCdr(t *testing.T) {
func TestWriteCdrs(t *testing.T) {
wrBuf := &bytes.Buffer{}
cdreCfg := &config.CdreCfg{
ExportFormat: utils.MetaFileFWV,
HeaderFields: hdrCfgFlds,
ContentFields: contentCfgFlds,
TrailerFields: trailerCfgFlds,
ExportFormat: utils.MetaFileFWV,
Fields: contentCfgFlds,
}
cdr1 := &CDR{CGRID: utils.Sha1("aaa1", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()),
ToR: utils.VOICE, OrderID: 2, OriginID: "aaa1", OriginHost: "192.168.1.1",