From e67db4a434d08d2c3693813e9bfbe63970442a2a Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Tue, 25 Mar 2014 16:42:45 +0100
Subject: [PATCH] Tests fixup for exporter

---
 apier/apier_local_test.go |  2 +-
 cdre/fixedwidth_test.go   | 56 +++++++++++++++++++--------------------
 config/xmlconfig_test.go  | 56 +++++++++++++++++++--------------------
 utils/apitpdata.go        |  8 +++---
 4 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go
index 92d775b54..6a2db505a 100644
--- a/apier/apier_local_test.go
+++ b/apier/apier_local_test.go
@@ -1344,7 +1344,7 @@ func TestExportCdrsToFile(t *testing.T) {
 		t.Error("Failed to detect missing parameter")
 	}
 	req.CdrFormat = utils.CDRE_DRYRUN
-	expectReply := &utils.ExportedFileCdrs{TotalRecords: 2}
+	expectReply := &utils.ExportedFileCdrs{ExportedFilePath: utils.CDRE_DRYRUN, TotalRecords: 2, ExportedCgrIds: []string{utils.FSCgrId("dsafdsaf"), utils.FSCgrId("adsafdsaf")}}
 	if err := rater.Call("ApierV1.ExportCdrsToFile", req, &reply); err != nil {
 		t.Error(err.Error())
 	} else if !reflect.DeepEqual(reply, expectReply) {
diff --git a/cdre/fixedwidth_test.go b/cdre/fixedwidth_test.go
index e8fadf963..20340b661 100644
--- a/cdre/fixedwidth_test.go
+++ b/cdre/fixedwidth_test.go
@@ -28,48 +28,48 @@ import (
 )
 
 var hdrCfgFlds = []*config.CgrXmlCfgCdrField{
-	&config.CgrXmlCfgCdrField{Name: "RecordType", Type: CONSTANT, Value: "10", Width: 2},
+	&config.CgrXmlCfgCdrField{Name: "TypeOfRecord", Type: CONSTANT, Value: "10", Width: 2},
 	&config.CgrXmlCfgCdrField{Name: "Filler1", Type: FILLER, Width: 3, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "NetworkProviderCode", Type: CONSTANT, Value: "VOI", Width: 3},
+	&config.CgrXmlCfgCdrField{Name: "DistributorCode", Type: CONSTANT, Value: "VOI", Width: 3},
 	&config.CgrXmlCfgCdrField{Name: "FileSeqNr", Type: METATAG, Value: "export_id", Width: 5, Strip: "right", Padding: "zeroleft"},
-	&config.CgrXmlCfgCdrField{Name: "CutOffTime", Type: METATAG, Value: "last_cdr_time", Width: 12, Layout: "020106150400"},
+	&config.CgrXmlCfgCdrField{Name: "LastCdr", Type: METATAG, Value: "last_cdr_time", Width: 12, Layout: "020106150400"},
 	&config.CgrXmlCfgCdrField{Name: "FileCreationfTime", Type: METATAG, Value: "time_now", Width: 12, Layout: "020106150400"},
-	&config.CgrXmlCfgCdrField{Name: "FileSpecificationVersion", Type: CONSTANT, Value: "01", Width: 2},
+	&config.CgrXmlCfgCdrField{Name: "FileVersion", Type: CONSTANT, Value: "01", Width: 2},
 	&config.CgrXmlCfgCdrField{Name: "Filler2", Type: FILLER, Width: 105, Padding: "right"},
 }
 
 var contentCfgFlds = []*config.CgrXmlCfgCdrField{
-	&config.CgrXmlCfgCdrField{Name: "RecordType", Type: CONSTANT, Value: "20", Width: 2},
-	&config.CgrXmlCfgCdrField{Name: "SIPTrunkID", Type: CDRFIELD, Value: utils.ACCOUNT, Width: 12, Strip: "left", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "ConnectionNumber", Type: CDRFIELD, Value: utils.SUBJECT, Width: 5, Strip: "right", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "ANumber", Type: CDRFIELD, Value: "cli", Width: 15, Strip: "xright", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "CalledNumber", Type: CDRFIELD, Value: utils.DESTINATION, Width: 24, Strip: "xright", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "ServiceType", Type: CONSTANT, Value: "02", Width: 2},
-	&config.CgrXmlCfgCdrField{Name: "ServiceIdentification", Type: CONSTANT, Value: "11", Width: 4, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "StartChargingDateTime", Type: CDRFIELD, Value: utils.SETUP_TIME, Width: 12, Strip: "right", Padding: "right", Layout: "020106150400"},
-	&config.CgrXmlCfgCdrField{Name: "ChargeableTime", Type: CDRFIELD, Value: utils.DURATION, Width: 6, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "TypeOfRecord", Type: CONSTANT, Value: "20", Width: 2},
+	&config.CgrXmlCfgCdrField{Name: "Account", Type: CDRFIELD, Value: utils.ACCOUNT, Width: 12, Strip: "left", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "Subject", Type: CDRFIELD, Value: utils.SUBJECT, Width: 5, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "CLI", Type: CDRFIELD, Value: "cli", Width: 15, Strip: "xright", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "Destination", Type: CDRFIELD, Value: utils.DESTINATION, Width: 24, Strip: "xright", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "TOR", Type: CONSTANT, Value: "02", Width: 2},
+	&config.CgrXmlCfgCdrField{Name: "SubtypeTOR", Type: CONSTANT, Value: "11", Width: 4, Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "SetupTime", Type: CDRFIELD, Value: utils.SETUP_TIME, Width: 12, Strip: "right", Padding: "right", Layout: "020106150400"},
+	&config.CgrXmlCfgCdrField{Name: "Duration", Type: CDRFIELD, Value: utils.DURATION, Width: 6, Strip: "right", Padding: "right"},
 	&config.CgrXmlCfgCdrField{Name: "DataVolume", Type: FILLER, Width: 6, Padding: "right"},
 	&config.CgrXmlCfgCdrField{Name: "TaxCode", Type: CONSTANT, Value: "1", Width: 1},
-	&config.CgrXmlCfgCdrField{Name: "OperatorTAPCode", Type: CDRFIELD, Value: "opertapcode", Width: 2, Strip: "right", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "ProductNumber", Type: CDRFIELD, Value: "productnumber", Width: 5, Strip: "right", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "NetworkSubtype", Type: CONSTANT, Value: "3", Width: 1},
-	&config.CgrXmlCfgCdrField{Name: "SessionID", Type: CDRFIELD, Value: utils.ACCID, Width: 16, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "VolumeUP", Type: FILLER, Width: 8, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "VolumeDown", Type: FILLER, Width: 8, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "TerminatingOperator", Type: CONCATENATED_CDRFIELD, Value: "tapcode,operatorcode", Width: 5, Strip: "right", Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "EndCharge", Type: CDRFIELD, Value: utils.COST, Width: 9, Padding: "zeroleft"},
-	&config.CgrXmlCfgCdrField{Name: "CallMaskingIndicator", Type: CDRFIELD, Value: "calledmask", Width: 1, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "OperatorCode", Type: CDRFIELD, Value: "opercode", Width: 2, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "ProductId", Type: CDRFIELD, Value: "productid", Width: 5, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "NetworkId", Type: CONSTANT, Value: "3", Width: 1},
+	&config.CgrXmlCfgCdrField{Name: "CallId", Type: CDRFIELD, Value: utils.ACCID, Width: 16, Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "Filler", Type: FILLER, Width: 8, Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "Filler", Type: FILLER, Width: 8, Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "TerminationCode", Type: CONCATENATED_CDRFIELD, Value: "operator,product", Width: 5, Strip: "right", Padding: "right"},
+	&config.CgrXmlCfgCdrField{Name: "Cost", Type: CDRFIELD, Value: utils.COST, Width: 9, Padding: "zeroleft"},
+	&config.CgrXmlCfgCdrField{Name: "DestinationPrivacy", Type: CDRFIELD, Value: "destination_privacy", Width: 1, Strip: "right", Padding: "right"},
 }
 
 var trailerCfgFlds = []*config.CgrXmlCfgCdrField{
-	&config.CgrXmlCfgCdrField{Name: "RecordType", Type: CONSTANT, Value: "90", Width: 2},
+	&config.CgrXmlCfgCdrField{Name: "TypeOfRecord", Type: CONSTANT, Value: "90", Width: 2},
 	&config.CgrXmlCfgCdrField{Name: "Filler1", Type: FILLER, Width: 3, Padding: "right"},
-	&config.CgrXmlCfgCdrField{Name: "NetworkProviderCode", Type: CONSTANT, Value: "VOI", Width: 3},
+	&config.CgrXmlCfgCdrField{Name: "DistributorCode", Type: CONSTANT, Value: "VOI", Width: 3},
 	&config.CgrXmlCfgCdrField{Name: "FileSeqNr", Type: METATAG, Value: META_EXPORTID, Width: 5, Strip: "right", Padding: "zeroleft"},
-	&config.CgrXmlCfgCdrField{Name: "TotalNrRecords", Type: METATAG, Value: META_NRCDRS, Width: 6, Padding: "zeroleft"},
-	&config.CgrXmlCfgCdrField{Name: "TotalDurRecords", Type: METATAG, Value: META_DURCDRS, Width: 8, Padding: "zeroleft"},
-	&config.CgrXmlCfgCdrField{Name: "EarliestCDRTime", Type: METATAG, Value: META_FIRSTCDRTIME, Width: 12, Layout: "020106150400"},
-	&config.CgrXmlCfgCdrField{Name: "LatestCDRTime", Type: METATAG, Value: META_LASTCDRTIME, Width: 12, Layout: "020106150400"},
+	&config.CgrXmlCfgCdrField{Name: "NumberOfRecords", Type: METATAG, Value: META_NRCDRS, Width: 6, Padding: "zeroleft"},
+	&config.CgrXmlCfgCdrField{Name: "CdrsDuration", Type: METATAG, Value: META_DURCDRS, Width: 8, Padding: "zeroleft"},
+	&config.CgrXmlCfgCdrField{Name: "FirstCdrTime", Type: METATAG, Value: META_FIRSTCDRTIME, Width: 12, Layout: "020106150400"},
+	&config.CgrXmlCfgCdrField{Name: "LastCdrTime", Type: METATAG, Value: META_LASTCDRTIME, Width: 12, Layout: "020106150400"},
 	&config.CgrXmlCfgCdrField{Name: "Filler2", Type: FILLER, Width: 93, Padding: "right"},
 }
 
diff --git a/config/xmlconfig_test.go b/config/xmlconfig_test.go
index 56ee6c43c..fbfb73cf7 100644
--- a/config/xmlconfig_test.go
+++ b/config/xmlconfig_test.go
@@ -31,50 +31,50 @@ func TestParseXmlConfig(t *testing.T) {
   <configuration section="cdre" type="fixed_width" id="CDRE-FW1">
    <header>
     <fields>
-     <field name="RecordType" type="constant" value="10" width="2"/>
+     <field name="TypeOfRecord" type="constant" value="10" width="2"/>
      <field name="Filler1" type="filler" width="3"/>
-     <field name="NetworkProviderCode" type="constant" value="VOI" width="3"/>
+     <field name="DistributorCode" type="constant" value="VOI" width="3"/>
      <field name="FileSeqNr" type="metatag" value="export_id" padding="zeroleft" width="5"/>
-     <field name="CutOffTime" type="metatag" value="last_cdr_time" layout="020106150400" width="12"/>
+     <field name="LastCdr" type="metatag" value="last_cdr_time" layout="020106150400" width="12"/>
      <field name="FileCreationfTime" type="metatag" value="time_now" layout="020106150400" width="12"/>
-     <field name="FileSpecificationVersion" type="constant" value="01" width="2"/>
+     <field name="Version" type="constant" value="01" width="2"/>
      <field name="Filler2" type="filler" width="105"/>
     </fields>
    </header>
    <content>
     <fields>
-     <field name="RecordType" type="constant" value="20" width="2"/>
-     <field name="SIPTrunkID" type="cdrfield" value="cgrid" width="12" mandatory="true"/>
-     <field name="ConnectionNumber" type="cdrfield" value="subject" strip="left" padding="left" width="5"/>
-     <field name="ANumber" type="cdrfield" value="cli" strip="xright" width="15"/>
-     <field name="CalledNumber" type="cdrfield" value="destination" strip="xright" width="24"/>
-     <field name="ServiceType" type="constant" value="02" width="2"/>
-     <field name="ServiceIdentification" type="constant" value="11" width="4"/>
-     <field name="StartChargingDateTime" type="cdrfield" value="start_time" layout="020106150400" width="12"/>
-     <field name="ChargeableTime" type="cdrfield" value="duration" width="6"/>
+     <field name="TypeOfRecord" type="constant" value="20" width="2"/>
+     <field name="Account" type="cdrfield" value="cgrid" width="12" mandatory="true"/>
+     <field name="Subject" type="cdrfield" value="subject" strip="left" padding="left" width="5"/>
+     <field name="CLI" type="cdrfield" value="cli" strip="xright" width="15"/>
+     <field name="Destination" type="cdrfield" value="destination" strip="xright" width="24"/>
+     <field name="TOR" type="constant" value="02" width="2"/>
+     <field name="SubtypeTOR" type="constant" value="11" width="4"/>
+     <field name="SetupTime" type="cdrfield" value="start_time" layout="020106150400" width="12"/>
+     <field name="Duration" type="cdrfield" value="duration" width="6"/>
      <field name="DataVolume" type="filler" width="6"/>
      <field name="TaxCode" type="constant" value="1" width="1"/>
-     <field name="OperatorTAPCode" type="cdrfield" value="opertapcode" width="2"/>
-     <field name="ProductNumber" type="cdrfield" value="productnumber" width="5"/>
-     <field name="NetworkSubtype" type="constant" value="3" width="1"/>
-     <field name="SessionID" type="cdrfield" value="accid" width="16"/>
-     <field name="VolumeUP" type="filler" width="8"/>
-     <field name="VolumeDown" type="filler" width="8"/>
-     <field name="TerminatingOperator" type="concatenated_cdrfield" value="tapcode,operatorcode" width="5"/>
-     <field name="EndCharge" type="cdrfield" value="cost" padding="zeroleft" width="9"/>
-     <field name="CallMaskingIndicator" type="cdrfield" value="calledmask" width="1"/>
+     <field name="OperatorCode" type="cdrfield" value="operator" width="2"/>
+     <field name="ProductId" type="cdrfield" value="productid" width="5"/>
+     <field name="NetworkId" type="constant" value="3" width="1"/>
+     <field name="CallId" type="cdrfield" value="accid" width="16"/>
+     <field name="Filler" type="filler" width="8"/>
+     <field name="Filler" type="filler" width="8"/>
+     <field name="TerminationCode" type="concatenated_cdrfield" value="operator,product" width="5"/>
+     <field name="Cost" type="cdrfield" value="cost" padding="zeroleft" width="9"/>
+     <field name="CalledMask" type="cdrfield" value="calledmask" width="1"/>
     </fields>
    </content>
    <trailer>
     <fields>
-     <field name="RecordType" type="constant" value="90" width="2"/>
+     <field name="TypeOfRecord" type="constant" value="90" width="2"/>
      <field name="Filler1" type="filler" width="3"/>
-     <field name="NetworkProviderCode" type="constant" value="VOI" width="3"/>
+     <field name="DistributorCode" type="constant" value="VOI" width="3"/>
      <field name="FileSeqNr" type="metatag" value="export_id" padding="zeroleft" width="5"/>
-     <field name="TotalNrRecords" type="metatag" value="cdrs_number" padding="zeroleft" width="6"/>
-     <field name="TotalDurRecords" type="metatag" value="cdrs_duration" padding="zeroleft" width="8"/>
-     <field name="EarliestCDRTime" type="metatag" value="first_cdr_time" layout="020106150400" width="12"/>
-     <field name="LatestCDRTime" type="metatag" value="last_cdr_time" layout="020106150400" width="12"/>
+     <field name="NumberOfRecords" type="metatag" value="cdrs_number" padding="zeroleft" width="6"/>
+     <field name="CdrsDuration" type="metatag" value="cdrs_duration" padding="zeroleft" width="8"/>
+     <field name="FirstCdrTime" type="metatag" value="first_cdr_time" layout="020106150400" width="12"/>
+     <field name="LastCdrTime" type="metatag" value="last_cdr_time" layout="020106150400" width="12"/>
      <field name="Filler1" type="filler" width="93"/>
     </fields>
    </trailer>
diff --git a/utils/apitpdata.go b/utils/apitpdata.go
index ee7adb5bd..3f0593b3c 100644
--- a/utils/apitpdata.go
+++ b/utils/apitpdata.go
@@ -338,10 +338,6 @@ type AttrExpFileCdrs struct {
 	SkipRated         bool     // Do not export rated CDRs
 }
 
-type AttrRemCdrs struct {
-	CgrIds []string // List of CgrIds to remove from storeDb
-}
-
 type ExportedFileCdrs struct {
 	ExportedFilePath string            // Full path to the newly generated export file
 	TotalRecords     int               // Number of CDRs to be exported
@@ -349,6 +345,10 @@ type ExportedFileCdrs struct {
 	UnexportedCgrIds map[string]string // Map of errored CDRs, map key is cgrid, value will be the error string
 }
 
+type AttrRemCdrs struct {
+	CgrIds []string // List of CgrIds to remove from storeDb
+}
+
 type AttrRateCdrs struct {
 	TimeStart    string // Cdrs time start
 	TimeEnd      string // Cdrs time end