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

Renaming utils.USAGE -> utils.Usage

Browse Source
This commit is contained in:
TeoV
2017-12-13 17:50:46 +02:00
committed by Dan Christian Bogos
parent 278a930b18
commit a3adcc1702
40 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/calldesc.go
View File

@@ -180,7 +180,7 @@ func (cd *CallDescriptor) AsCGREvent() *utils.CGREvent {
cgrEv.Event[utils.SUBJECT] = cd.Subject
cgrEv.Event[utils.Destination] = cd.Destination
cgrEv.Event[utils.ANSWER_TIME] = cd.TimeStart
cgrEv.Event[utils.USAGE] = cd.TimeEnd.Sub(cd.TimeStart)
cgrEv.Event[utils.Usage] = cd.TimeEnd.Sub(cd.TimeStart)
return cgrEv
}
@@ -218,7 +218,7 @@ func (cd *CallDescriptor) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []str
if cd.TimeStart, err = cgrEv.FieldAsTime(fldName, config.CgrConfig().DefaultTimezone); err != nil {
return
}
case utils.USAGE:
case utils.Usage:
usage, err := cgrEv.FieldAsDuration(fldName)
if err != nil {
return err

16
engine/cdr.go
View File

@@ -174,7 +174,7 @@ func (cdr *CDR) FieldAsString(rsrFld *utils.RSRField) string {
return rsrFld.ParseValue(cdr.SetupTime.Format(time.RFC3339))
case utils.ANSWER_TIME:
return rsrFld.ParseValue(cdr.AnswerTime.Format(time.RFC3339))
case utils.USAGE:
case utils.Usage:
return cdr.Usage.String()
case utils.MEDI_RUNID:
return rsrFld.ParseValue(cdr.RunID)
@@ -227,7 +227,7 @@ func (cdr *CDR) ParseFieldValue(fieldId, fieldVal, timezone string) error {
if cdr.AnswerTime, err = utils.ParseTimeDetectLayout(fieldVal, timezone); err != nil {
return fmt.Errorf("Cannot parse answer time field with value: %s, err: %s", fieldVal, err.Error())
}
case utils.USAGE:
case utils.Usage:
if cdr.Usage, err = utils.ParseDurationWithNanosecs(fieldVal); err != nil {
return fmt.Errorf("Cannot parse duration field with value: %s, err: %s", fieldVal, err.Error())
}
@@ -318,7 +318,7 @@ func (cdr *CDR) ForkCdr(runId string, RequestTypeFld, tenantFld, categFld, accou
durationFld, _ = utils.NewRSRField(utils.META_DEFAULT)
}
if durationFld.Id == utils.META_DEFAULT {
durationFld.Id = utils.USAGE
durationFld.Id = utils.Usage
}
if ratedFld == nil {
ratedFld, _ = utils.NewRSRField(utils.META_DEFAULT)
@@ -379,7 +379,7 @@ func (cdr *CDR) ForkCdr(runId string, RequestTypeFld, tenantFld, categFld, accou
}
durStr := cdr.FieldAsString(durationFld)
if primaryMandatory && len(durStr) == 0 {
return nil, utils.NewErrMandatoryIeMissing(utils.USAGE, durationFld.Id)
return nil, utils.NewErrMandatoryIeMissing(utils.Usage, durationFld.Id)
} else if frkStorCdr.Usage, err = utils.ParseDurationWithNanosecs(durStr); err != nil {
return nil, err
}
@@ -545,7 +545,7 @@ func (cdr *CDR) GetEndTime(fieldName, timezone string) (time.Time, error) {
return cdr.AnswerTime.Add(cdr.Usage), nil
}
func (cdr *CDR) GetDuration(fieldName string) (time.Duration, error) {
if utils.IsSliceMember([]string{utils.USAGE, utils.META_DEFAULT, ""}, fieldName) {
if utils.IsSliceMember([]string{utils.Usage, utils.META_DEFAULT, ""}, fieldName) {
return cdr.Usage, nil
}
var durVal string
@@ -620,7 +620,7 @@ func (cdr *CDR) exportFieldValue(cfgCdrFld *config.CfgCdrField) (string, error)
switch rsrFld.Id {
case utils.COST:
cdrVal = cdr.FormatCost(cfgCdrFld.CostShiftDigits, cfgCdrFld.RoundingDecimals)
case utils.USAGE:
case utils.Usage:
cdrVal = cdr.FormatUsage(cfgCdrFld.Layout)
case utils.SETUP_TIME:
cdrVal = cdr.SetupTime.Format(cfgCdrFld.Layout)
@@ -715,7 +715,7 @@ func (cdr *CDR) AsMapStringIface() (mp map[string]interface{}, err error) {
mp[utils.Destination] = cdr.Destination
mp[utils.SETUP_TIME] = cdr.SetupTime
mp[utils.ANSWER_TIME] = cdr.AnswerTime
mp[utils.USAGE] = cdr.Usage
mp[utils.Usage] = cdr.Usage
mp[utils.CostSource] = cdr.CostSource
mp[utils.COST] = cdr.Cost
mp[utils.COST_DETAILS] = cdr.CostDetails
@@ -849,7 +849,7 @@ func (cdr *CDR) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []string) (err
if cdr.AnswerTime, err = cgrEv.FieldAsTime(fldName, config.CgrConfig().DefaultTimezone); err != nil {
return
}
case utils.USAGE:
case utils.Usage:
if cdr.Usage, err = cgrEv.FieldAsDuration(fldName); err != nil {
return
}

14
engine/cdr_test.go
View File

@@ -98,7 +98,7 @@ func TestFieldAsString(t *testing.T) {
cdr.FieldAsString(&utils.RSRField{Id: utils.Destination}) != cdr.Destination ||
cdr.FieldAsString(&utils.RSRField{Id: utils.SETUP_TIME}) != cdr.SetupTime.Format(time.RFC3339) ||
cdr.FieldAsString(&utils.RSRField{Id: utils.ANSWER_TIME}) != cdr.AnswerTime.Format(time.RFC3339) ||
cdr.FieldAsString(&utils.RSRField{Id: utils.USAGE}) != "10s" ||
cdr.FieldAsString(&utils.RSRField{Id: utils.Usage}) != "10s" ||
cdr.FieldAsString(&utils.RSRField{Id: utils.MEDI_RUNID}) != cdr.RunID ||
cdr.FieldAsString(&utils.RSRField{Id: utils.COST}) != "1.01" ||
cdr.FieldAsString(&utils.RSRField{Id: "field_extr1"}) != cdr.ExtraFields["field_extr1"] ||
@@ -118,7 +118,7 @@ func TestFieldAsString(t *testing.T) {
cdr.FieldAsString(&utils.RSRField{Id: utils.Destination}) != cdr.Destination,
cdr.FieldAsString(&utils.RSRField{Id: utils.SETUP_TIME}) != cdr.SetupTime.Format(time.RFC3339),
cdr.FieldAsString(&utils.RSRField{Id: utils.ANSWER_TIME}) != cdr.AnswerTime.Format(time.RFC3339),
cdr.FieldAsString(&utils.RSRField{Id: utils.USAGE}) != "10s",
cdr.FieldAsString(&utils.RSRField{Id: utils.Usage}) != "10s",
cdr.FieldAsString(&utils.RSRField{Id: utils.MEDI_RUNID}) != cdr.RunID,
cdr.FieldAsString(&utils.RSRField{Id: utils.COST}) != "1.01",
cdr.FieldAsString(&utils.RSRField{Id: "field_extr1"}) != cdr.ExtraFields["field_extr1"],
@@ -258,8 +258,8 @@ func TestCDRAsHttpForm(t *testing.T) {
if cdrForm.Get(utils.ANSWER_TIME) != "2013-11-07T08:42:26Z" {
t.Errorf("Expected: %s, received: %s", "2013-11-07T08:42:26Z", cdrForm.Get(utils.ANSWER_TIME))
}
if cdrForm.Get(utils.USAGE) != "10" {
t.Errorf("Expected: %s, received: %s", "10", cdrForm.Get(utils.USAGE))
if cdrForm.Get(utils.Usage) != "10" {
t.Errorf("Expected: %s, received: %s", "10", cdrForm.Get(utils.Usage))
}
if cdrForm.Get(utils.SUPPLIER) != "SUPPL1" {
t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.SUPPLIER))
@@ -284,7 +284,7 @@ func TestCDRForkCdr(t *testing.T) {
ExtraFields: map[string]string{"field_extr1": "val_extr1", "field_extr2": "valextr2"}}
rtSampleCdrOut, err := storCdr.ForkCdr("sample_run1", &utils.RSRField{Id: utils.REQTYPE}, &utils.RSRField{Id: utils.TENANT},
&utils.RSRField{Id: utils.CATEGORY}, &utils.RSRField{Id: utils.Account}, &utils.RSRField{Id: utils.SUBJECT}, &utils.RSRField{Id: utils.Destination},
&utils.RSRField{Id: utils.SETUP_TIME}, &utils.RSRField{Id: utils.ANSWER_TIME}, &utils.RSRField{Id: utils.USAGE},
&utils.RSRField{Id: utils.SETUP_TIME}, &utils.RSRField{Id: utils.ANSWER_TIME}, &utils.RSRField{Id: utils.Usage},
&utils.RSRField{Id: utils.RATED_FLD}, &utils.RSRField{Id: utils.COST},
[]*utils.RSRField{&utils.RSRField{Id: "field_extr1"}, &utils.RSRField{Id: "field_extr2"}}, true, "")
if err != nil {
@@ -343,7 +343,7 @@ func TestCDRForkCdrStaticVals(t *testing.T) {
_, err = storCdr.ForkCdr("wholesale_run", &utils.RSRField{Id: "dummy_header"},
&utils.RSRField{Id: utils.TENANT}, &utils.RSRField{Id: utils.TOR}, &utils.RSRField{Id: utils.Account},
&utils.RSRField{Id: utils.SUBJECT}, &utils.RSRField{Id: utils.Destination},
&utils.RSRField{Id: utils.SETUP_TIME}, &utils.RSRField{Id: utils.ANSWER_TIME}, &utils.RSRField{Id: utils.USAGE},
&utils.RSRField{Id: utils.SETUP_TIME}, &utils.RSRField{Id: utils.ANSWER_TIME}, &utils.RSRField{Id: utils.Usage},
&utils.RSRField{Id: utils.RATED_FLD}, &utils.RSRField{Id: utils.COST}, []*utils.RSRField{}, true, "")
if err == nil {
t.Error("Failed to detect missing header")
@@ -572,7 +572,7 @@ func TestCDRAsMapStringIface(t *testing.T) {
utils.Destination: "+4986517174963",
utils.SETUP_TIME: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC),
utils.ANSWER_TIME: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
utils.USAGE: time.Duration(10) * time.Second,
utils.Usage: time.Duration(10) * time.Second,
utils.CostSource: cdr.CostSource,
utils.COST: 1.01,
utils.COST_DETAILS: cdr.CostDetails,

2
engine/cdrefwv_test.go
View File

@@ -73,7 +73,7 @@ var contentJsnCfgFlds = []*config.CdrFieldJsonCfg{
Padding: utils.StringPointer("right")},
&config.CdrFieldJsonCfg{Tag: utils.StringPointer("SetupTime"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer(utils.SETUP_TIME), Width: utils.IntPointer(12),
Strip: utils.StringPointer("right"), Padding: utils.StringPointer("right"), Layout: utils.StringPointer("020106150400")},
&config.CdrFieldJsonCfg{Tag: utils.StringPointer("Duration"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer(utils.USAGE), Width: utils.IntPointer(6),
&config.CdrFieldJsonCfg{Tag: utils.StringPointer("Duration"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer(utils.Usage), Width: utils.IntPointer(6),
Strip: utils.StringPointer("right"), Padding: utils.StringPointer("right"), Layout: utils.StringPointer(utils.SECONDS)},
&config.CdrFieldJsonCfg{Tag: utils.StringPointer("DataVolume"), Type: utils.StringPointer(utils.META_FILLER), Width: utils.IntPointer(6)},
&config.CdrFieldJsonCfg{Tag: utils.StringPointer("TaxCode"), Type: utils.StringPointer(utils.META_CONSTANT), Value: utils.StringPointer("1"), Width: utils.IntPointer(1)},

2
engine/cgrcdr.go
View File

@@ -73,7 +73,7 @@ func (cgrCdr CgrCdr) AsCDR(timezone string) *CDR {
storCdr.Destination = cgrCdr[utils.Destination]
storCdr.SetupTime, _ = utils.ParseTimeDetectLayout(cgrCdr[utils.SETUP_TIME], timezone) // Not interested to process errors, should do them if necessary in a previous step
storCdr.AnswerTime, _ = utils.ParseTimeDetectLayout(cgrCdr[utils.ANSWER_TIME], timezone)
storCdr.Usage, _ = utils.ParseDurationWithNanosecs(cgrCdr[utils.USAGE])
storCdr.Usage, _ = utils.ParseDurationWithNanosecs(cgrCdr[utils.Usage])
storCdr.ExtraFields = cgrCdr.getExtraFields()
storCdr.Cost = -1
if costStr, hasIt := cgrCdr[utils.COST]; hasIt {

4
engine/cgrcdr_test.go
View File

@@ -38,7 +38,7 @@ func TestCgrCdrAsCDR(t *testing.T) {
utils.TENANT: "cgrates.org", utils.CATEGORY: "call",
utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002",
utils.SETUP_TIME: "2013-11-07T08:42:20Z", utils.ANSWER_TIME: "2013-11-07T08:42:26Z",
utils.USAGE: "10s", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
utils.Usage: "10s", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
setupTime, _ := utils.ParseTimeDetectLayout(cgrCdr[utils.SETUP_TIME], "")
expctRtCdr := &CDR{CGRID: utils.Sha1(cgrCdr[utils.ACCID], setupTime.String()),
ToR: utils.VOICE, OriginID: cgrCdr[utils.ACCID],
@@ -63,7 +63,7 @@ func TestReplicatedCgrCdrAsCDR(t *testing.T) {
utils.CDRSOURCE: "internal_test", utils.REQTYPE: utils.META_RATED,
utils.DIRECTION: utils.OUT, utils.TENANT: "cgrates.org", utils.CATEGORY: "call",
utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002", utils.SETUP_TIME: "2013-11-07T08:42:20Z", utils.PDD: "0.200", utils.ANSWER_TIME: "2013-11-07T08:42:26Z",
utils.USAGE: "10s", utils.SUPPLIER: "SUPPL1", utils.DISCONNECT_CAUSE: "NORMAL_CLEARING", utils.COST: "0.12", utils.RATED: "true", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
utils.Usage: "10s", utils.SUPPLIER: "SUPPL1", utils.DISCONNECT_CAUSE: "NORMAL_CLEARING", utils.COST: "0.12", utils.RATED: "true", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
expctRtCdr := &CDR{CGRID: cgrCdr[utils.CGRID],
ToR: cgrCdr[utils.TOR],
OriginID: cgrCdr[utils.ACCID],

2
engine/resources.go
View File

@@ -499,7 +499,7 @@ func (rS *ResourceService) processThresholds(r *Resource) (err error) {
Event: map[string]interface{}{
utils.EventType: utils.ResourceUpdate,
utils.ResourceID: r.ID,
utils.USAGE: r.totalUsage()}}
utils.Usage: r.totalUsage()}}
var hits int
if err = thresholdS.Call(utils.ThresholdSv1ProcessEvent, ev, &hits); err != nil {
utils.Logger.Warning(

4
engine/statmetrics.go
View File

@@ -194,7 +194,7 @@ func (acd *StatACD) AddEvent(ev *utils.CGREvent) (err error) {
if at, err := ev.FieldAsTime(utils.ANSWER_TIME, config.CgrConfig().DefaultTimezone); err != nil {
return err
} else if !at.IsZero() {
if duration, err := ev.FieldAsDuration(utils.USAGE); err != nil &&
if duration, err := ev.FieldAsDuration(utils.Usage); err != nil &&
err != utils.ErrNotFound {
return err
} else {
@@ -281,7 +281,7 @@ func (tcd *StatTCD) AddEvent(ev *utils.CGREvent) (err error) {
if at, err := ev.FieldAsTime(utils.ANSWER_TIME, config.CgrConfig().DefaultTimezone); err != nil {
return err
} else if !at.IsZero() {
if duration, err := ev.FieldAsDuration(utils.USAGE); err != nil &&
if duration, err := ev.FieldAsDuration(utils.Usage); err != nil &&
err != utils.ErrNotFound {
return err
} else {

4
engine/statmetrics_test.go
View File

@@ -123,7 +123,7 @@ func TestACDGetStringValue(t *testing.T) {
acd, _ := NewACD(2)
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
utils.USAGE: time.Duration(10 * time.Second),
utils.Usage: time.Duration(10 * time.Second),
"AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC),
}}
if strVal := acd.GetStringValue(""); strVal != utils.NOT_AVAILABLE {
@@ -667,7 +667,7 @@ func TestPDDGetStringValue(t *testing.T) {
pdd, _ := NewPDD(2)
ev := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_1",
Event: map[string]interface{}{
utils.USAGE: time.Duration(10 * time.Second),
utils.Usage: time.Duration(10 * time.Second),
"AnswerTime": time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC),
utils.PDD: time.Duration(5 * time.Second),
}}

2
engine/storage_mongo_datadb.go
View File

@@ -89,7 +89,7 @@ var (
AnswerTimeLow = strings.ToLower(utils.ANSWER_TIME)
CreatedAtLow = strings.ToLower(utils.CreatedAt)
UpdatedAtLow = strings.ToLower(utils.UpdatedAt)
UsageLow = strings.ToLower(utils.USAGE)
UsageLow = strings.ToLower(utils.Usage)
PDDLow = strings.ToLower(utils.PDD)
CostDetailsLow = strings.ToLower(utils.COST_DETAILS)
DestinationLow = strings.ToLower(utils.Destination)

4
engine/suppliers.go
View File

@@ -171,7 +171,7 @@ func (spS *SupplierService) matchingSupplierProfilesForEvent(ev *utils.CGREvent)
func (spS *SupplierService) costForEvent(ev *utils.CGREvent,
acntIDs, rpIDs []string) (costData map[string]interface{}, err error) {
if err = ev.CheckMandatoryFields([]string{utils.Account,
utils.Destination, utils.ANSWER_TIME, utils.USAGE}); err != nil {
utils.Destination, utils.ANSWER_TIME, utils.Usage}); err != nil {
return
}
var acnt, subj, dst string
@@ -192,7 +192,7 @@ func (spS *SupplierService) costForEvent(ev *utils.CGREvent,
return
}
var usage time.Duration
if usage, err = ev.FieldAsDuration(utils.USAGE); err != nil {
if usage, err = ev.FieldAsDuration(utils.Usage); err != nil {
return
}
for _, anctID := range acntIDs {