From da91b07eb7db517182fe6b9f01691027d9ad0e2d Mon Sep 17 00:00:00 2001 From: andronache Date: Tue, 5 Jan 2021 16:45:22 +0200 Subject: [PATCH] Started replacing snake_case with camelCase in utils/consts.go --- agents/kamevent_test.go | 22 ++++---- apier/v1/apier_it_test.go | 8 +-- apier/v1/sessions_process_event_it_test.go | 4 +- apier/v1/sessionsv1_it_test.go | 4 +- apier/v1/stats_it_test.go | 2 +- apier/v1/thresholds_it_test.go | 2 +- apier/v2/apier.go | 4 +- apier/v2/cdrs_it_test.go | 10 ++-- apier/v2/cdrs_offline_it_test.go | 6 +-- config/config_json_test.go | 2 +- config/generalcfg_test.go | 6 +-- dispatchers/cdrs_it_test.go | 20 ++++---- dispatchers/sessions_it_test.go | 2 +- ees/elastic_it_test.go | 6 +-- ees/filecsv_it_test.go | 20 ++++---- ees/filefwv_it_test.go | 2 +- ees/httppost_it_test.go | 8 +-- ees/posterjsonmap_it_test.go | 6 +-- ees/sql_it_test.go | 4 +- ees/virtual_ee_it_test.go | 4 +- engine/action.go | 8 +-- engine/cdr_test.go | 56 ++++++++++----------- engine/cdrs.go | 2 +- engine/datamanager.go | 8 +-- engine/fscdr_test.go | 2 +- engine/libtest.go | 2 +- engine/pstr_amqp.go | 2 +- engine/pstr_http.go | 4 +- engine/storage_internal_datadb.go | 4 +- engine/storage_mongo_datadb.go | 10 ++-- engine/storage_redis.go | 8 +-- engine/suretax_test.go | 2 +- engine/tpreader.go | 8 +-- engine/z_actions_it_test.go | 8 +-- engine/z_cdr_it_test.go | 2 +- engine/z_onstor_it_test.go | 4 +- engine/z_poster_it_test.go | 6 +-- engine/z_storage_cdrs_it_test.go | 14 +++--- ers/amqp_it_test.go | 2 +- general_tests/auth_test.go | 4 +- general_tests/broadcast_client_it_test.go | 2 +- general_tests/cdrs_exp_it_test.go | 4 +- general_tests/cdrs_it_test.go | 14 +++--- general_tests/cdrs_post_failover_it_test.go | 2 +- general_tests/oldtutorial_it_test.go | 24 ++++----- general_tests/session4_it_test.go | 2 +- general_tests/suretax_it_test.go | 2 +- general_tests/tutorial_calls_test.go | 2 +- migrator/cdrs_it_test.go | 2 +- migrator/destinations.go | 4 +- sessions/libsessions.go | 4 +- sessions/session_test.go | 6 +-- utils/consts.go | 37 +++++++------- 53 files changed, 201 insertions(+), 202 deletions(-) diff --git a/agents/kamevent_test.go b/agents/kamevent_test.go index 2fdb76623..2d006a27d 100644 --- a/agents/kamevent_test.go +++ b/agents/kamevent_test.go @@ -51,7 +51,7 @@ func TestNewKamEvent(t *testing.T) { "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", @@ -72,7 +72,7 @@ func TestKamEvMissingParameter(t *testing.T) { kamEv = KamEvent{EVENT: CGR_CALL_END, "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", utils.CGR_DISCONNECT_CAUSE: "200"} @@ -85,7 +85,7 @@ func TestKamEvAsMapStringInterface(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -101,7 +101,7 @@ func TestKamEvAsMapStringInterface(t *testing.T) { expMp["callid"] = "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0" expMp["from_tag"] = "bf71ad59" expMp["to_tag"] = "7351fecf" - expMp["cgr_reqtype"] = utils.META_POSTPAID + expMp["cgr_reqtype"] = utils.MetaPostpaid expMp[utils.Source] = utils.KamailioAgent rcv := kamEv.AsMapStringInterface() if !reflect.DeepEqual(expMp, rcv) { @@ -114,7 +114,7 @@ func TestKamEvAsCGREvent(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -146,7 +146,7 @@ func TestKamEvV1AuthorizeArgs(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -198,7 +198,7 @@ func TestKamEvAsKamAuthReply(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -280,7 +280,7 @@ func TestKamEvV1InitSessionArgs(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -320,7 +320,7 @@ func TestKamEvV1TerminateSessionArgs(t *testing.T) { kamEv := KamEvent{"event": "CGR_CALL_END", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -360,7 +360,7 @@ func TestKamEvV1ProcessMessageArgs(t *testing.T) { kamEv := KamEvent{"event": "CGR_PROCESS_MESSAGE", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", @@ -397,7 +397,7 @@ func TestKamEvAsKamProcessEventReply(t *testing.T) { kamEv := KamEvent{"event": "CGR_PROCESS_MESSAGE", "callid": "46c01a5c249b469e76333fc6bfa87f6a@0:0:0:0:0:0:0:0", "from_tag": "bf71ad59", "to_tag": "7351fecf", - "cgr_reqtype": utils.META_POSTPAID, "cgr_account": "1001", + "cgr_reqtype": utils.MetaPostpaid, "cgr_account": "1001", "cgr_destination": "1002", "cgr_answertime": "1419839310", "cgr_duration": "3", "cgr_pdd": "4", utils.CGR_ROUTE: "supplier2", diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 593fde003..ac47f3f2d 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1709,11 +1709,11 @@ func testApierMaxDebitInexistentAcnt(t *testing.T) { func testApierCdrServer(t *testing.T) { httpClient := new(http.Client) - cdrForm1 := url.Values{utils.OriginID: []string{"dsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, + cdrForm1 := url.Values{utils.OriginID: []string{"dsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.MetaRated}, utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.AccountField: []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.OriginID: []string{"adsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.META_RATED}, + cdrForm2 := url.Values{utils.OriginID: []string{"adsafdsaf"}, utils.OriginHost: []string{"192.168.1.1"}, utils.RequestType: []string{utils.MetaRated}, utils.Tenant: []string{"cgrates.org"}, utils.Category: []string{"call"}, utils.AccountField: []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"}} @@ -1740,7 +1740,7 @@ func testApierITProcessCdr(t *testing.T) { var reply string cdr := &engine.CDRWithOpts{ CDR: &engine.CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", - OriginHost: "192.168.1.1", Source: "test", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", + OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.MetaDefault, Usage: 10 * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, @@ -1782,7 +1782,7 @@ func testApierGetCallCostLog(t *testing.T) { OriginID: "OriginCDR1", OriginHost: "192.168.1.1", Source: "test", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index c150bb8eb..e873dbab4 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -97,7 +97,7 @@ func TestSSv1ItProcessEventWithPostPaid(t *testing.T) { t.Fatal("Unknown Database type") } - sSV1RequestType = utils.META_POSTPAID + sSV1RequestType = utils.MetaPostpaid sTestSessionSv1ProcessEvent = append(sTestSessionSv1ProcessEvent[:len(sTestSessionSv1ProcessEvent)-7], testSSv1ItStopCgrEngine) for _, stest := range sTestSessionSv1ProcessEvent { t.Run(sessionsConfDIR+utils.EmptyString+sSV1RequestType, stest) @@ -118,7 +118,7 @@ func TestSSv1ItProcessEventWithRated(t *testing.T) { t.Fatal("Unknown Database type") } - sSV1RequestType = utils.META_RATED + sSV1RequestType = utils.MetaRated sTestSessionSv1ProcessEvent = append(sTestSessionSv1ProcessEvent[:len(sTestSessionSv1ProcessEvent)-7], testSSv1ItStopCgrEngine) for _, stest := range sTestSessionSv1ProcessEvent { t.Run(sessionsConfDIR+utils.EmptyString+sSV1RequestType, stest) diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index c1c0b1981..92f208a2c 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -114,7 +114,7 @@ func TestSSv1ItWithPostPaid(t *testing.T) { if *dbType == utils.MetaPostgres { t.SkipNow() } - sSV1RequestType = utils.META_POSTPAID + sSV1RequestType = utils.MetaPostpaid for _, stest := range sTestSessionSv1 { t.Run(sSV1RequestType, stest) } @@ -124,7 +124,7 @@ func TestSSv1ItWithRated(t *testing.T) { if *dbType == utils.MetaPostgres { t.SkipNow() } - sSV1RequestType = utils.META_RATED + sSV1RequestType = utils.MetaRated for _, stest := range sTestSessionSv1 { t.Run(sSV1RequestType, stest) } diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 268456a55..2e20425d2 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -990,7 +990,7 @@ func testV1STSProcessCDRStat(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1002", diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index a19333174..374461f9c 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -200,7 +200,7 @@ var ( utils.Source: utils.UNIT_TEST, utils.OriginID: "dsafdsaf", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1007", diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 47ecfb1d3..d1ca212d2 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -249,11 +249,11 @@ type AttrGetDestinations struct { func (apiv2 *APIerSv2) GetDestinations(attr *AttrGetDestinations, reply *[]*engine.Destination) (err error) { if len(attr.DestinationIDs) == 0 { // get all destination ids - if attr.DestinationIDs, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.DESTINATION_PREFIX); err != nil { + if attr.DestinationIDs, err = apiv2.DataManager.DataDB().GetKeysForPrefix(utils.DestinationPrefix); err != nil { return } for i, destID := range attr.DestinationIDs { - attr.DestinationIDs[i] = destID[len(utils.DESTINATION_PREFIX):] + attr.DestinationIDs[i] = destID[len(utils.DestinationPrefix):] } } dests := make([]*engine.Destination, len(attr.DestinationIDs)) diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 1ba6095fe..c5c812733 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -156,7 +156,7 @@ func testV2CDRsProcessCDR(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR1", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, // utils.Category: "call", //it will be populated as default in MapEvent.AsCDR utils.AccountField: "testV2CDRsProcessCDR", utils.Subject: "ANY2CNT", @@ -348,7 +348,7 @@ func testV2CDRsUsageNegative(t *testing.T) { utils.OriginID: "testV2CDRsUsageNegative", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsUsageNegative", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsUsageNegative", utils.Subject: "ANY2CNT", @@ -501,7 +501,7 @@ func testV2CDRsDifferentTenants(t *testing.T) { utils.OriginID: "testV2CDRsDifferentTenants", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsDifferentTenants", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsDifferentTenants", utils.Destination: "+4986517174963", @@ -562,7 +562,7 @@ func testV2CDRsProcessCDRNoRattingPlan(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR4", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR4", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.AccountField: "testV2CDRsProcessCDR4", utils.Subject: "NoSubject", utils.Destination: "+1234567", @@ -787,7 +787,7 @@ func testV2CDRsProcessCDRWithThreshold(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDRWithThreshold", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDRWithThreshold", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.Category: "call", utils.AccountField: "1005", utils.Subject: "ANY2CNT", diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index 798de023b..e7a45f2c8 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -191,7 +191,7 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { utils.OriginID: "testV2CDRsOfflineProcessCDR2", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsOfflineProcessCDR", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.Category: "call", utils.AccountField: "test", utils.Subject: "test", @@ -311,7 +311,7 @@ func testV2CDRsOfflineExpiryBalance(t *testing.T) { utils.OriginID: "testV2CDRsOfflineProcessCDR1", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsOfflineProcessCDR", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.Category: "call", utils.AccountField: "test2", utils.Subject: "test2", @@ -364,7 +364,7 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) { utils.OriginID: "testV2CDRsBalancesWithSameWeight", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsBalancesWithSameWeight", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.Category: "call", utils.AccountField: "specialTest", utils.Subject: "specialTest", diff --git a/config/config_json_test.go b/config/config_json_test.go index bbd9ddd65..9099fd395 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -37,7 +37,7 @@ func TestDfGeneralJsonCfg(t *testing.T) { Poster_attempts: utils.IntPointer(3), Failed_posts_dir: utils.StringPointer("/var/spool/cgrates/failed_posts"), Failed_posts_ttl: utils.StringPointer("5s"), - Default_request_type: utils.StringPointer(utils.META_RATED), + Default_request_type: utils.StringPointer(utils.MetaRated), Default_category: utils.StringPointer("call"), Default_tenant: utils.StringPointer("cgrates.org"), Default_caching: utils.StringPointer(utils.MetaReload), diff --git a/config/generalcfg_test.go b/config/generalcfg_test.go index d582adaae..f5973cef8 100644 --- a/config/generalcfg_test.go +++ b/config/generalcfg_test.go @@ -35,7 +35,7 @@ func TestGeneralCfgloadFromJsonCfg(t *testing.T) { Tpexport_dir: utils.StringPointer("/var/spool/cgrates/tpe"), Min_call_duration: utils.StringPointer("0s"), Max_call_duration: utils.StringPointer("3h0m0s"), - Default_request_type: utils.StringPointer(utils.META_RATED), + Default_request_type: utils.StringPointer(utils.MetaRated), Default_category: utils.StringPointer(utils.CALL), Default_tenant: utils.StringPointer("cgrates.org"), Default_timezone: utils.StringPointer("Local"), @@ -57,7 +57,7 @@ func TestGeneralCfgloadFromJsonCfg(t *testing.T) { TpExportPath: "/var/spool/cgrates/tpe", PosterAttempts: 3, FailedPostsDir: "/var/spool/cgrates/failed_posts", - DefaultReqType: utils.META_RATED, + DefaultReqType: utils.MetaRated, DefaultCategory: utils.CALL, DefaultTenant: "cgrates.org", DefaultTimezone: "Local", @@ -252,7 +252,7 @@ func TestGeneralCfgClone(t *testing.T) { TpExportPath: "/var/spool/cgrates/tpe", PosterAttempts: 3, FailedPostsDir: "/var/spool/cgrates/failed_posts", - DefaultReqType: utils.META_RATED, + DefaultReqType: utils.MetaRated, DefaultCategory: utils.CALL, DefaultTenant: "cgrates.org", DefaultTimezone: "Local", diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index da0204027..60b395721 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -127,7 +127,7 @@ func testDspCDRsProcessEvent(t *testing.T) { utils.OriginID: "testDspCDRsProcessEvent", utils.OriginHost: "192.168.1.1", utils.Source: "testDspCDRsProcessEvent", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -221,7 +221,7 @@ func testDspCDRsProcessCDR(t *testing.T) { OriginID: "testDspCDRsProcessCDR", OriginHost: "192.168.1.1", Source: "testDspCDRsProcessCDR", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Account: "1001", Subject: "1001", Destination: "1002", @@ -270,7 +270,7 @@ func testDspCDRsProcessExternalCDR(t *testing.T) { OriginID: "testDspCDRsProcessExternalCDR", OriginHost: "127.0.0.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1003", @@ -326,7 +326,7 @@ func testDspCDRsV2ProcessEvent(t *testing.T) { utils.OriginID: "testDspCDRsV2ProcessEvent", utils.OriginHost: "192.168.1.1", utils.Source: "testDspCDRsV2ProcessEvent", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -344,7 +344,7 @@ func testDspCDRsV2ProcessEvent(t *testing.T) { t.Error(err) } else if len(reply) != 2 { for _, procEv := range reply { - if procEv.Event[utils.RequestType] == utils.META_RATED && procEv.Event[utils.Cost] != 0.6 { + if procEv.Event[utils.RequestType] == utils.MetaRated && procEv.Event[utils.Cost] != 0.6 { t.Errorf("Expected: %+v , received: %v", 0.6, procEv.Event[utils.Cost]) } } @@ -418,7 +418,7 @@ func testDspCDRsProcessEventNoAuth(t *testing.T) { utils.OriginID: "testDspCDRsProcessEvent", utils.OriginHost: "192.168.1.1", utils.Source: "testDspCDRsProcessEvent", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -500,7 +500,7 @@ func testDspCDRsProcessCDRNoAuth(t *testing.T) { OriginID: "testDspCDRsProcessCDR", OriginHost: "192.168.1.1", Source: "testDspCDRsProcessCDR", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Account: "1001", Subject: "1001", Destination: "1002", @@ -543,7 +543,7 @@ func testDspCDRsProcessExternalCDRNoAuth(t *testing.T) { OriginID: "testDspCDRsProcessExternalCDR", OriginHost: "127.0.0.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1003", @@ -593,7 +593,7 @@ func testDspCDRsV2ProcessEventNoAuth(t *testing.T) { utils.OriginID: "testDspCDRsV2ProcessEventNoAuth", utils.OriginHost: "192.168.1.1", utils.Source: "testDspCDRsV2ProcessEventNoAuth", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -608,7 +608,7 @@ func testDspCDRsV2ProcessEventNoAuth(t *testing.T) { t.Error(err) } else if len(reply) != 2 { for _, procEv := range reply { - if procEv.Event[utils.RequestType] == utils.META_RATED && procEv.Event[utils.Cost] != 0.6 { + if procEv.Event[utils.RequestType] == utils.MetaRated && procEv.Event[utils.Cost] != 0.6 { t.Errorf("Expected: %+v , received: %v", 0.6, procEv.Event[utils.Cost]) } } diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 6d5d75fae..3f9bfa14a 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -556,7 +556,7 @@ func testDspSessionProcessCDR(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go index 96e0f6613..209e59e9e 100644 --- a/ees/elastic_it_test.go +++ b/ees/elastic_it_test.go @@ -130,7 +130,7 @@ func testElasticExportEvents(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -160,7 +160,7 @@ func testElasticExportEvents(t *testing.T) { utils.ToR: utils.DATA, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "AnotherTenant", utils.Category: "call", //for data CDR use different Tenant utils.AccountField: "1001", @@ -190,7 +190,7 @@ func testElasticExportEvents(t *testing.T) { utils.ToR: utils.SMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go index 098458804..f3de26414 100644 --- a/ees/filecsv_it_test.go +++ b/ees/filecsv_it_test.go @@ -118,7 +118,7 @@ func testCsvExportEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -146,7 +146,7 @@ func testCsvExportEvent(t *testing.T) { utils.ToR: utils.DATA, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "AnotherTenant", utils.Category: "call", //for data CDR use different Tenant utils.AccountField: "1001", @@ -174,7 +174,7 @@ func testCsvExportEvent(t *testing.T) { utils.ToR: utils.SMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -244,7 +244,7 @@ func testCsvExportComposedEvent(t *testing.T) { "ComposedOriginID1": "dsaf", "ComposedOriginID2": "dsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -275,7 +275,7 @@ func testCsvExportComposedEvent(t *testing.T) { "ComposedOriginID1": "sdf", "ComposedOriginID2": "wer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -349,7 +349,7 @@ func testCsvExportMaskedDestination(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -406,7 +406,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -436,7 +436,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { utils.ToR: utils.DATA, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "AnotherTenant", utils.Category: "call", //for data CDR use different Tenant utils.AccountField: "1001", @@ -466,7 +466,7 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) { utils.ToR: utils.SMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -536,7 +536,7 @@ func testCsvExportNotFoundExporter(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go index 94320765e..dd2d05c8f 100644 --- a/ees/filefwv_it_test.go +++ b/ees/filefwv_it_test.go @@ -110,7 +110,7 @@ func testFwvExportEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go index 73dbf193c..83c7647c0 100644 --- a/ees/httppost_it_test.go +++ b/ees/httppost_it_test.go @@ -126,7 +126,7 @@ func testHTTPExportEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -156,7 +156,7 @@ func testHTTPExportEvent(t *testing.T) { utils.ToR: utils.DATA, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "AnotherTenant", utils.Category: "call", //for data CDR use different Tenant utils.AccountField: "1001", @@ -186,7 +186,7 @@ func testHTTPExportEvent(t *testing.T) { utils.ToR: utils.SMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -215,7 +215,7 @@ func testHTTPExportEvent(t *testing.T) { utils.CGRID: utils.Sha1("sms2", time.Unix(1383813745, 0).UTC().String()), utils.ToR: utils.SMS, utils.OriginID: "sms2", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go index 76e99bf07..f29689fa2 100644 --- a/ees/posterjsonmap_it_test.go +++ b/ees/posterjsonmap_it_test.go @@ -123,7 +123,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -156,7 +156,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { utils.ToR: utils.DATA, utils.OriginID: "abcdef", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "AnotherTenant", utils.Category: "call", //for data CDR use different Tenant utils.AccountField: "1001", @@ -189,7 +189,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { utils.ToR: utils.SMS, utils.OriginID: "sdfwer", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go index 0c9e25f1a..fa39e2c0c 100644 --- a/ees/sql_it_test.go +++ b/ees/sql_it_test.go @@ -152,7 +152,7 @@ func testSqlEeExportEventFull(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -190,7 +190,7 @@ func testSqlEeExportEventPartial(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go index e975879ad..2e36a2be1 100644 --- a/ees/virtual_ee_it_test.go +++ b/ees/virtual_ee_it_test.go @@ -111,7 +111,7 @@ func testVirtExportSupplierEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -147,7 +147,7 @@ func testVirtExportEvents(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "dsafdsaf", utils.OriginHost: "192.168.1.1", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/engine/action.go b/engine/action.go index 2b7cb2010..0eeb85343 100644 --- a/engine/action.go +++ b/engine/action.go @@ -390,7 +390,7 @@ func callURL(ub *Account, a *Action, acs Actions, extraData interface{}) error { return err } pstr, err := NewHTTPPoster(config.CgrConfig().GeneralCfg().ReplyTimeout, a.ExtraParameters, - utils.CONTENT_JSON, config.CgrConfig().GeneralCfg().PosterAttempts) + utils.ContentJSON, config.CgrConfig().GeneralCfg().PosterAttempts) if err != nil { return err } @@ -409,7 +409,7 @@ func callURLAsync(ub *Account, a *Action, acs Actions, extraData interface{}) er return err } pstr, err := NewHTTPPoster(config.CgrConfig().GeneralCfg().ReplyTimeout, a.ExtraParameters, - utils.CONTENT_JSON, config.CgrConfig().GeneralCfg().PosterAttempts) + utils.ContentJSON, config.CgrConfig().GeneralCfg().PosterAttempts) if err != nil { return err } @@ -518,7 +518,7 @@ func setddestinations(ub *Account, a *Action, acs Actions, extraData interface{} if err = dm.SetDestination(newDest, utils.NonTransactional); err != nil { return err } - if err = dm.CacheDataFromDB(utils.DESTINATION_PREFIX, []string{ddcDestID}, true); err != nil { + if err = dm.CacheDataFromDB(utils.DestinationPrefix, []string{ddcDestID}, true); err != nil { return err } @@ -953,7 +953,7 @@ func postEvent(ub *Account, a *Action, acs Actions, extraData interface{}) error return err } pstr, err := NewHTTPPoster(config.CgrConfig().GeneralCfg().ReplyTimeout, a.ExtraParameters, - utils.CONTENT_JSON, config.CgrConfig().GeneralCfg().PosterAttempts) + utils.ContentJSON, config.CgrConfig().GeneralCfg().PosterAttempts) if err != nil { return err } diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 9bd89d271..dfce9e791 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -31,7 +31,7 @@ func TestNewCDRFromExternalCDR(t *testing.T) { extCdr := &ExternalCDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.MetaDefault, Usage: "10", Cost: 1.01, PreRated: true, @@ -39,7 +39,7 @@ func TestNewCDRFromExternalCDR(t *testing.T) { } eStorCdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, RunID: utils.MetaDefault, + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, RunID: utils.MetaDefault, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), @@ -57,7 +57,7 @@ func TestNewCDRFromExternalCDR(t *testing.T) { func TestCDRClone(t *testing.T) { storCdr := &CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Tenant: "cgrates.org", + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -73,7 +73,7 @@ func TestCDRClone(t *testing.T) { func TestFieldAsString(t *testing.T) { cdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", - OriginHost: "192.168.1.1", Source: "test", RequestType: utils.META_RATED, + OriginHost: "192.168.1.1", Source: "test", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.MetaDefault, @@ -217,7 +217,7 @@ func TestFieldAsString(t *testing.T) { func TestFieldsAsString(t *testing.T) { cdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: "test", - RequestType: utils.META_RATED, Tenant: "cgrates.org", + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -267,7 +267,7 @@ func TestFieldAsStringForCostDetails(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1002", @@ -330,7 +330,7 @@ func TestFormatCost(t *testing.T) { /* func TestCDRAsHttpForm(t *testing.T) { storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", - OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, + OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.MetaDefault, Usage: 10 * time.Second, Supplier: "SUPPL1", @@ -349,8 +349,8 @@ func TestCDRAsHttpForm(t *testing.T) { if cdrForm.Get(utils.Source) != utils.UNIT_TEST { t.Errorf("Expected: %s, received: %s", utils.UNIT_TEST, cdrForm.Get(utils.Source)) } - if cdrForm.Get(utils.RequestType) != utils.META_RATED { - t.Errorf("Expected: %s, received: %s", utils.META_RATED, cdrForm.Get(utils.RequestType)) + if cdrForm.Get(utils.RequestType) != utils.MetaRated { + t.Errorf("Expected: %s, received: %s", utils.MetaRated, cdrForm.Get(utils.RequestType)) } if cdrForm.Get(utils.Tenant) != "cgrates.org" { t.Errorf("Expected: %s, received: %s", "cgrates.org", cdrForm.Get(utils.Tenant)) @@ -391,7 +391,7 @@ func TestCDRAsHttpForm(t *testing.T) { func TestCDRAsExternalCDR(t *testing.T) { storCdr := CDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), @@ -400,7 +400,7 @@ func TestCDRAsExternalCDR(t *testing.T) { expectOutCdr := &ExternalCDR{ CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", RunID: utils.MetaDefault, Usage: "10s", Cost: 1.01, CostDetails: "null", @@ -411,7 +411,7 @@ func TestCDRAsExternalCDR(t *testing.T) { } func TestUsageReqAsCD(t *testing.T) { - req := &UsageRecord{ToR: utils.VOICE, RequestType: utils.META_RATED, + req := &UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: "2013-11-07T08:42:20Z", AnswerTime: "2013-11-07T08:42:26Z", @@ -483,7 +483,7 @@ func TestCDRAsMapStringIface(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1002", @@ -507,7 +507,7 @@ func TestCDRAsMapStringIface(t *testing.T) { utils.Source: utils.UNIT_TEST, utils.OriginID: "dsafdsaf", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1002", @@ -545,7 +545,7 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1002", @@ -570,7 +570,7 @@ func TestCDRTestCDRAsMapStringIface2(t *testing.T) { utils.Source: utils.UNIT_TEST, utils.OriginID: "dsafdsaf", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1002", @@ -619,7 +619,7 @@ func TestCDRAsExportRecord(t *testing.T) { time.Unix(1383813745, 0).UTC().String()), ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -831,7 +831,7 @@ func TestCDRAsCDRsql(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -890,7 +890,7 @@ func TestCDRNewCDRFromSQL(t *testing.T) { AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), Usage: 10000000000, Cost: 1.01, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, OriginHost: "192.168.1.1", ExtraFields: utils.ToJSON(extraFields), } @@ -901,7 +901,7 @@ func TestCDRNewCDRFromSQL(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -931,7 +931,7 @@ func TestCDRAsCGREvent(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -960,7 +960,7 @@ func TestCDRAsCGREvent(t *testing.T) { "OriginHost": "192.168.1.1", "OriginID": "dsafdsaf", "Partial": false, - "RequestType": utils.META_RATED, + "RequestType": utils.MetaRated, "RunID": utils.MetaDefault, "SetupTime": time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), "Source": "UNIT_TEST", @@ -1000,7 +1000,7 @@ func TestCDRAddDefaults(t *testing.T) { ToR: utils.VOICE, RunID: utils.MetaDefault, Subject: "1001", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: utils.CALL, OriginID: "dsafdsaf", @@ -1021,7 +1021,7 @@ func TestCDRexportFieldValue(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -1055,7 +1055,7 @@ func TestCDReRoundingDecimals(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -1181,7 +1181,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -1203,7 +1203,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -1222,7 +1222,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", diff --git a/engine/cdrs.go b/engine/cdrs.go index 2b251707a..03a68155d 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -247,7 +247,7 @@ func (cdrS *CDRServer) rateCDR(cdr *CDRWithOpts) ([]*CDR, error) { return []*CDR{cdr.CDR}, nil } -var reqTypes = utils.NewStringSet([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID, +var reqTypes = utils.NewStringSet([]string{utils.META_PSEUDOPREPAID, utils.MetaPostpaid, utils.META_PREPAID, utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID, utils.MetaDynaprepaid}) // getCostFromRater will retrieve the cost from RALs diff --git a/engine/datamanager.go b/engine/datamanager.go index 6e46dfd07..5fa9cdfa4 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -43,7 +43,7 @@ var ( utils.AccountProfileFilterIndexPrfx: {}, } cachePrefixMap = utils.StringSet{ - utils.DESTINATION_PREFIX: {}, + utils.DestinationPrefix: {}, utils.REVERSE_DESTINATION_PREFIX: {}, utils.RATING_PLAN_PREFIX: {}, utils.RATING_PROFILE_PREFIX: {}, @@ -169,7 +169,7 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b } } switch prfx { - case utils.DESTINATION_PREFIX: + case utils.DestinationPrefix: _, err = dm.GetDestination(dataID, false, true, utils.NonTransactional) case utils.REVERSE_DESTINATION_PREFIX: _, err = dm.GetReverseDestination(dataID, false, true, utils.NonTransactional) @@ -335,12 +335,12 @@ func (dm *DataManager) RebuildReverseForPrefix(prefix string) (err error) { return } var keys []string - if keys, err = dm.dataDB.GetKeysForPrefix(utils.DESTINATION_PREFIX); err != nil { + if keys, err = dm.dataDB.GetKeysForPrefix(utils.DestinationPrefix); err != nil { return } for _, key := range keys { var dest *Destination - if dest, err = dm.GetDestination(key[len(utils.DESTINATION_PREFIX):], false, true, utils.NonTransactional); err != nil { + if dest, err = dm.GetDestination(key[len(utils.DestinationPrefix):], false, true, utils.NonTransactional); err != nil { return err } if err = dm.SetReverseDestination(dest.Id, dest.Prefixes, utils.NonTransactional); err != nil { diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go index 1bd802502..9e1707210 100644 --- a/engine/fscdr_test.go +++ b/engine/fscdr_test.go @@ -422,7 +422,7 @@ func TestFsCdrCDRFields(t *testing.T) { OriginHost: "", Source: "freeswitch_json", Category: "call", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Account: "1001", Subject: "1001", diff --git a/engine/libtest.go b/engine/libtest.go index 6a2915779..d5a52febf 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -594,7 +594,7 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats { func GetDefaultEmptyArgCachePrefix() map[string][]string { return map[string][]string{ - utils.DESTINATION_PREFIX: nil, + utils.DestinationPrefix: nil, utils.REVERSE_DESTINATION_PREFIX: nil, utils.RATING_PLAN_PREFIX: nil, utils.RATING_PROFILE_PREFIX: nil, diff --git a/engine/pstr_amqp.go b/engine/pstr_amqp.go index ded0edc6b..e70a452a6 100644 --- a/engine/pstr_amqp.go +++ b/engine/pstr_amqp.go @@ -95,7 +95,7 @@ func (pstr *AMQPPoster) Post(content []byte, _ string) (err error) { false, // immediate amqp.Publishing{ DeliveryMode: amqp.Persistent, - ContentType: utils.CONTENT_JSON, + ContentType: utils.ContentJSON, Body: content, }); err == nil { break diff --git a/engine/pstr_http.go b/engine/pstr_http.go index b99a8d471..45e8eee83 100644 --- a/engine/pstr_http.go +++ b/engine/pstr_http.go @@ -57,7 +57,7 @@ func HTTPPostJSON(url string, content []byte) (respBody []byte, err error) { // NewHTTPPoster return a new HTTP poster func NewHTTPPoster(replyTimeout time.Duration, addr, contentType string, attempts int) (httposter *HTTPPoster, err error) { - if !utils.SliceHasMember([]string{utils.CONTENT_FORM, utils.CONTENT_JSON, utils.CONTENT_TEXT}, contentType) { + if !utils.SliceHasMember([]string{utils.CONTENT_FORM, utils.ContentJSON, utils.CONTENT_TEXT}, contentType) { return nil, fmt.Errorf("unsupported ContentType: %s", contentType) } return &HTTPPoster{ @@ -130,7 +130,7 @@ func (pstr *HTTPPoster) getRequest(content interface{}, hdr http.Header) (req *h body = bytes.NewBuffer(content.([]byte)) } contentType := "application/x-www-form-urlencoded" - if pstr.contentType == utils.CONTENT_JSON { + if pstr.contentType == utils.ContentJSON { contentType = "application/json" } hdr.Set("Content-Type", contentType) diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index 6cc9b4527..15eca3c52 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -83,7 +83,7 @@ func (iDB *InternalDB) SelectDatabase(string) (err error) { // GetKeysForPrefix returns the keys from cache that have the given prefix func (iDB *InternalDB) GetKeysForPrefix(prefix string) (ids []string, err error) { - keyLen := len(utils.DESTINATION_PREFIX) + keyLen := len(utils.DestinationPrefix) if len(prefix) < keyLen { err = fmt.Errorf("unsupported prefix in GetKeysForPrefix: %s", prefix) return @@ -183,7 +183,7 @@ func (iDB *InternalDB) IsDBEmpty() (isEmpty bool, err error) { func (iDB *InternalDB) HasDataDrv(category, subject, tenant string) (bool, error) { switch category { - case utils.DESTINATION_PREFIX, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, + case utils.DestinationPrefix, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, utils.ACTION_PREFIX, utils.ACTION_PLAN_PREFIX, utils.ACCOUNT_PREFIX: return Cache.HasItem(utils.CachePrefixToInstance[category], subject), nil case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index 0afcac985..69340d4c4 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -396,7 +396,7 @@ func (ms *MongoStorage) SelectDatabase(dbName string) (err error) { func (ms *MongoStorage) RemoveKeysForPrefix(prefix string) (err error) { var colName string switch prefix { - case utils.DESTINATION_PREFIX: + case utils.DestinationPrefix: colName = ColDst case utils.REVERSE_DESTINATION_PREFIX: colName = ColRds @@ -545,7 +545,7 @@ func (ms *MongoStorage) getField3(sctx mongo.SessionContext, col, prefix, field // GetKeysForPrefix implementation func (ms *MongoStorage) GetKeysForPrefix(prefix string) (result []string, err error) { var category, subject string - keyLen := len(utils.DESTINATION_PREFIX) + keyLen := len(utils.DestinationPrefix) if len(prefix) < keyLen { return nil, fmt.Errorf("unsupported prefix in GetKeysForPrefix: %q", prefix) } @@ -554,8 +554,8 @@ func (ms *MongoStorage) GetKeysForPrefix(prefix string) (result []string, err er subject = fmt.Sprintf("^%s", prefix[keyLen:]) // old way, no tenant support err = ms.query(func(sctx mongo.SessionContext) (err error) { switch category { - case utils.DESTINATION_PREFIX: - result, err = ms.getField(sctx, ColDst, utils.DESTINATION_PREFIX, subject, "key") + case utils.DestinationPrefix: + result, err = ms.getField(sctx, ColDst, utils.DestinationPrefix, subject, "key") case utils.REVERSE_DESTINATION_PREFIX: result, err = ms.getField(sctx, ColRds, utils.REVERSE_DESTINATION_PREFIX, subject, "key") case utils.RATING_PLAN_PREFIX: @@ -647,7 +647,7 @@ func (ms *MongoStorage) HasDataDrv(category, subject, tenant string) (has bool, err = ms.query(func(sctx mongo.SessionContext) (err error) { var count int64 switch category { - case utils.DESTINATION_PREFIX: + case utils.DestinationPrefix: count, err = ms.getCol(ColDst).CountDocuments(sctx, bson.M{"key": subject}) case utils.RATING_PLAN_PREFIX: count, err = ms.getCol(ColRpl).CountDocuments(sctx, bson.M{"key": subject}) diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 856c6d41d..da8abbaf7 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -262,7 +262,7 @@ func (rs *RedisStorage) GetKeysForPrefix(prefix string) (keys []string, err erro func (rs *RedisStorage) HasDataDrv(category, subject, tenant string) (exists bool, err error) { var i int switch category { - case utils.DESTINATION_PREFIX, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, + case utils.DestinationPrefix, utils.RATING_PLAN_PREFIX, utils.RATING_PROFILE_PREFIX, utils.ACTION_PREFIX, utils.ACTION_PLAN_PREFIX, utils.ACCOUNT_PREFIX: err = rs.Cmd(&i, redis_EXISTS, category+subject) return i == 1, err @@ -362,7 +362,7 @@ func (rs *RedisStorage) RemoveRatingProfileDrv(key string) (err error) { // GetDestination retrieves a destination with id from tp_db func (rs *RedisStorage) GetDestinationDrv(key, transactionID string) (dest *Destination, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.DESTINATION_PREFIX+key); err != nil { + if err = rs.Cmd(&values, redis_GET, utils.DestinationPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -391,7 +391,7 @@ func (rs *RedisStorage) SetDestinationDrv(dest *Destination, transactionID strin w := zlib.NewWriter(&b) w.Write(result) w.Close() - err = rs.Cmd(nil, redis_SET, utils.DESTINATION_PREFIX+dest.Id, b.String()) + err = rs.Cmd(nil, redis_SET, utils.DestinationPrefix+dest.Id, b.String()) return } @@ -415,7 +415,7 @@ func (rs *RedisStorage) SetReverseDestinationDrv(destID string, prefixes []strin } func (rs *RedisStorage) RemoveDestinationDrv(destID, transactionID string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.DESTINATION_PREFIX+destID) + return rs.Cmd(nil, redis_DEL, utils.DestinationPrefix+destID) } func (rs *RedisStorage) RemoveReverseDestinationDrv(dstID, prfx, transactionID string) (err error) { diff --git a/engine/suretax_test.go b/engine/suretax_test.go index 44cdd5ba3..0fd42ac4a 100644 --- a/engine/suretax_test.go +++ b/engine/suretax_test.go @@ -31,7 +31,7 @@ func TestNewSureTaxRequest(t *testing.T) { CGRID := utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()) cdr := &CDR{CGRID: CGRID, OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), diff --git a/engine/tpreader.go b/engine/tpreader.go index a918ed5b2..e327256ef 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -195,7 +195,7 @@ func (tpr *TpReader) LoadDestinationRates() (err error) { _, destinationExists = tpr.destinations[dr.DestinationId] } if !destinationExists && tpr.dm.dataDB != nil { - if destinationExists, err = tpr.dm.HasData(utils.DESTINATION_PREFIX, dr.DestinationId, ""); err != nil { + if destinationExists, err = tpr.dm.HasData(utils.DestinationPrefix, dr.DestinationId, ""); err != nil { return err } } @@ -263,7 +263,7 @@ func (tpr *TpReader) LoadRatingPlansFiltered(tag string) (bool, error) { if err != nil { if err.Error() == utils.ErrNotFound.Error() { // if the destination doesn't exists in stordb check it in dataDB if tpr.dm.dataDB != nil { - if dbExists, err := tpr.dm.HasData(utils.DESTINATION_PREFIX, drate.DestinationId, ""); err != nil { + if dbExists, err := tpr.dm.HasData(utils.DestinationPrefix, drate.DestinationId, ""); err != nil { return false, err } else if dbExists { continue @@ -2025,7 +2025,7 @@ func (tpr *TpReader) ShowStatistics() { // GetLoadedIds returns the identities loaded for a specific category, useful for cache reloads func (tpr *TpReader) GetLoadedIds(categ string) ([]string, error) { switch categ { - case utils.DESTINATION_PREFIX: + case utils.DestinationPrefix: keys := make([]string, len(tpr.destinations)) i := 0 for k := range tpr.destinations { @@ -2576,7 +2576,7 @@ func (tpr *TpReader) ReloadCache(caching string, verbose bool, opts map[string]i return } // take IDs for each type - dstIds, _ := tpr.GetLoadedIds(utils.DESTINATION_PREFIX) + dstIds, _ := tpr.GetLoadedIds(utils.DestinationPrefix) revDstIDs, _ := tpr.GetLoadedIds(utils.REVERSE_DESTINATION_PREFIX) rplIds, _ := tpr.GetLoadedIds(utils.RATING_PLAN_PREFIX) rpfIds, _ := tpr.GetLoadedIds(utils.RATING_PROFILE_PREFIX) diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index ed1f68cac..b360aac93 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -383,7 +383,7 @@ func testActionsitThresholdCDrLog(t *testing.T) { utils.Source: utils.UNIT_TEST, utils.OriginID: "dsafdsaf", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "th_acc", @@ -490,7 +490,7 @@ func testActionsitCDRAccount(t *testing.T) { OriginID: "testDspCDRsProcessCDR", OriginHost: "192.168.1.1", Source: "testDspCDRsProcessCDR", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, RunID: utils.MetaDefault, PreRated: true, Account: acnt, @@ -665,7 +665,7 @@ func testActionsitThresholdPostEvent(t *testing.T) { utils.OriginHost: "192.168.1.1", utils.Source: utils.UNIT_TEST, utils.OriginID: "dsafdsaf", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC), utils.PDD: 0 * time.Second, @@ -877,7 +877,7 @@ func testActionsitresetAccountCDR(t *testing.T) { OriginID: "testDsp", OriginHost: "192.168.1.1", Source: "testDsp", - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, RunID: utils.MetaDefault, PreRated: true, Account: account, diff --git a/engine/z_cdr_it_test.go b/engine/z_cdr_it_test.go index b89e16c1d..7f7c04f1c 100644 --- a/engine/z_cdr_it_test.go +++ b/engine/z_cdr_it_test.go @@ -31,7 +31,7 @@ import ( func TestHttpJsonPost(t *testing.T) { cdrOut := &ExternalCDR{CGRID: utils.Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf", OriginHost: "192.168.1.1", - Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Tenant: "cgrates.org", + Source: utils.UNIT_TEST, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "account1", Subject: "tgooiscs0014", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 20, 0, time.UTC).String(), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String(), RunID: utils.MetaDefault, diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 6b4c281c6..7b6360676 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -157,13 +157,13 @@ func testOnStorITCacheDestinations(t *testing.T) { if _, hasIt := Cache.Get(utils.CacheDestinations, dst.Id); hasIt { t.Error("Already in cache") } - if err := onStor.CacheDataFromDB(utils.DESTINATION_PREFIX, []string{dst.Id}, true); err != nil { // Should not cache due to mustBeCached + if err := onStor.CacheDataFromDB(utils.DestinationPrefix, []string{dst.Id}, true); err != nil { // Should not cache due to mustBeCached t.Error(err) } if _, hasIt := Cache.Get(utils.CacheDestinations, dst.Id); hasIt { t.Error("Should not be in cache") } - if err := onStor.CacheDataFromDB(utils.DESTINATION_PREFIX, []string{dst.Id}, false); err != nil { + if err := onStor.CacheDataFromDB(utils.DestinationPrefix, []string{dst.Id}, false); err != nil { t.Error(err) } if itm, hasIt := Cache.Get(utils.CacheDestinations, dst.Id); !hasIt { diff --git a/engine/z_poster_it_test.go b/engine/z_poster_it_test.go index 6d765969e..4e1578aa7 100644 --- a/engine/z_poster_it_test.go +++ b/engine/z_poster_it_test.go @@ -68,14 +68,14 @@ func TestHttpJsonPoster(t *testing.T) { config.CgrConfig().GeneralCfg().FailedPostsDir = "/tmp" content := &TestContent{Var1: "Val1", Var2: "Val2"} jsn, _ := json.Marshal(content) - pstr, err := NewHTTPPoster(2*time.Second, "http://localhost:8080/invalid", utils.CONTENT_JSON, 3) + pstr, err := NewHTTPPoster(2*time.Second, "http://localhost:8080/invalid", utils.ContentJSON, 3) if err != nil { t.Error(err) } if err = pstr.PostValues(jsn, make(http.Header)); err == nil { t.Error("Expected error") } - AddFailedPost("http://localhost:8080/invalid", utils.CONTENT_JSON, "test1", jsn, make(map[string]interface{})) + AddFailedPost("http://localhost:8080/invalid", utils.ContentJSON, "test1", jsn, make(map[string]interface{})) time.Sleep(5 * time.Millisecond) fs, err := filepath.Glob("/tmp/test1*") if err != nil { @@ -108,7 +108,7 @@ func TestHttpBytesPoster(t *testing.T) { if err = pstr.PostValues(content, make(http.Header)); err == nil { t.Error("Expected error") } - AddFailedPost("http://localhost:8080/invalid", utils.CONTENT_JSON, "test2", content, make(map[string]interface{})) + AddFailedPost("http://localhost:8080/invalid", utils.ContentJSON, "test2", content, make(map[string]interface{})) time.Sleep(5 * time.Millisecond) fs, err := filepath.Glob("/tmp/test2*") if err != nil { diff --git a/engine/z_storage_cdrs_it_test.go b/engine/z_storage_cdrs_it_test.go index 3cbc5071b..79ab68179 100644 --- a/engine/z_storage_cdrs_it_test.go +++ b/engine/z_storage_cdrs_it_test.go @@ -146,7 +146,7 @@ func testSetCDR(cfg *config.CGRConfig) error { if err := cdrStorage.SetCDR(ratedCDR, false); err == nil { return fmt.Errorf("Duplicating ratedCDR: %+v works", ratedCDR) } - ratedCDR.RequestType = utils.META_RATED + ratedCDR.RequestType = utils.MetaRated ratedCDR.Cost = 0.34 if err := cdrStorage.SetCDR(ratedCDR, true); err != nil { return fmt.Errorf("Rerating ratedCDR: %+v, SetCDR err: %s", ratedCDR, err.Error()) @@ -296,7 +296,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs", OriginID: "testevent1", ToR: utils.VOICE, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call_derived", Account: "1001", @@ -316,7 +316,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs", OriginID: "testevent2", ToR: utils.VOICE, - RequestType: utils.META_POSTPAID, + RequestType: utils.MetaPostpaid, Tenant: "itsyscom.com", Category: "call", Account: "1004", @@ -356,7 +356,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs3", OriginID: "testevent3", ToR: utils.VOICE, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1002", @@ -397,7 +397,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs", OriginID: "testevent4", ToR: utils.VOICE, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "itsyscom.com", Category: "call", Account: "1003", @@ -727,13 +727,13 @@ func testGetCDRs(cfg *config.CGRConfig) error { return fmt.Errorf("testGetCDRs #77, unexpected number of CDRs returned: %+v", CDRs) } // Combined filter - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.META_RATED}, AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.MetaRated}, AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}, false); err != nil { return fmt.Errorf("testGetCDRs #84, err: %v", err) } else if len(CDRs) != 1 { return fmt.Errorf("testGetCDRs #85, unexpected number of CDRs returned: %+v", CDRs) } // Remove CDRs - if _, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.META_RATED}, AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}, true); err != nil { + if _, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.MetaRated}, AnswerTimeStart: &timeStart, AnswerTimeEnd: &timeEnd}, true); err != nil { return fmt.Errorf("testGetCDRs #86, err: %v", err) } // All CDRs, no filter diff --git a/ers/amqp_it_test.go b/ers/amqp_it_test.go index 6c54d75af..e1100745e 100644 --- a/ers/amqp_it_test.go +++ b/ers/amqp_it_test.go @@ -94,7 +94,7 @@ func TestAMQPER(t *testing.T) { false, // mandatory false, // immediate amqp.Publishing{ - ContentType: utils.CONTENT_JSON, + ContentType: utils.ContentJSON, Body: []byte(fmt.Sprintf(`{"CGRID": "%s"}`, randomCGRID)), DeliveryMode: amqp.Persistent, // 1=non-persistent, 2=persistent }, diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go index ec0c8e6fb..6681d0b6a 100644 --- a/general_tests/auth_test.go +++ b/general_tests/auth_test.go @@ -140,7 +140,7 @@ func TestAuthPostpaidNoAcnt(t *testing.T) { func TestAuthPostpaidFallbackDest(t *testing.T) { // Test subject which has fallback for destination - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.META_POSTPAID, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", Category: "call", Account: "testauthpostpaid1", Subject: "testauthpostpaid2", Destination: "441231234", SetupTime: time.Date(2015, 8, 27, 11, 26, 0, 0, time.UTC).String()} cd, err := cdr.AsCallDescriptor("", false) @@ -157,7 +157,7 @@ func TestAuthPostpaidFallbackDest(t *testing.T) { func TestAuthPostpaidWithDestination(t *testing.T) { // Test subject which does not have destination attached - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.META_POSTPAID, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPostpaid, Tenant: "cgrates.org", Category: "call", Account: "testauthpostpaid1", Subject: "testauthpostpaid1", Destination: "4986517174963", SetupTime: time.Date(2015, 8, 27, 11, 26, 0, 0, time.UTC).String()} cd, err := cdr.AsCallDescriptor("", false) diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index bab5f346f..59c35b611 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -142,7 +142,7 @@ func testbrodcastItProccessEvent(t *testing.T) { utils.Category: utils.CALL, utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1Brodcast", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index 6d78fbbc9..ee4e0f03b 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -66,7 +66,7 @@ var ( utils.ToR: utils.VOICE, utils.OriginID: "TestCDRsExp", utils.OriginHost: "192.168.1.0", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", @@ -84,7 +84,7 @@ var ( utils.CGRID: "TestCGRID", utils.ToR: utils.VOICE, utils.OriginID: "TestCDRsExp", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Tenant: "cgrates.org", utils.Category: "call", utils.AccountField: "1001", diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index c92283fdb..320d6e131 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -167,7 +167,7 @@ func testV2CDRsProcessCDR(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR1", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR", utils.Subject: "ANY2CNT", @@ -239,7 +239,7 @@ func testV2CDRsProcessCDR2(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR2", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR2", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR2", utils.Subject: "ANY2CNT", @@ -313,7 +313,7 @@ func testV2CDRsProcessCDR3(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR3", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR3", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR3", utils.Subject: "ANY2CNT", @@ -376,7 +376,7 @@ func testV2CDRsProcessCDR4(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR4", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR4", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR4", utils.Subject: "ANY2CNT", @@ -567,7 +567,7 @@ func testV2CDRsProcessCDR5(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR5", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR5", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR5", utils.Subject: "ANY2CNT2", @@ -635,7 +635,7 @@ func testV2CDRsProcessCDR6(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR5", utils.OriginHost: "192.168.1.2", utils.Source: "testV2CDRsProcessCDR6", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR6", utils.Subject: "ANY2CNT", @@ -695,7 +695,7 @@ func testV2CDRsProcessCDR7(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR7", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR7", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testV2CDRsProcessCDR7", utils.Subject: "ANY2CNT", diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go index a6e7828b6..0671c49fb 100644 --- a/general_tests/cdrs_post_failover_it_test.go +++ b/general_tests/cdrs_post_failover_it_test.go @@ -149,7 +149,7 @@ func testCDRsPostFailoverProcessCDR(t *testing.T) { utils.OriginID: "testCDRsPostFailoverProcessCDR", utils.OriginHost: "192.168.1.1", utils.Source: "testCDRsPostFailoverProcessCDR", - utils.RequestType: utils.META_RATED, + utils.RequestType: utils.MetaRated, utils.Category: "call", utils.AccountField: "testCDRsPostFailoverProcessCDR", utils.Subject: "ANY2CNT", diff --git a/general_tests/oldtutorial_it_test.go b/general_tests/oldtutorial_it_test.go index 94ae7ee51..31ba665cf 100644 --- a/general_tests/oldtutorial_it_test.go +++ b/general_tests/oldtutorial_it_test.go @@ -519,7 +519,7 @@ package general_tests // } else if maxTime != 1 { // t.Errorf("Calling APIerSv2.MaxUsage got maxTime: %f", maxTime) // } -// setupReq = &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call", +// setupReq = &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", // Account: "test_max_usage", Destination: "1001", // SetupTime: "2014-08-04T13:00:00Z", // } @@ -547,7 +547,7 @@ package general_tests // // Test CDR from external sources // func TestTutITProcessExternalCdr(t *testing.T) { // cdr := &engine.ExternalCDR{ToR: utils.VOICE, -// OriginID: "testextcdr1", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, +// OriginID: "testextcdr1", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1003", Subject: "1003", Destination: "1001", // SetupTime: "2014-08-04T13:00:00Z", AnswerTime: "2014-08-04T13:00:07Z", // Usage: "1", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -577,7 +577,7 @@ package general_tests // time.Sleep(time.Duration(**waitRater) * time.Millisecond) // eCdr := &engine.ExternalCDR{CGRID: "63a8d2bfeca2cfb790826c3ec461696d6574cfde", OrderID: 2, // ToR: utils.VOICE, -// OriginID: "testextcdr2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, +// OriginID: "testextcdr2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1004", Subject: "1004", Destination: "1001", // SetupTime: time.Date(2014, 8, 4, 13, 0, 0, 0, time.UTC).Local().Format(time.RFC3339), // AnswerTime: time.Date(2014, 8, 4, 13, 0, 7, 0, time.UTC).Local().Format(time.RFC3339), Usage: "2s", @@ -632,7 +632,7 @@ package general_tests // func TestTutITCostErrors(t *testing.T) { // cdr := &engine.ExternalCDR{ToR: utils.VOICE, -// OriginID: "TestTutIT_1", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, +// OriginID: "TestTutIT_1", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "fake", Account: "2001", Subject: "2001", Destination: "1001", // SetupTime: "2014-08-04T13:00:00Z", AnswerTime: "2014-08-04T13:00:07Z", // Usage: "1", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -659,7 +659,7 @@ package general_tests // } // } // cdr2 := &engine.ExternalCDR{ToR: utils.VOICE, -// OriginID: "TestTutIT_2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_POSTPAID, +// OriginID: "TestTutIT_2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaPostpaid , // Tenant: "cgrates.org", Category: "fake", Account: "2002", Subject: "2002", Destination: "1001", // SetupTime: "2014-08-04T13:00:00Z", AnswerTime: "2014-08-04T13:00:07Z", // Usage: "1", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -684,7 +684,7 @@ package general_tests // } // } // cdr3 := &engine.ExternalCDR{ToR: utils.VOICE, -// OriginID: "TestTutIT_3", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_POSTPAID, +// OriginID: "TestTutIT_3", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.MetaPostpaid , // Tenant: "cgrates.org", Category: "fake", Account: "1001", Subject: "1001", Destination: "2002", // SetupTime: "2014-08-04T13:00:00Z", AnswerTime: "2014-08-04T13:00:07Z", // Usage: "1", ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, @@ -948,7 +948,7 @@ package general_tests // testCdr1 := &engine.CDR{CGRID: utils.Sha1("testcdr1", // time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), // ToR: utils.VOICE, OriginID: "testcdr1", OriginHost: "192.168.1.1", -// Source: "TEST_QOS_LCR", RequestType: utils.META_RATED, +// Source: "TEST_QOS_LCR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1001", // Subject: "1001", Destination: "1002", // SetupTime: time.Date(2014, 12, 7, 8, 42, 24, 0, time.UTC), @@ -958,7 +958,7 @@ package general_tests // testCdr2 := &engine.CDR{CGRID: utils.Sha1("testcdr2", // time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), // ToR: utils.VOICE, OriginID: "testcdr2", OriginHost: "192.168.1.1", -// Source: "TEST_QOS_LCR", RequestType: utils.META_RATED, +// Source: "TEST_QOS_LCR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1002", // Subject: "1002", Destination: "1003", // SetupTime: time.Date(2014, 12, 7, 8, 42, 24, 0, time.UTC), @@ -1001,7 +1001,7 @@ package general_tests // // t.Errorf("Expecting: %+v, %+v, received: %+v, %+v", eStLcr.SupplierCosts[0], eStLcr.SupplierCosts[1], lcr.SupplierCosts[0], lcr.SupplierCosts[1]) // } // testCdr3 := &engine.CDR{CGRID: utils.Sha1("testcdr3", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), -// ToR: utils.VOICE, OriginID: "testcdr3", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.META_RATED, +// ToR: utils.VOICE, OriginID: "testcdr3", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1003", Subject: "1003", Destination: "1004", // SetupTime: time.Date(2014, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2014, 12, 7, 8, 42, 26, 0, time.UTC), // Usage: 180 * time.Second} @@ -1063,7 +1063,7 @@ package general_tests // // t.Errorf("Expecting: %+v, %+v received: %+v, %+v", eLcr.SupplierCosts[0], eLcr.SupplierCosts[1], lcr.SupplierCosts[0], lcr.SupplierCosts[1]) // } // testCdr4 := &engine.CDR{CGRID: utils.Sha1("testcdr4", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), -// ToR: utils.VOICE, OriginID: "testcdr4", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.META_RATED, +// ToR: utils.VOICE, OriginID: "testcdr4", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1003", Subject: "1003", Destination: "1004", // SetupTime: time.Date(2014, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2014, 12, 7, 8, 42, 26, 0, time.UTC), // Usage: 60 * time.Second} @@ -1127,7 +1127,7 @@ package general_tests // // t.Errorf("Expecting: %+v, received: %+v", eLcr.SupplierCosts[1], lcr.SupplierCosts[1]) // } // testCdr5 := &engine.CDR{CGRID: utils.Sha1("testcdr5", time.Date(2013, 12, 7, 8, 42, 24, 0, time.UTC).String()), -// ToR: utils.VOICE, OriginID: "testcdr5", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.META_RATED, +// ToR: utils.VOICE, OriginID: "testcdr5", OriginHost: "192.168.1.1", Source: "TEST_QOS_LCR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1003", Subject: "1003", Destination: "1004", // SetupTime: time.Date(2014, 12, 7, 8, 42, 24, 0, time.UTC), AnswerTime: time.Date(2014, 12, 7, 8, 42, 26, 0, time.UTC), // Usage: time.Second} @@ -1405,7 +1405,7 @@ package general_tests // } // func TestTutITExportCDR(t *testing.T) { -// cdr := &engine.CDR{ToR: utils.VOICE, OriginID: "testexportcdr1", OriginHost: "192.168.1.1", Source: "TestTutITExportCDR", RequestType: utils.META_RATED, +// cdr := &engine.CDR{ToR: utils.VOICE, OriginID: "testexportcdr1", OriginHost: "192.168.1.1", Source: "TestTutITExportCDR", RequestType: utils.MetaRated, // Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1003", // SetupTime: time.Date(2016, 11, 30, 17, 5, 24, 0, time.UTC), AnswerTime: time.Date(2016, 11, 30, 17, 6, 4, 0, time.UTC), // Usage: 98 * time.Second, diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go index 5ba8a0293..09f69c7fb 100644 --- a/general_tests/session4_it_test.go +++ b/general_tests/session4_it_test.go @@ -136,7 +136,7 @@ func testSes4CDRsProcessCDR(t *testing.T) { utils.OriginID: "testV2CDRsProcessCDR1", utils.OriginHost: "192.168.1.1", utils.Source: "testV2CDRsProcessCDR", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, utils.Category: "free", utils.AccountField: "dan7", utils.Subject: "RP_FREE", diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go index c086395e0..133c6fb08 100644 --- a/general_tests/suretax_it_test.go +++ b/general_tests/suretax_it_test.go @@ -130,7 +130,7 @@ func testSTICacheStats(t *testing.T) { // Test CDR from external sources func testSTIProcessExternalCdr(t *testing.T) { cdr := &engine.ExternalCDR{ToR: utils.VOICE, - OriginID: "teststicdr1", OriginHost: "192.168.1.1", Source: "STI_TEST", RequestType: utils.META_RATED, + OriginID: "teststicdr1", OriginHost: "192.168.1.1", Source: "STI_TEST", RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "+14082342500", Destination: "+16268412300", Supplier: "SUPPL1", SetupTime: "2015-10-18T13:00:00Z", AnswerTime: "2015-10-18T13:00:00Z", Usage: "15s", PDD: "7.0", ExtraFields: map[string]string{"CustomerNumber": "000000534", "ZipCode": ""}, diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go index 53e5c6d02..bb10659bf 100755 --- a/general_tests/tutorial_calls_test.go +++ b/general_tests/tutorial_calls_test.go @@ -549,7 +549,7 @@ func testCall1002Cdrs(t *testing.T) { } else if len(reply) != 1 { t.Error("Unexpected number of CDRs returned: ", len(reply)) } else { - if reply[0].RequestType != utils.META_POSTPAID { + if reply[0].RequestType != utils.MetaPostpaid { t.Errorf("Unexpected RequestType for CDR: %+v", reply[0].RequestType) } // in case of Asterisk take the integer part from usage diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index bc872c887..f0e6ad968 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -137,7 +137,7 @@ func testCdrITMigrateAndMove(t *testing.T) { OriginID: "dsafdsaf", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, - RequestType: utils.META_RATED, + RequestType: utils.MetaRated, Tenant: "cgrates.org", Category: "call", Account: "1001", diff --git a/migrator/destinations.go b/migrator/destinations.go index 5070fc35e..27cb29250 100644 --- a/migrator/destinations.go +++ b/migrator/destinations.go @@ -28,12 +28,12 @@ import ( func (m *Migrator) migrateCurrentDestinations() (err error) { var ids []string - ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.DESTINATION_PREFIX) + ids, err = m.dmIN.DataManager().DataDB().GetKeysForPrefix(utils.DestinationPrefix) if err != nil { return err } for _, id := range ids { - idg := strings.TrimPrefix(id, utils.DESTINATION_PREFIX) + idg := strings.TrimPrefix(id, utils.DestinationPrefix) dst, err := m.dmIN.DataManager().GetDestination(idg, false, true, utils.NonTransactional) if err != nil { return err diff --git a/sessions/libsessions.go b/sessions/libsessions.go index cd1d70119..5a09418c7 100644 --- a/sessions/libsessions.go +++ b/sessions/libsessions.go @@ -30,9 +30,9 @@ import ( ) var unratedReqs = engine.MapEvent{ - utils.META_POSTPAID: struct{}{}, + utils.MetaPostpaid: struct{}{}, utils.META_PSEUDOPREPAID: struct{}{}, - utils.META_RATED: struct{}{}, + utils.MetaRated: struct{}{}, } var authReqs = engine.MapEvent{ diff --git a/sessions/session_test.go b/sessions/session_test.go index 4420d6188..3e3082028 100644 --- a/sessions/session_test.go +++ b/sessions/session_test.go @@ -758,7 +758,7 @@ func TestUpdateSRuns(t *testing.T) { updEv := map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT2", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_POSTPAID, + utils.RequestType: utils.MetaPostpaid, } s.updateSRuns(updEv, utils.NewStringSet(nil)) if s.SRuns[0].Event[utils.RequestType] != utils.META_PREPAID { @@ -769,8 +769,8 @@ func TestUpdateSRuns(t *testing.T) { t.Errorf("Expected session to not change") } s.UpdateSRuns(updEv, utils.NewStringSet([]string{utils.RequestType})) - if s.SRuns[0].Event[utils.RequestType] != utils.META_POSTPAID { + if s.SRuns[0].Event[utils.RequestType] != utils.MetaPostpaid { t.Errorf("Expected request type to be: %q, received: %q", - utils.META_POSTPAID, s.SRuns[0].Event[utils.RequestType]) + utils.MetaPostpaid, s.SRuns[0].Event[utils.RequestType]) } } diff --git a/utils/consts.go b/utils/consts.go index 6b8dbec40..af1597934 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -26,20 +26,20 @@ var ( MainCDRFields = NewStringSet([]string{CGRID, Source, OriginHost, OriginID, ToR, RequestType, Tenant, Category, AccountField, Subject, Destination, SetupTime, AnswerTime, Usage, COST, RATED, Partial, RunID, PreRated, CostSource, CostDetails, ExtraInfo, OrderID}) - PostPaidRatedSlice = []string{META_POSTPAID, META_RATED} + PostPaidRatedSlice = []string{MetaPostpaid, MetaRated} GitLastLog string // If set, it will be processed as part of versioning PosterTransportContentTypes = map[string]string{ - MetaHTTPjsonCDR: CONTENT_JSON, - MetaHTTPjsonMap: CONTENT_JSON, - MetaHTTPjson: CONTENT_JSON, - MetaHTTPPost: CONTENT_FORM, - MetaAMQPjsonCDR: CONTENT_JSON, - MetaAMQPjsonMap: CONTENT_JSON, - MetaAMQPV1jsonMap: CONTENT_JSON, - MetaSQSjsonMap: CONTENT_JSON, - MetaKafkajsonMap: CONTENT_JSON, - MetaS3jsonMap: CONTENT_JSON, + MetaHTTPjsonCDR: ContentJSON, + MetaHTTPjsonMap: ContentJSON, + MetaHTTPjson: ContentJSON, + MetaHTTPPost: ContentJSON, + MetaAMQPjsonCDR: ContentJSON, + MetaAMQPjsonMap: ContentJSON, + MetaAMQPV1jsonMap: ContentJSON, + MetaSQSjsonMap: ContentJSON, + MetaKafkajsonMap: ContentJSON, + MetaS3jsonMap: ContentJSON, } // CachePartitions enables creation of cache partitions @@ -66,7 +66,7 @@ var ( CacheTBLTPRoutes, CacheTBLTPAttributes, CacheTBLTPChargers, CacheTBLTPDispatchers, CacheTBLTPDispatcherHosts, CacheTBLTPRateProfiles, CacheTBLTPActionProfiles, CacheTBLTPAccountProfiles}) CacheInstanceToPrefix = map[string]string{ - CacheDestinations: DESTINATION_PREFIX, + CacheDestinations: DestinationPrefix, CacheReverseDestinations: REVERSE_DESTINATION_PREFIX, CacheRatingPlans: RATING_PLAN_PREFIX, CacheRatingProfiles: RATING_PROFILE_PREFIX, @@ -141,7 +141,7 @@ var ( NonMonetaryBalances = NewStringSet([]string{VOICE, SMS, DATA, GENERIC}) // AccountableRequestTypes are the ones handled by Accounting subsystem - AccountableRequestTypes = NewStringSet([]string{META_PREPAID, META_POSTPAID, META_PSEUDOPREPAID}) + AccountableRequestTypes = NewStringSet([]string{META_PREPAID, MetaPostpaid, META_PSEUDOPREPAID}) CacheStorDBPartitions = map[string]string{ TBLTPTimings: CacheTBLTPTimings, @@ -173,7 +173,7 @@ var ( // ProtectedSFlds are the fields that sessions should not alter ProtectedSFlds = NewStringSet([]string{CGRID, OriginHost, OriginID, Usage}) ArgCacheToPrefix = map[string]string{ - DestinationIDs: DESTINATION_PREFIX, + DestinationIDs: DestinationPrefix, ReverseDestinationIDs: REVERSE_DESTINATION_PREFIX, RatingPlanIDs: RATING_PLAN_PREFIX, RatingProfileIDs: RATING_PROFILE_PREFIX, @@ -273,10 +273,10 @@ const ( PREPAID = "prepaid" META_PREPAID = "*prepaid" POSTPAID = "postpaid" - META_POSTPAID = "*postpaid" + MetaPostpaid = "*postpaid" PSEUDOPREPAID = "pseudoprepaid" META_PSEUDOPREPAID = "*pseudoprepaid" - META_RATED = "*rated" + MetaRated = "*rated" META_NONE = "*none" META_NOW = "*now" ROUNDING_UP = "*up" @@ -381,7 +381,7 @@ const ( ACTION_PREFIX = "act_" SHARED_GROUP_PREFIX = "shg_" ACCOUNT_PREFIX = "acc_" - DESTINATION_PREFIX = "dst_" + DestinationPrefix = "dst_" REVERSE_DESTINATION_PREFIX = "rds_" DERIVEDCHARGERS_PREFIX = "dcs_" USERS_PREFIX = "usr_" @@ -526,7 +526,7 @@ const ( XMLSuffix = ".xml" CSVSuffix = ".csv" FWVSuffix = ".fwv" - CONTENT_JSON = "json" + ContentJSON = "json" CONTENT_FORM = "form" CONTENT_TEXT = "text" FileLockPrefix = "file_" @@ -852,7 +852,6 @@ const ( ActionsID = "ActionsID" MetaAct = "*act" MetaAcnt = "*acnt" - DestinationPrefix = "DestinationPrefix" DestinationID = "DestinationID" ExportTemplate = "ExportTemplate" ExportFormat = "ExportFormat"