From 6269ec20fc78b81a40e46b1495ae900625825f97 Mon Sep 17 00:00:00 2001 From: TeoV Date: Mon, 8 Jan 2018 15:55:54 +0200 Subject: [PATCH] Renaming utils.SUBJECT -> utils.Subject --- apier/v1/apier_it_test.go | 4 +-- apier/v1/attributes_it_test.go | 4 +-- apier/v1/suppliers_it_test.go | 2 +- apier/v1/thresholds_it_test.go | 2 +- config/config_json_test.go | 6 ++-- config/config_test.go | 2 +- config/configcdrc_test.go | 14 ++++----- engine/action.go | 2 +- engine/calldesc.go | 4 +-- engine/cdr.go | 14 ++++----- engine/cdr_test.go | 14 ++++----- engine/cdrefwv_test.go | 2 +- engine/cgrcdr.go | 2 +- engine/cgrcdr_test.go | 8 ++--- engine/storage_mongo_datadb.go | 2 +- general_tests/a1_it_test.go | 6 ++-- sessionmanager/data_it_test.go | 32 ++++++++++---------- sessionmanager/fsevent.go | 4 +-- sessionmanager/fsevent_test.go | 2 +- sessionmanager/kamevent.go | 2 +- sessionmanager/sma_event.go | 2 +- sessionmanager/smg_event.go | 4 +-- sessionmanager/smg_event_test.go | 8 ++--- sessionmanager/smg_it_test.go | 48 +++++++++++++++--------------- sessionmanager/smgbirpc_it_test.go | 4 +-- sessionmanager/smgeneric_test.go | 8 ++--- sessionmanager/smgreplc_it_test.go | 6 ++-- utils/consts.go | 4 +-- 28 files changed, 106 insertions(+), 106 deletions(-) diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 520883157..fda06d9ad 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1355,11 +1355,11 @@ func TestApierMaxDebitInexistentAcnt(t *testing.T) { func TestApierCdrServer(t *testing.T) { httpClient := new(http.Client) cdrForm1 := url.Values{utils.ACCID: []string{"dsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, - utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.SUBJECT: []string{"1001"}, utils.Destination: []string{"1002"}, + utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, utils.SetupTime: []string{"2013-11-07T08:42:22Z"}, utils.AnswerTime: []string{"2013-11-07T08:42:26Z"}, utils.Usage: []string{"10"}, "field_extr1": []string{"val_extr1"}, "fieldextr2": []string{"valextr2"}} cdrForm2 := url.Values{utils.ACCID: []string{"adsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, - utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.SUBJECT: []string{"1001"}, utils.Destination: []string{"1002"}, + utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.Account: []string{"1001"}, utils.Subject: []string{"1001"}, utils.Destination: []string{"1002"}, utils.SetupTime: []string{"2013-11-07T08:42:23Z"}, utils.AnswerTime: []string{"2013-11-07T08:42:26Z"}, utils.Usage: []string{"10"}, "field_extr1": []string{"val_extr1"}, "fieldextr2": []string{"valextr2"}} for _, cdrForm := range []url.Values{cdrForm1, cdrForm2} { diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index b41733d5d..1965657f2 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -161,7 +161,7 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { Append: false, }, &engine.Attribute{ - FieldName: utils.SUBJECT, + FieldName: utils.Subject, Initial: utils.ANY, Substitute: "1001", Append: true, @@ -171,7 +171,7 @@ func testAttributeSGetAttributeForEvent(t *testing.T) { } reverseSubstitute := []*engine.Attribute{ &engine.Attribute{ - FieldName: utils.SUBJECT, + FieldName: utils.Subject, Initial: utils.ANY, Substitute: "1001", Append: true, diff --git a/apier/v1/suppliers_it_test.go b/apier/v1/suppliers_it_test.go index 776e1b33b..efd4924fc 100644 --- a/apier/v1/suppliers_it_test.go +++ b/apier/v1/suppliers_it_test.go @@ -165,7 +165,7 @@ func testV1SplSGetLeastCostSuppliers(t *testing.T) { ID: "testV1SplSGetLeastCostSuppliers", Event: map[string]interface{}{ utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1002", utils.AnswerTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), utils.Usage: "1m20s", diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index c503763a4..bd8f04306 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -138,7 +138,7 @@ var tEvs = []*utils.CGREvent{ utils.Tenant: "cgrates.org", utils.Category: "call", utils.Account: "1007", - utils.SUBJECT: "1007", + utils.Subject: "1007", utils.Destination: "+4986517174963", utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), utils.PDD: time.Duration(0) * time.Second, diff --git a/config/config_json_test.go b/config/config_json_test.go index c61ae70d4..79de940fe 100755 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -331,7 +331,7 @@ func TestDfCdreJsonCfgs(t *testing.T) { Value: utils.StringPointer(utils.Account)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Subject"), Type: utils.StringPointer(utils.META_COMPOSED), - Value: utils.StringPointer(utils.SUBJECT)}, + Value: utils.StringPointer(utils.Subject)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Destination"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer(utils.Destination)}, @@ -390,7 +390,7 @@ func TestDfCdrcJsonCfg(t *testing.T) { Value: utils.StringPointer("7"), Mandatory: utils.BoolPointer(true)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Account"), Field_id: utils.StringPointer(utils.Account), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer("8"), Mandatory: utils.BoolPointer(true)}, - &CdrFieldJsonCfg{Tag: utils.StringPointer("Subject"), Field_id: utils.StringPointer(utils.SUBJECT), Type: utils.StringPointer(utils.META_COMPOSED), + &CdrFieldJsonCfg{Tag: utils.StringPointer("Subject"), Field_id: utils.StringPointer(utils.Subject), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer("9"), Mandatory: utils.BoolPointer(true)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Destination"), Field_id: utils.StringPointer(utils.Destination), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer("10"), Mandatory: utils.BoolPointer(true)}, @@ -428,7 +428,7 @@ func TestDfCdrcJsonCfg(t *testing.T) { Value: utils.StringPointer(utils.Account)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Subject"), Type: utils.StringPointer(utils.META_COMPOSED), - Value: utils.StringPointer(utils.SUBJECT)}, + Value: utils.StringPointer(utils.Subject)}, &CdrFieldJsonCfg{Tag: utils.StringPointer("Destination"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer(utils.Destination)}, diff --git a/config/config_test.go b/config/config_test.go index 28dc7c9ca..82a99d647 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -129,7 +129,7 @@ func TestCgrCfgCDRC(t *testing.T) { &CfgCdrField{Tag: "Account", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, - Value: utils.ParseRSRFieldsMustCompile(utils.SUBJECT, utils.INFIELD_SEP)}, + Value: utils.ParseRSRFieldsMustCompile(utils.Subject, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Destination", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Destination, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "SetupTime", Type: utils.META_COMPOSED, diff --git a/config/configcdrc_test.go b/config/configcdrc_test.go index f1926e649..046ab8f10 100644 --- a/config/configcdrc_test.go +++ b/config/configcdrc_test.go @@ -77,7 +77,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { Value: utils.ParseRSRFieldsMustCompile("8", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, - &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.SUBJECT, + &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.Subject, Value: utils.ParseRSRFieldsMustCompile("9", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, @@ -117,7 +117,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { &CfgCdrField{Tag: "Account", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, - Value: utils.ParseRSRFieldsMustCompile(utils.SUBJECT, utils.INFIELD_SEP)}, + Value: utils.ParseRSRFieldsMustCompile(utils.Subject, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Destination", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Destination, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "SetupTime", Type: utils.META_COMPOSED, @@ -174,7 +174,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { Value: utils.ParseRSRFieldsMustCompile("8", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, - &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.SUBJECT, + &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.Subject, Value: utils.ParseRSRFieldsMustCompile("9", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, @@ -214,7 +214,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { &CfgCdrField{Tag: "Account", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, - Value: utils.ParseRSRFieldsMustCompile(utils.SUBJECT, utils.INFIELD_SEP)}, + Value: utils.ParseRSRFieldsMustCompile(utils.Subject, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Destination", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Destination, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "SetupTime", Type: utils.META_COMPOSED, @@ -279,7 +279,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { &CfgCdrField{Tag: "Account", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, - Value: utils.ParseRSRFieldsMustCompile(utils.SUBJECT, utils.INFIELD_SEP)}, + Value: utils.ParseRSRFieldsMustCompile(utils.Subject, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Destination", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Destination, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "SetupTime", Type: utils.META_COMPOSED, @@ -338,7 +338,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { Value: utils.ParseRSRFieldsMustCompile("8", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, - &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.SUBJECT, + &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, FieldId: utils.Subject, Value: utils.ParseRSRFieldsMustCompile("9", utils.INFIELD_SEP), FieldFilter: utils.ParseRSRFieldsMustCompile("", utils.INFIELD_SEP), Width: 0, Strip: "", Padding: "", Layout: "", Mandatory: true}, @@ -378,7 +378,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) { &CfgCdrField{Tag: "Account", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Subject", Type: utils.META_COMPOSED, - Value: utils.ParseRSRFieldsMustCompile(utils.SUBJECT, utils.INFIELD_SEP)}, + Value: utils.ParseRSRFieldsMustCompile(utils.Subject, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "Destination", Type: utils.META_COMPOSED, Value: utils.ParseRSRFieldsMustCompile(utils.Destination, utils.INFIELD_SEP)}, &CfgCdrField{Tag: "SetupTime", Type: utils.META_COMPOSED, diff --git a/engine/action.go b/engine/action.go index 52ac31045..b554184fa 100644 --- a/engine/action.go +++ b/engine/action.go @@ -192,7 +192,7 @@ func cdrLogAction(acc *Account, sq *CDRStatsQueueTriggered, a *Action, acs Actio utils.RequestType: utils.ParseRSRFieldsMustCompile("^"+utils.META_PREPAID, utils.INFIELD_SEP), utils.Tenant: utils.ParseRSRFieldsMustCompile(utils.Tenant, utils.INFIELD_SEP), utils.Account: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP), - utils.SUBJECT: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP), //here need to be modify + utils.Subject: utils.ParseRSRFieldsMustCompile(utils.Account, utils.INFIELD_SEP), //here need to be modify utils.COST: utils.ParseRSRFieldsMustCompile("ActionValue", utils.INFIELD_SEP), } template := make(map[string]string) diff --git a/engine/calldesc.go b/engine/calldesc.go index 543399169..80cb5f1be 100755 --- a/engine/calldesc.go +++ b/engine/calldesc.go @@ -171,7 +171,7 @@ func (cd *CallDescriptor) AsCGREvent() *utils.CGREvent { cgrEv.Event[utils.Tenant] = cd.Tenant cgrEv.Event[utils.Category] = cd.Category cgrEv.Event[utils.Account] = cd.Account - cgrEv.Event[utils.SUBJECT] = cd.Subject + cgrEv.Event[utils.Subject] = cd.Subject cgrEv.Event[utils.Destination] = cd.Destination cgrEv.Event[utils.AnswerTime] = cd.TimeStart cgrEv.Event[utils.Usage] = cd.TimeEnd.Sub(cd.TimeStart) @@ -200,7 +200,7 @@ func (cd *CallDescriptor) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []str if cd.Account, err = cgrEv.FieldAsString(fldName); err != nil { return } - case utils.SUBJECT: + case utils.Subject: if cd.Subject, err = cgrEv.FieldAsString(fldName); err != nil { return } diff --git a/engine/cdr.go b/engine/cdr.go index 7bab06c1b..c2a9b8eb9 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -166,7 +166,7 @@ func (cdr *CDR) FieldAsString(rsrFld *utils.RSRField) string { return rsrFld.ParseValue(cdr.Category) case utils.Account: return rsrFld.ParseValue(cdr.Account) - case utils.SUBJECT: + case utils.Subject: return rsrFld.ParseValue(cdr.Subject) case utils.Destination: return rsrFld.ParseValue(cdr.Destination) @@ -213,7 +213,7 @@ func (cdr *CDR) ParseFieldValue(fieldId, fieldVal, timezone string) error { cdr.Category += fieldVal case utils.Account: cdr.Account += fieldVal - case utils.SUBJECT: + case utils.Subject: cdr.Subject += fieldVal case utils.Destination: cdr.Destination += fieldVal @@ -294,7 +294,7 @@ func (cdr *CDR) ForkCdr(runId string, RequestTypeFld, tenantFld, categFld, accou subjectFld, _ = utils.NewRSRField(utils.META_DEFAULT) } if subjectFld.Id == utils.META_DEFAULT { - subjectFld.Id = utils.SUBJECT + subjectFld.Id = utils.Subject } if destFld == nil { destFld, _ = utils.NewRSRField(utils.META_DEFAULT) @@ -359,7 +359,7 @@ func (cdr *CDR) ForkCdr(runId string, RequestTypeFld, tenantFld, categFld, accou } frkStorCdr.Subject = cdr.FieldAsString(subjectFld) if primaryMandatory && len(frkStorCdr.Subject) == 0 { - return nil, utils.NewErrMandatoryIeMissing(utils.SUBJECT, subjectFld.Id) + return nil, utils.NewErrMandatoryIeMissing(utils.Subject, subjectFld.Id) } frkStorCdr.Destination = cdr.FieldAsString(destFld) if primaryMandatory && len(frkStorCdr.Destination) == 0 && frkStorCdr.ToR == utils.VOICE { @@ -455,7 +455,7 @@ func (cdr *CDR) GetSessionIds() []string { return []string{cdr.GetUUID()} } func (cdr *CDR) GetSubject(fieldName string) string { - if utils.IsSliceMember([]string{utils.SUBJECT, utils.META_DEFAULT, ""}, fieldName) { + if utils.IsSliceMember([]string{utils.Subject, utils.META_DEFAULT, ""}, fieldName) { return cdr.Subject } if strings.HasPrefix(fieldName, utils.STATIC_VALUE_PREFIX) { // Static value @@ -711,7 +711,7 @@ func (cdr *CDR) AsMapStringIface() (mp map[string]interface{}, err error) { mp[utils.Tenant] = cdr.Tenant mp[utils.Category] = cdr.Category mp[utils.Account] = cdr.Account - mp[utils.SUBJECT] = cdr.Subject + mp[utils.Subject] = cdr.Subject mp[utils.Destination] = cdr.Destination mp[utils.SetupTime] = cdr.SetupTime mp[utils.AnswerTime] = cdr.AnswerTime @@ -833,7 +833,7 @@ func (cdr *CDR) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []string) (err if cdr.Account, err = cgrEv.FieldAsString(fldName); err != nil { return } - case utils.SUBJECT: + case utils.Subject: if cdr.Subject, err = cgrEv.FieldAsString(fldName); err != nil { return } diff --git a/engine/cdr_test.go b/engine/cdr_test.go index ca158d988..9e48bd4bb 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -94,7 +94,7 @@ func TestFieldAsString(t *testing.T) { cdr.FieldAsString(&utils.RSRField{Id: utils.RequestType}) != cdr.RequestType || cdr.FieldAsString(&utils.RSRField{Id: utils.Category}) != cdr.Category || cdr.FieldAsString(&utils.RSRField{Id: utils.Account}) != cdr.Account || - cdr.FieldAsString(&utils.RSRField{Id: utils.SUBJECT}) != cdr.Subject || + cdr.FieldAsString(&utils.RSRField{Id: utils.Subject}) != cdr.Subject || cdr.FieldAsString(&utils.RSRField{Id: utils.Destination}) != cdr.Destination || cdr.FieldAsString(&utils.RSRField{Id: utils.SetupTime}) != cdr.SetupTime.Format(time.RFC3339) || cdr.FieldAsString(&utils.RSRField{Id: utils.AnswerTime}) != cdr.AnswerTime.Format(time.RFC3339) || @@ -114,7 +114,7 @@ func TestFieldAsString(t *testing.T) { cdr.FieldAsString(&utils.RSRField{Id: utils.RequestType}) != cdr.RequestType, cdr.FieldAsString(&utils.RSRField{Id: utils.Category}) != cdr.Category, cdr.FieldAsString(&utils.RSRField{Id: utils.Account}) != cdr.Account, - cdr.FieldAsString(&utils.RSRField{Id: utils.SUBJECT}) != cdr.Subject, + cdr.FieldAsString(&utils.RSRField{Id: utils.Subject}) != cdr.Subject, cdr.FieldAsString(&utils.RSRField{Id: utils.Destination}) != cdr.Destination, cdr.FieldAsString(&utils.RSRField{Id: utils.SetupTime}) != cdr.SetupTime.Format(time.RFC3339), cdr.FieldAsString(&utils.RSRField{Id: utils.AnswerTime}) != cdr.AnswerTime.Format(time.RFC3339), @@ -246,8 +246,8 @@ func TestCDRAsHttpForm(t *testing.T) { if cdrForm.Get(utils.ACCOUNT) != "1001" { t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.ACCOUNT)) } - if cdrForm.Get(utils.SUBJECT) != "1001" { - t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.SUBJECT)) + if cdrForm.Get(utils.Subject) != "1001" { + t.Errorf("Expected: %s, received: %s", "1001", cdrForm.Get(utils.Subject)) } if cdrForm.Get(utils.Destination) != "1002" { t.Errorf("Expected: %s, received: %s", "1002", cdrForm.Get(utils.Destination)) @@ -283,7 +283,7 @@ func TestCDRForkCdr(t *testing.T) { Usage: time.Duration(10) * time.Second, Cost: 1.01, ExtraFields: map[string]string{"field_extr1": "val_extr1", "field_extr2": "valextr2"}} rtSampleCdrOut, err := storCdr.ForkCdr("sample_run1", &utils.RSRField{Id: utils.RequestType}, &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.Category}, &utils.RSRField{Id: utils.Account}, &utils.RSRField{Id: utils.Subject}, &utils.RSRField{Id: utils.Destination}, &utils.RSRField{Id: utils.SetupTime}, &utils.RSRField{Id: utils.AnswerTime}, &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, "") @@ -342,7 +342,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.Subject}, &utils.RSRField{Id: utils.Destination}, &utils.RSRField{Id: utils.SetupTime}, &utils.RSRField{Id: utils.AnswerTime}, &utils.RSRField{Id: utils.Usage}, &utils.RSRField{Id: utils.RATED_FLD}, &utils.RSRField{Id: utils.COST}, []*utils.RSRField{}, true, "") if err == nil { @@ -568,7 +568,7 @@ func TestCDRAsMapStringIface(t *testing.T) { utils.Tenant: "cgrates.org", utils.Category: "call", utils.Account: "1002", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "+4986517174963", utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), utils.AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), diff --git a/engine/cdrefwv_test.go b/engine/cdrefwv_test.go index 796d56c11..8b2acbcd4 100644 --- a/engine/cdrefwv_test.go +++ b/engine/cdrefwv_test.go @@ -60,7 +60,7 @@ var contentJsnCfgFlds = []*config.CdrFieldJsonCfg{ Value: utils.StringPointer(utils.Account), Width: utils.IntPointer(12), Strip: utils.StringPointer("left"), Padding: utils.StringPointer("right")}, &config.CdrFieldJsonCfg{Tag: utils.StringPointer("Subject"), Type: utils.StringPointer(utils.META_COMPOSED), - Value: utils.StringPointer(utils.SUBJECT), Width: utils.IntPointer(5), + Value: utils.StringPointer(utils.Subject), Width: utils.IntPointer(5), Strip: utils.StringPointer("right"), Padding: utils.StringPointer("right")}, &config.CdrFieldJsonCfg{Tag: utils.StringPointer("CLI"), Type: utils.StringPointer(utils.META_COMPOSED), Value: utils.StringPointer("cli"), Width: utils.IntPointer(15), diff --git a/engine/cgrcdr.go b/engine/cgrcdr.go index 592e5bb99..d32f7a30d 100644 --- a/engine/cgrcdr.go +++ b/engine/cgrcdr.go @@ -69,7 +69,7 @@ func (cgrCdr CgrCdr) AsCDR(timezone string) *CDR { storCdr.Tenant = cgrCdr[utils.Tenant] storCdr.Category = cgrCdr[utils.Category] storCdr.Account = cgrCdr[utils.Account] - storCdr.Subject = cgrCdr[utils.SUBJECT] + storCdr.Subject = cgrCdr[utils.Subject] storCdr.Destination = cgrCdr[utils.Destination] storCdr.SetupTime, _ = utils.ParseTimeDetectLayout(cgrCdr[utils.SetupTime], timezone) // Not interested to process errors, should do them if necessary in a previous step storCdr.AnswerTime, _ = utils.ParseTimeDetectLayout(cgrCdr[utils.AnswerTime], timezone) diff --git a/engine/cgrcdr_test.go b/engine/cgrcdr_test.go index 66054c218..b895b6b2c 100644 --- a/engine/cgrcdr_test.go +++ b/engine/cgrcdr_test.go @@ -36,7 +36,7 @@ func TestCgrCdrAsCDR(t *testing.T) { cgrCdr := CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.Source: "internal_test", utils.RequestType: utils.META_RATED, utils.Tenant: "cgrates.org", utils.Category: "call", - utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002", + utils.Account: "1001", utils.Subject: "1001", utils.Destination: "1002", utils.SetupTime: "2013-11-07T08:42:20Z", utils.AnswerTime: "2013-11-07T08:42:26Z", utils.Usage: "10s", "field_extr1": "val_extr1", "fieldextr2": "valextr2"} setupTime, _ := utils.ParseTimeDetectLayout(cgrCdr[utils.SetupTime], "") @@ -46,7 +46,7 @@ func TestCgrCdrAsCDR(t *testing.T) { Source: cgrCdr[utils.Source], RequestType: cgrCdr[utils.RequestType], Tenant: cgrCdr[utils.Tenant], Category: cgrCdr[utils.Category], - Account: cgrCdr[utils.Account], Subject: cgrCdr[utils.SUBJECT], + Account: cgrCdr[utils.Account], Subject: cgrCdr[utils.Subject], Destination: cgrCdr[utils.Destination], SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -62,7 +62,7 @@ func TestReplicatedCgrCdrAsCDR(t *testing.T) { cgrCdr := CgrCdr{utils.CGRID: "164b0422fdc6a5117031b427439482c6a4f90e41", utils.TOR: utils.VOICE, utils.ACCID: "dsafdsaf", utils.OriginHost: "192.168.1.1", utils.Source: "internal_test", utils.RequestType: utils.META_RATED, utils.DIRECTION: utils.OUT, utils.Tenant: "cgrates.org", utils.Category: "call", - utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002", utils.SetupTime: "2013-11-07T08:42:20Z", utils.PDD: "0.200", utils.AnswerTime: "2013-11-07T08:42:26Z", + utils.Account: "1001", utils.Subject: "1001", utils.Destination: "1002", utils.SetupTime: "2013-11-07T08:42:20Z", utils.PDD: "0.200", utils.AnswerTime: "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"} expctRtCdr := &CDR{CGRID: cgrCdr[utils.CGRID], ToR: cgrCdr[utils.TOR], @@ -73,7 +73,7 @@ func TestReplicatedCgrCdrAsCDR(t *testing.T) { Tenant: cgrCdr[utils.Tenant], Category: cgrCdr[utils.Category], Account: cgrCdr[utils.Account], - Subject: cgrCdr[utils.SUBJECT], + Subject: cgrCdr[utils.Subject], Destination: cgrCdr[utils.Destination], SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index d5d41376e..12da338aa 100755 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -84,7 +84,7 @@ var ( TenantLow = strings.ToLower(utils.Tenant) CategoryLow = strings.ToLower(utils.Category) AccountLow = strings.ToLower(utils.Account) - SubjectLow = strings.ToLower(utils.SUBJECT) + SubjectLow = strings.ToLower(utils.Subject) SupplierLow = strings.ToLower(utils.SUPPLIER) DisconnectCauseLow = strings.ToLower(utils.DISCONNECT_CAUSE) SetupTimeLow = strings.ToLower(utils.SetupTime) diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 4265b1e80..1c09922fb 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -133,7 +133,7 @@ func TestA1itDataSession1(t *testing.T) { utils.ACCID: "504966119", utils.DIRECTION: utils.OUT, utils.Account: "rpdata1", - utils.SUBJECT: "rpdata1", + utils.Subject: "rpdata1", utils.Destination: "data", utils.Category: "data1", utils.Tenant: "cgrates.org", @@ -164,7 +164,7 @@ func TestA1itDataSession1(t *testing.T) { utils.SessionTTL: "28800s", utils.SessionTTLLastUsed: "2097152s", utils.SessionTTLUsage: "0s", - utils.SUBJECT: "rpdata1", + utils.Subject: "rpdata1", utils.Tenant: "cgrates.org", utils.TOR: utils.DATA, utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", @@ -189,7 +189,7 @@ func TestA1itDataSession1(t *testing.T) { utils.RequestType: utils.META_PREPAID, utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", - utils.SUBJECT: "rpdata1", + utils.Subject: "rpdata1", utils.Tenant: "cgrates.org", utils.TOR: utils.DATA, } diff --git a/sessionmanager/data_it_test.go b/sessionmanager/data_it_test.go index e2c8776f4..04491cba3 100644 --- a/sessionmanager/data_it_test.go +++ b/sessionmanager/data_it_test.go @@ -117,7 +117,7 @@ func TestSMGDataLastUsedData(t *testing.T) { utils.ACCID: "123491", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -146,7 +146,7 @@ func TestSMGDataLastUsedData(t *testing.T) { utils.ACCID: "123491", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -174,7 +174,7 @@ func TestSMGDataLastUsedData(t *testing.T) { utils.ACCID: "123491", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -224,7 +224,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) { utils.ACCID: "123492", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, @@ -259,7 +259,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) { utils.ACCID: "123492", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, @@ -293,7 +293,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) { utils.ACCID: "123492", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, @@ -327,7 +327,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) { utils.ACCID: "123492", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, @@ -360,7 +360,7 @@ func TestSMGDataLastUsedMultipleUpdates(t *testing.T) { utils.ACCID: "123492", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, @@ -430,7 +430,7 @@ func TestSMGDataTTLExpired(t *testing.T) { utils.ACCID: "TestSMGDataTTLExpired", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -489,7 +489,7 @@ func TestSMGDataTTLExpMultiUpdates(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -524,7 +524,7 @@ func TestSMGDataTTLExpMultiUpdates(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -587,7 +587,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -622,7 +622,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -659,7 +659,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -695,7 +695,7 @@ func TestSMGDataMultipleDataNoUsage(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", @@ -749,7 +749,7 @@ func TestSMGDataTTLUsageProtection(t *testing.T) { utils.ACCID: "123495", utils.DIRECTION: utils.OUT, utils.Account: acntAttrs.Account, - utils.SUBJECT: acntAttrs.Account, + utils.Subject: acntAttrs.Account, utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", diff --git a/sessionmanager/fsevent.go b/sessionmanager/fsevent.go index 39ce56dc1..430ef4789 100644 --- a/sessionmanager/fsevent.go +++ b/sessionmanager/fsevent.go @@ -283,7 +283,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str return rsrFld.ParseValue(fsev.GetCategory("")) case utils.Account: return rsrFld.ParseValue(fsev.GetAccount("")) - case utils.SUBJECT: + case utils.Subject: return rsrFld.ParseValue(fsev.GetSubject("")) case utils.Destination: return rsrFld.ParseValue(fsev.GetDestination("")) @@ -381,7 +381,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{} mp[utils.Tenant] = fsev.GetTenant(utils.META_DEFAULT) mp[utils.Category] = fsev.GetCategory(utils.META_DEFAULT) mp[utils.Account] = fsev.GetAccount(utils.META_DEFAULT) - mp[utils.SUBJECT] = fsev.GetSubject(utils.META_DEFAULT) + mp[utils.Subject] = fsev.GetSubject(utils.META_DEFAULT) mp[utils.Destination] = fsev.GetDestination(utils.META_DEFAULT) mp[utils.SetupTime], _ = fsev.GetSetupTime(utils.META_DEFAULT, timezone) mp[utils.AnswerTime], _ = fsev.GetAnswerTime(utils.META_DEFAULT, timezone) diff --git a/sessionmanager/fsevent_test.go b/sessionmanager/fsevent_test.go index f85672ff0..0e81e2c82 100644 --- a/sessionmanager/fsevent_test.go +++ b/sessionmanager/fsevent_test.go @@ -525,7 +525,7 @@ func TestParseEventValue(t *testing.T) { if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Account}, ""); parsed != "1001" { t.Error("Unexpected result parsed", parsed) } - if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.SUBJECT}, ""); parsed != "1001" { + if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Subject}, ""); parsed != "1001" { t.Error("Unexpected result parsed", parsed) } if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Destination}, ""); parsed != "1003" { diff --git a/sessionmanager/kamevent.go b/sessionmanager/kamevent.go index db37fbe89..072d3f54f 100644 --- a/sessionmanager/kamevent.go +++ b/sessionmanager/kamevent.go @@ -292,7 +292,7 @@ func (kev KamEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str return rsrFld.ParseValue(kev.GetCategory(utils.META_DEFAULT)) case utils.Account: return rsrFld.ParseValue(kev.GetAccount(utils.META_DEFAULT)) - case utils.SUBJECT: + case utils.Subject: return rsrFld.ParseValue(kev.GetSubject(utils.META_DEFAULT)) case utils.Destination: return rsrFld.ParseValue(kev.GetDestination(utils.META_DEFAULT)) diff --git a/sessionmanager/sma_event.go b/sessionmanager/sma_event.go index 254efc13d..36813127f 100644 --- a/sessionmanager/sma_event.go +++ b/sessionmanager/sma_event.go @@ -195,7 +195,7 @@ func (smaEv *SMAsteriskEvent) AsSMGenericEvent() *SMGenericEvent { smgEv[utils.Category] = smaEv.Category() } if smaEv.Subject() != "" { - smgEv[utils.SUBJECT] = smaEv.Subject() + smgEv[utils.Subject] = smaEv.Subject() } smgEv[utils.OriginHost] = smaEv.OriginatorIP() smgEv[utils.Account] = smaEv.Account() diff --git a/sessionmanager/smg_event.go b/sessionmanager/smg_event.go index 548b6211e..664940f19 100644 --- a/sessionmanager/smg_event.go +++ b/sessionmanager/smg_event.go @@ -91,7 +91,7 @@ func (self SMGenericEvent) GetAccount(fieldName string) string { func (self SMGenericEvent) GetSubject(fieldName string) string { if fieldName == utils.META_DEFAULT { - fieldName = utils.SUBJECT + fieldName = utils.Subject } result, _ := utils.CastFieldIfToString(self[fieldName]) return result @@ -383,7 +383,7 @@ func (self SMGenericEvent) ParseEventValue(rsrFld *utils.RSRField, timezone stri return rsrFld.ParseValue(self.GetCategory(utils.META_DEFAULT)) case utils.Account: return rsrFld.ParseValue(self.GetAccount(utils.META_DEFAULT)) - case utils.SUBJECT: + case utils.Subject: return rsrFld.ParseValue(self.GetSubject(utils.META_DEFAULT)) case utils.Destination: return rsrFld.ParseValue(self.GetDestination(utils.META_DEFAULT)) diff --git a/sessionmanager/smg_event_test.go b/sessionmanager/smg_event_test.go index 12f7fe2d7..452cc34c6 100644 --- a/sessionmanager/smg_event_test.go +++ b/sessionmanager/smg_event_test.go @@ -37,7 +37,7 @@ func TestSMGenericEventParseFields(t *testing.T) { smGev[utils.ACCID] = "12345" smGev[utils.DIRECTION] = "*out" smGev[utils.Account] = "account1" - smGev[utils.SUBJECT] = "subject1" + smGev[utils.Subject] = "subject1" smGev[utils.Destination] = "+4986517174963" smGev[utils.Category] = "call" smGev[utils.Tenant] = "cgrates.org" @@ -157,7 +157,7 @@ func TestSMGenericEventAsCDR(t *testing.T) { smGev[utils.ACCID] = "12345" smGev[utils.DIRECTION] = utils.OUT smGev[utils.Account] = "account1" - smGev[utils.SUBJECT] = "subject1" + smGev[utils.Subject] = "subject1" smGev[utils.Destination] = "+4986517174963" smGev[utils.Category] = "call" smGev[utils.Tenant] = "cgrates.org" @@ -191,7 +191,7 @@ func TestSMGenericEventAsLcrRequest(t *testing.T) { smGev[utils.ACCID] = "12345" smGev[utils.DIRECTION] = utils.OUT smGev[utils.Account] = "account1" - smGev[utils.SUBJECT] = "subject1" + smGev[utils.Subject] = "subject1" smGev[utils.Destination] = "+4986517174963" smGev[utils.Category] = "call" smGev[utils.Tenant] = "cgrates.org" @@ -219,7 +219,7 @@ func TestSMGenericEventGetFieldAsString(t *testing.T) { smGev[utils.ACCID] = "12345" smGev[utils.DIRECTION] = utils.OUT smGev[utils.Account] = "account1" - smGev[utils.SUBJECT] = "subject1" + smGev[utils.Subject] = "subject1" eFldVal := utils.VOICE if strVal, err := smGev.GetFieldAsString(utils.TOR); err != nil { t.Error(err) diff --git a/sessionmanager/smg_it_test.go b/sessionmanager/smg_it_test.go index a7312f52b..3e59f8317 100644 --- a/sessionmanager/smg_it_test.go +++ b/sessionmanager/smg_it_test.go @@ -98,7 +98,7 @@ func TestSMGVoiceMonetaryRefund(t *testing.T) { utils.ACCID: "123451", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -129,7 +129,7 @@ func TestSMGVoiceMonetaryRefund(t *testing.T) { utils.ACCID: "123451", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -157,7 +157,7 @@ func TestSMGVoiceVoiceRefund(t *testing.T) { utils.ACCID: "123452", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1003", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -189,7 +189,7 @@ func TestSMGVoiceVoiceRefund(t *testing.T) { utils.ACCID: "123452", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1003", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -224,7 +224,7 @@ func TestSMGVoiceMixedRefund(t *testing.T) { utils.ACCID: "123453", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -256,7 +256,7 @@ func TestSMGVoiceMixedRefund(t *testing.T) { utils.ACCID: "123453", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -296,7 +296,7 @@ func TestSMGVoiceLastUsed(t *testing.T) { utils.ACCID: "12350", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -324,7 +324,7 @@ func TestSMGVoiceLastUsed(t *testing.T) { utils.ACCID: "12350", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -350,7 +350,7 @@ func TestSMGVoiceLastUsed(t *testing.T) { utils.ACCID: "12350", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -376,7 +376,7 @@ func TestSMGVoiceLastUsed(t *testing.T) { utils.ACCID: "12350", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -410,7 +410,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) { utils.ACCID: "1234911", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -438,7 +438,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) { utils.ACCID: "1234911", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -464,7 +464,7 @@ func TestSMGVoiceLastUsedEnd(t *testing.T) { utils.ACCID: "1234911", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -498,7 +498,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) { utils.ACCID: "1234922", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -526,7 +526,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) { utils.ACCID: "1234922", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -552,7 +552,7 @@ func TestSMGVoiceLastUsedNotFixed(t *testing.T) { utils.ACCID: "1234922", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -586,7 +586,7 @@ func TestSMGVoiceSessionTTL(t *testing.T) { utils.ACCID: "12360", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1008", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -624,7 +624,7 @@ func TestSMGVoiceSessionTTL(t *testing.T) { utils.ACCID: "12360", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1008", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -698,7 +698,7 @@ func TestSMGVoiceSessionTTLWithRelocate(t *testing.T) { utils.ACCID: "12361", utils.DIRECTION: utils.OUT, utils.Account: "TestTTLWithRelocate", - utils.SUBJECT: "TestTTLWithRelocate", + utils.Subject: "TestTTLWithRelocate", utils.Destination: "1009", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -737,7 +737,7 @@ func TestSMGVoiceSessionTTLWithRelocate(t *testing.T) { utils.ACCID: "12362", utils.DIRECTION: smgEv[utils.DIRECTION], utils.Account: smgEv[utils.Account], - utils.SUBJECT: smgEv[utils.SUBJECT], + utils.Subject: smgEv[utils.Subject], utils.Destination: smgEv[utils.Destination], utils.Category: smgEv[utils.Category], utils.Tenant: smgEv[utils.Tenant], @@ -823,7 +823,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.ACCID: "12371", utils.DIRECTION: utils.OUT, utils.Account: attrSetBalance.Account, - utils.SUBJECT: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, utils.Destination: "12371", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -862,7 +862,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.ACCID: "12372-1", utils.DIRECTION: smgEv[utils.DIRECTION], utils.Account: smgEv[utils.Account], - utils.SUBJECT: smgEv[utils.SUBJECT], + utils.Subject: smgEv[utils.Subject], utils.Destination: smgEv[utils.Destination], utils.Category: smgEv[utils.Category], utils.Tenant: smgEv[utils.Tenant], @@ -897,7 +897,7 @@ func TestSMGVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.OriginIDPrefix: "12372", utils.DIRECTION: smgEv[utils.DIRECTION], utils.Account: smgEv[utils.Account], - utils.SUBJECT: smgEv[utils.SUBJECT], + utils.Subject: smgEv[utils.Subject], utils.Destination: smgEv[utils.Destination], utils.Category: smgEv[utils.Category], utils.Tenant: smgEv[utils.Tenant], @@ -955,7 +955,7 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { utils.ACCID: "1234967", utils.DIRECTION: utils.OUT, utils.Account: "1011", - utils.SUBJECT: "1011", + utils.Subject: "1011", utils.Destination: "+49", utils.Category: "call", utils.Tenant: "cgrates.org", diff --git a/sessionmanager/smgbirpc_it_test.go b/sessionmanager/smgbirpc_it_test.go index 8a17a0f4e..91e18ae54 100644 --- a/sessionmanager/smgbirpc_it_test.go +++ b/sessionmanager/smgbirpc_it_test.go @@ -135,7 +135,7 @@ func TestSMGBiRPCSessionAutomaticDisconnects(t *testing.T) { utils.ACCID: "123451", utils.DIRECTION: utils.OUT, utils.Account: attrSetBalance.Account, - utils.SUBJECT: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, utils.Destination: "1004", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, @@ -216,7 +216,7 @@ func TestSMGBiRPCSessionOriginatorTerminate(t *testing.T) { utils.ACCID: "123452", utils.DIRECTION: utils.OUT, utils.Account: attrSetBalance.Account, - utils.SUBJECT: attrSetBalance.Account, + utils.Subject: attrSetBalance.Account, utils.Destination: "1005", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, diff --git a/sessionmanager/smgeneric_test.go b/sessionmanager/smgeneric_test.go index 77a4ff59b..66cb35d58 100644 --- a/sessionmanager/smgeneric_test.go +++ b/sessionmanager/smgeneric_test.go @@ -41,7 +41,7 @@ func TestSMGSessionIndexing(t *testing.T) { utils.ACCID: "12345", utils.DIRECTION: "*out", utils.Account: "account1", - utils.SUBJECT: "subject1", + utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -396,7 +396,7 @@ func TestSMGActiveSessions(t *testing.T) { utils.ACCID: "111", utils.DIRECTION: "*out", utils.Account: "account1", - utils.SUBJECT: "subject1", + utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -473,7 +473,7 @@ func TestGetPassiveSessions(t *testing.T) { utils.ACCID: "12345", utils.DIRECTION: "*out", utils.Account: "account1", - utils.SUBJECT: "subject1", + utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -500,7 +500,7 @@ func TestGetPassiveSessions(t *testing.T) { utils.ACCID: "23456", utils.DIRECTION: "*out", utils.Account: "account1", - utils.SUBJECT: "subject1", + utils.Subject: "subject1", utils.Destination: "+4986517174963", utils.Category: "call", utils.Tenant: "cgrates.org", diff --git a/sessionmanager/smgreplc_it_test.go b/sessionmanager/smgreplc_it_test.go index 3f06dff35..bb9c7b9cf 100644 --- a/sessionmanager/smgreplc_it_test.go +++ b/sessionmanager/smgreplc_it_test.go @@ -101,7 +101,7 @@ func TestSMGRplcInitiate(t *testing.T) { utils.ACCID: "123451", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -231,7 +231,7 @@ func TestSMGRplcManualReplicate(t *testing.T) { utils.ACCID: "123451", utils.DIRECTION: utils.OUT, utils.Account: "1001", - utils.SUBJECT: "1001", + utils.Subject: "1001", utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", @@ -246,7 +246,7 @@ func TestSMGRplcManualReplicate(t *testing.T) { utils.ACCID: "123481", utils.DIRECTION: utils.OUT, utils.Account: "1002", - utils.SUBJECT: "1002", + utils.Subject: "1002", utils.Destination: "1005", utils.Category: "call", utils.Tenant: "cgrates.org", diff --git a/utils/consts.go b/utils/consts.go index ec9b0e353..87de1065d 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -20,7 +20,7 @@ package utils var ( CDRExportFormats = []string{DRYRUN, MetaFileCSV, MetaFileFWV, MetaHTTPjsonCDR, MetaHTTPjsonMap, MetaHTTPjson, META_HTTP_POST, MetaAMQPjsonCDR, MetaAMQPjsonMap} - PrimaryCdrFields = []string{CGRID, Source, OriginHost, ACCID, TOR, RequestType, DIRECTION, Tenant, Category, Account, SUBJECT, Destination, SetupTime, PDD, AnswerTime, Usage, + PrimaryCdrFields = []string{CGRID, Source, OriginHost, ACCID, TOR, RequestType, DIRECTION, Tenant, Category, Account, Subject, Destination, SetupTime, PDD, AnswerTime, Usage, SUPPLIER, DISCONNECT_CAUSE, COST, RATED, PartialField, MEDI_RUNID} GitLastLog string // If set, it will be processed as part of versioning PosterTransportContentTypes = map[string]string{ @@ -141,7 +141,7 @@ const ( Category = "Category" Context = "Context" Account = "Account" - SUBJECT = "Subject" + Subject = "Subject" Destination = "Destination" SetupTime = "SetupTime" AnswerTime = "AnswerTime"