From dbb9216b6ec663e240d47a603083e06d51ad8031 Mon Sep 17 00:00:00 2001 From: andronache Date: Thu, 7 Jan 2021 15:34:12 +0200 Subject: [PATCH] Modified consts in utils --- agents/agentreq_test.go | 16 +++---- agents/fsevent_test.go | 8 ++-- agents/kamevent_test.go | 6 +-- apier/v1/apier.go | 2 +- apier/v1/cdrs_it_test.go | 4 +- apier/v1/sessions_process_event_it_test.go | 2 +- apier/v1/sessions_thresholds_it_test.go | 18 +++---- apier/v1/sessionsv1_it_test.go | 6 +-- apier/v1/versions_it_test.go | 4 +- cmd/cgr-loader/cgr-loader_it_test.go | 6 +-- config/config.go | 8 ++-- config/config_test.go | 20 ++++---- config/configsanity.go | 2 +- config/configsanity_test.go | 2 +- config/migratorcfg_test.go | 12 ++--- config/stordbcfg_test.go | 6 +-- dispatchers/sessions_it_test.go | 32 ++++++------- ees/sql.go | 4 +- engine/cdrs.go | 6 +-- engine/libtest.go | 2 +- engine/mapevent_test.go | 4 +- engine/storage_mongo_stordb.go | 2 +- engine/storage_mysql.go | 2 +- engine/storage_postgres.go | 2 +- engine/storage_redis.go | 2 +- engine/storage_sql.go | 10 ++-- engine/storage_utils.go | 12 ++--- engine/version.go | 12 ++--- engine/version_test.go | 24 +++++----- engine/z_storage_cdrs_it_test.go | 20 ++++---- engine/z_stordb_it_test.go | 4 +- engine/z_versions_it_test.go | 4 +- ers/sql.go | 8 ++-- general_tests/a1_it_test.go | 6 +-- general_tests/auth_test.go | 2 +- general_tests/data_it_test.go | 6 +-- general_tests/gocs_it_test.go | 12 ++--- general_tests/rpccaching_it_test.go | 14 +++--- general_tests/session2_it_test.go | 6 +-- general_tests/session3_it_test.go | 10 ++-- general_tests/session_it_test.go | 4 +- ...ion_replications_automaticdebit_it_test.go | 4 +- general_tests/sessionrefund_it_test.go | 8 ++-- general_tests/sessions_concur_test.go | 4 +- general_tests/sessions_race_test.go | 4 +- general_tests/tls_it_test.go | 2 +- general_tests/tutorial_calls_test.go | 4 +- migrator/accounts2_it_test.go | 2 +- migrator/action_plan.go | 2 +- migrator/migrator.go | 12 ++--- migrator/migrator_utils.go | 14 +++--- migrator/storage_sql.go | 4 +- services/datadb.go | 4 +- services/datadb_it_test.go | 2 +- services/datadb_test.go | 2 +- services/stordb.go | 8 ++-- sessions/libsessions.go | 2 +- sessions/session_test.go | 32 ++++++------- sessions/sessions.go | 6 +-- sessions/sessions_bench_test.go | 2 +- sessions/sessions_birpc_it_test.go | 8 ++-- sessions/sessions_data_it_test.go | 34 ++++++------- sessions/sessions_it_test.go | 14 +++--- sessions/sessions_rpl_it_test.go | 10 ++-- sessions/sessions_test.go | 2 +- sessions/sessions_voice_it_test.go | 48 +++++++++---------- utils/consts.go | 14 +++--- utils/struct_test.go | 6 +-- 68 files changed, 293 insertions(+), 293 deletions(-) diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index 7a66b4e9b..c22ca9e1f 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -51,7 +51,7 @@ func TestAgReqSetFields(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Usage, PathItems: utils.PathItems{{Field: utils.Usage}}}, utils.NewNMData(3*time.Minute)) cgrRply := utils.NavigableMap2{ @@ -899,7 +899,7 @@ func TestAgReqSetField2(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRReply = &utils.NavigableMap2{} @@ -1545,7 +1545,7 @@ func TestAgReqOverwrite(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRReply = &utils.NavigableMap2{} @@ -1597,7 +1597,7 @@ func TestAgReqGroupType(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRReply = &utils.NavigableMap2{} @@ -1733,7 +1733,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Usage, PathItems: utils.PathItems{{Field: utils.Usage}}}, utils.NewNMData(3*time.Minute)) agReq.CGRReply = &utils.NavigableMap2{ @@ -2036,7 +2036,7 @@ func TestAgReqDynamicPath(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRRequest.Set(&utils.FullPath{Path: "Routes.CGR_ROUTE1", PathItems: utils.PathItems{{Field: "Routes"}, {Field: "CGR_ROUTE1"}}}, utils.NewNMData(1001)) agReq.CGRRequest.Set(&utils.FullPath{Path: "Routes.CGR_ROUTE2", PathItems: utils.PathItems{{Field: "Routes"}, {Field: "CGR_ROUTE2"}}}, utils.NewNMData(1002)) agReq.CGRRequest.Set(&utils.FullPath{Path: "BestRoute", PathItems: utils.PathItems{{Field: "BestRoute"}}}, utils.NewNMData("ROUTE1")) @@ -2110,7 +2110,7 @@ func TestAgReqRoundingDecimals(t *testing.T) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Cost, PathItems: utils.PathItems{{Field: utils.Cost}}}, utils.NewNMData(12.12645)) agReq.CGRReply = &utils.NavigableMap2{} @@ -2189,7 +2189,7 @@ func BenchmarkAgReqSetField(b *testing.B) { agReq.CGRRequest.Set(&utils.FullPath{Path: utils.Destination, PathItems: utils.PathItems{{Field: utils.Destination}}}, utils.NewNMData("1002")) agReq.CGRRequest.Set(&utils.FullPath{Path: utils.AnswerTime, PathItems: utils.PathItems{{Field: utils.AnswerTime}}}, utils.NewNMData( time.Date(2013, 12, 30, 15, 0, 1, 0, time.UTC))) - agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.META_PREPAID)) + agReq.CGRRequest.Set(&utils.FullPath{Path: utils.RequestType, PathItems: utils.PathItems{{Field: utils.RequestType}}}, utils.NewNMData(utils.MetaPrepaid)) agReq.CGRReply = &utils.NavigableMap2{} if err := agReq.SetFields(tplFlds); err != nil { diff --git a/agents/fsevent_test.go b/agents/fsevent_test.go index d2ae7882b..4a264c5f7 100644 --- a/agents/fsevent_test.go +++ b/agents/fsevent_test.go @@ -466,7 +466,7 @@ func TestParseFsHangup(t *testing.T) { setupTime, _ := ev.GetSetupTime(utils.MetaDefault, "") answerTime, _ := ev.GetAnswerTime(utils.MetaDefault, "") dur, _ := ev.GetDuration(utils.MetaDefault) - if ev.GetReqType(utils.MetaDefault) != utils.META_PREPAID || + if ev.GetReqType(utils.MetaDefault) != utils.MetaPrepaid || ev.GetTenant(utils.MetaDefault) != "cgrates.org" || ev.GetCategory(utils.MetaDefault) != "call" || ev.GetAccount(utils.MetaDefault) != "1001" || @@ -476,7 +476,7 @@ func TestParseFsHangup(t *testing.T) { answerTime.UTC() != time.Date(2015, 7, 7, 14, 52, 8, 0, time.UTC) || dur != 66*time.Second { t.Error("Default values not matching", - ev.GetReqType(utils.MetaDefault) != utils.META_PREPAID, + ev.GetReqType(utils.MetaDefault) != utils.MetaPrepaid, ev.GetTenant(utils.MetaDefault) != "cgrates.org", ev.GetCategory(utils.MetaDefault) != "call", ev.GetAccount(utils.MetaDefault) != "1001", @@ -504,7 +504,7 @@ func TestParseEventValue(t *testing.T) { if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Source), ""); parsed != "FS_EVENT" { t.Error("Unexpected result parsed", parsed) } - if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.RequestType), ""); parsed != utils.META_PREPAID { + if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.RequestType), ""); parsed != utils.MetaPrepaid { t.Error("Unexpected result parsed", parsed) } if parsed, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.Tenant), ""); parsed != "cgrates.org" { @@ -588,7 +588,7 @@ func TestFsEvAsMapStringInterface(t *testing.T) { expectedMap[utils.Category] = "call" expectedMap[utils.SetupTime] = setupTime expectedMap[utils.AnswerTime] = aTime - expectedMap[utils.RequestType] = utils.META_PREPAID + expectedMap[utils.RequestType] = utils.MetaPrepaid expectedMap[utils.Destination] = "1003" expectedMap[utils.Usage] = 66 * time.Second expectedMap[utils.Tenant] = "cgrates.org" diff --git a/agents/kamevent_test.go b/agents/kamevent_test.go index 2d006a27d..cbbd4275f 100644 --- a/agents/kamevent_test.go +++ b/agents/kamevent_test.go @@ -30,7 +30,7 @@ import ( var kamEv = KamEvent{KamTRIndex: "29223", KamTRLabel: "698469260", "callid": "ODVkMDI2Mzc2MDY5N2EzODhjNTAzNTdlODhiZjRlYWQ", "from_tag": "eb082607", "to_tag": "4ea9687f", "cgr_account": "dan", - "cgr_reqtype": utils.META_PREPAID, "cgr_subject": "dan", "cgr_destination": "+4986517174963", "cgr_tenant": "itsyscom.com", + "cgr_reqtype": utils.MetaPrepaid, "cgr_subject": "dan", "cgr_destination": "+4986517174963", "cgr_tenant": "itsyscom.com", "cgr_duration": "20", utils.CGR_ROUTE: "suppl2", utils.CGR_DISCONNECT_CAUSE: "200", "extra1": "val1", "extra2": "val2"} func TestNewKamEvent(t *testing.T) { @@ -258,7 +258,7 @@ func TestKamEvAsKamAuthReply(t *testing.T) { utils.Tenant: "cgrates.org", utils.AccountField: "1001", "Password": "check123", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, }, }, }, @@ -457,7 +457,7 @@ func TestKamEvAsKamProcessEventReply(t *testing.T) { utils.Tenant: "cgrates.org", utils.AccountField: "1001", "Password": "check123", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, }, }, }, diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 967a839a8..d65c93571 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -1456,7 +1456,7 @@ func (apierSv1 *APIerSv1) GetLoadTimes(args *LoadTimeArgs, reply *map[string]str } func (apierSv1 *APIerSv1) ComputeActionPlanIndexes(_ string, reply *string) (err error) { - if apierSv1.DataManager.DataDB().GetStorageType() != utils.REDIS { + if apierSv1.DataManager.DataDB().GetStorageType() != utils.Redis { return utils.ErrNotImplemented } redisDB, can := apierSv1.DataManager.DataDB().(*engine.RedisStorage) diff --git a/apier/v1/cdrs_it_test.go b/apier/v1/cdrs_it_test.go index a6137a085..40f4ae6bc 100644 --- a/apier/v1/cdrs_it_test.go +++ b/apier/v1/cdrs_it_test.go @@ -374,7 +374,7 @@ func testV1CDRsRefundOutOfSessionCost(t *testing.T) { utils.CGRID: "test1", utils.RunID: utils.MetaDefault, utils.OriginID: "testV1CDRsRefundOutOfSessionCost", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "testV1CDRsRefundOutOfSessionCost", utils.Destination: "+4986517174963", utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), @@ -599,7 +599,7 @@ func testV1CDRsAddBalanceForSMS(t *testing.T) { utils.Category: "sms", utils.RunID: utils.MetaDefault, utils.OriginID: "testV1CDRsAddBalanceForSMS", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "testV1CDRsAddBalanceForSMS", utils.Destination: "+4986517174963", utils.AnswerTime: time.Date(2019, 11, 27, 12, 21, 26, 0, time.UTC), diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index e873dbab4..6eccf8e31 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -77,7 +77,7 @@ func TestSSv1ItProcessEventWithPrepaid(t *testing.T) { t.Fatal("Unknown Database type") } - sSV1RequestType = utils.META_PREPAID + sSV1RequestType = utils.MetaPrepaid for _, stest := range sTestSessionSv1ProcessEvent { t.Run(sessionsConfDIR+utils.EmptyString+sSV1RequestType, stest) } diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index 09c5b9a7c..457adcd9d 100755 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -212,7 +212,7 @@ func testSessionSv1ItAuth(t *testing.T) { ID: "TestSSv1ItAuth", Event: map[string]interface{}{ utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, @@ -278,7 +278,7 @@ func testSessionSv1ItInitiateSession(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, @@ -339,7 +339,7 @@ func testSessionSv1ItTerminateSession(t *testing.T) { ID: "TestSSv1ItTerminateSession", Event: map[string]interface{}{ utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -398,7 +398,7 @@ func testSessionSv1ItAuthNotFoundThreshold(t *testing.T) { ID: "TestSesssonSv1ItNotFoundThreshold", Event: map[string]interface{}{ utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Destination: "1001", utils.SetupTime: time.Date(2018, @@ -436,7 +436,7 @@ func testSessionSv1ItInitNotFoundThreshold(t *testing.T) { utils.Category: "call", utils.ToR: utils.DATA, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "RP_ANY2CNT", utils.Destination: "1001", @@ -489,7 +489,7 @@ func testSessionSv1ItTerminateNotFoundThreshold(t *testing.T) { utils.Category: "call", utils.ToR: utils.DATA, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "RP_ANY2CNT", utils.Destination: "1001", @@ -536,7 +536,7 @@ func testSessionSv1ItAuthNotFoundThresholdAndStats(t *testing.T) { ID: "TestSesssonSv1ItNotFoundThreshold", Event: map[string]interface{}{ utils.OriginID: "TestSesssonSv1ItNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Destination: "1001", utils.SetupTime: time.Date(2018, @@ -575,7 +575,7 @@ func testSessionSv1ItInitNotFoundThresholdAndStats(t *testing.T) { utils.Category: "call", utils.ToR: utils.DATA, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "RP_ANY2CNT", utils.Destination: "1001", @@ -629,7 +629,7 @@ func testSessionSv1ItTerminateNotFoundThresholdAndStats(t *testing.T) { utils.Category: "call", utils.ToR: utils.DATA, utils.OriginID: "TestSessionSv1ItInitNotFoundThreshold", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "RP_ANY2CNT", utils.Destination: "1001", diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index 92f208a2c..023c2e27a 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -104,7 +104,7 @@ func TestSSv1ItWithPrepaid(t *testing.T) { if *dbType == utils.MetaPostgres { t.SkipNow() } - sSV1RequestType = utils.META_PREPAID + sSV1RequestType = utils.MetaPrepaid for _, stest := range sTestSessionSv1 { t.Run(sSV1RequestType, stest) } @@ -778,7 +778,7 @@ func testSSv1ItCDRsGetCdrs(t *testing.T) { } func testSSv1ItForceUpdateSession(t *testing.T) { - if sSV1RequestType != utils.META_PREPAID { + if sSV1RequestType != utils.MetaPrepaid { t.SkipNow() return } @@ -921,7 +921,7 @@ func testSSv1ItForceUpdateSession(t *testing.T) { } func testSSv1ItDynamicDebit(t *testing.T) { - if sSV1RequestType != utils.META_PREPAID { + if sSV1RequestType != utils.MetaPrepaid { t.SkipNow() return } diff --git a/apier/v1/versions_it_test.go b/apier/v1/versions_it_test.go index a66c0dee1..5f86ab008 100644 --- a/apier/v1/versions_it_test.go +++ b/apier/v1/versions_it_test.go @@ -61,10 +61,10 @@ func TestVrsIT(t *testing.T) { t.SkipNow() // as is commented below case utils.MetaMySQL: vrsConfigDIR = "tutmysql" - vrsStorageType = utils.REDIS + vrsStorageType = utils.Redis case utils.MetaMongo: vrsConfigDIR = "tutmongo" - vrsStorageType = utils.MONGO + vrsStorageType = utils.Mongo case utils.MetaPostgres: t.SkipNow() default: diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index c94a86a5c..84ebaf7ab 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -43,7 +43,7 @@ var ( func TestLoadConfig(t *testing.T) { // DataDb *cfgPath = path.Join(*dataDir, "conf", "samples", "tutmongo") - *dataDBType = utils.Meta + utils.REDIS + *dataDBType = utils.Meta + utils.Redis *dataDBHost = "localhost" *dataDBPort = "2012" *dataDBName = "100" @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { *dataDBPasswd = "toor" *dbRedisSentinel = "sentinel1" expDBcfg := &config.DataDbCfg{ - DataDbType: utils.REDIS, + DataDbType: utils.Redis, DataDbHost: "localhost", DataDbPort: "2012", DataDbName: "100", @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { *storDBUser = "10" *storDBPasswd = "toor" expStorDB := &config.StorDbCfg{ - Type: utils.POSTGRES, + Type: utils.Postgres, Host: "localhost", Port: "2012", Name: "cgrates2", diff --git a/config/config.go b/config/config.go index 08752bdaa..fc613ee5e 100644 --- a/config/config.go +++ b/config/config.go @@ -50,22 +50,22 @@ var ( func newDbDefaults() dbDefaults { deflt := dbDefaults{ - utils.MYSQL: map[string]string{ + utils.MySQL: map[string]string{ "DbName": "cgrates", "DbPort": "3306", "DbPass": "CGRateS.org", }, - utils.POSTGRES: map[string]string{ + utils.Postgres: map[string]string{ "DbName": "cgrates", "DbPort": "5432", "DbPass": "CGRateS.org", }, - utils.MONGO: map[string]string{ + utils.Mongo: map[string]string{ "DbName": "cgrates", "DbPort": "27017", "DbPass": "", }, - utils.REDIS: map[string]string{ + utils.Redis: map[string]string{ "DbName": "10", "DbPort": "6379", "DbPass": "", diff --git a/config/config_test.go b/config/config_test.go index 99605a0ae..732439312 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -107,8 +107,8 @@ func TestCgrCfgDataDBPortWithoutDynamic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.MONGO) + } else if cgrCfg.DataDbCfg().DataDbType != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.Mongo) } else if cgrCfg.DataDbCfg().DataDbPort != "6379" { t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "6379") } @@ -139,8 +139,8 @@ func TestCgrCfgDataDBPortWithDymanic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.MONGO) + } else if cgrCfg.DataDbCfg().DataDbType != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.Mongo) } else if cgrCfg.DataDbCfg().DataDbPort != "27017" { t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "27017") } @@ -171,8 +171,8 @@ func TestCgrCfgStorDBPortWithoutDynamic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.StorDbCfg().Type != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Type, utils.MONGO) + } else if cgrCfg.StorDbCfg().Type != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Type, utils.Mongo) } else if cgrCfg.StorDbCfg().Port != "3306" { t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Port, "3306") } @@ -189,8 +189,8 @@ func TestCgrCfgStorDBPortWithDymanic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.StorDbCfg().Type != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Type, utils.MONGO) + } else if cgrCfg.StorDbCfg().Type != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Type, utils.Mongo) } else if cgrCfg.StorDbCfg().Port != "27017" { t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().Port, "27017") } @@ -972,7 +972,7 @@ func TestRadiusAgentCfg(t *testing.T) { func TestDbDefaultsMetaDynamic(t *testing.T) { dbdf := newDbDefaults() flagInput := utils.MetaDynamic - dbs := []string{utils.MONGO, utils.REDIS, utils.MYSQL, utils.INTERNAL} + dbs := []string{utils.Mongo, utils.Redis, utils.MySQL, utils.INTERNAL} for _, dbtype := range dbs { host := dbdf.dbHost(dbtype, flagInput) if host != utils.LOCALHOST { @@ -1000,7 +1000,7 @@ func TestDbDefaultsMetaDynamic(t *testing.T) { func TestDbDefaults(t *testing.T) { dbdf := newDbDefaults() flagInput := "NonMetaDynamic" - dbs := []string{utils.MONGO, utils.REDIS, utils.MYSQL, utils.INTERNAL, utils.POSTGRES} + dbs := []string{utils.Mongo, utils.Redis, utils.MySQL, utils.INTERNAL, utils.Postgres} for _, dbtype := range dbs { host := dbdf.dbHost(dbtype, flagInput) if host != flagInput { diff --git a/config/configsanity.go b/config/configsanity.go index 73cf9348b..95c50b512 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -615,7 +615,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { } } // StorDB sanity checks - if cfg.storDbCfg.Type == utils.POSTGRES { + if cfg.storDbCfg.Type == utils.Postgres { if !utils.IsSliceMember([]string{utils.PostgressSSLModeDisable, utils.PostgressSSLModeAllow, utils.PostgressSSLModePrefer, utils.PostgressSSLModeRequire, utils.PostgressSSLModeVerifyCa, utils.PostgressSSLModeVerifyFull}, utils.IfaceAsString(cfg.storDbCfg.Opts[utils.SSLModeCfg])) { diff --git a/config/configsanity_test.go b/config/configsanity_test.go index 76facd691..2812c519c 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -1109,7 +1109,7 @@ func TestConfigSanityDispatcherH(t *testing.T) { func TestConfigSanityStorDB(t *testing.T) { cfg = NewDefaultCGRConfig() cfg.storDbCfg = &StorDbCfg{ - Type: utils.POSTGRES, + Type: utils.Postgres, Opts: map[string]interface{}{ utils.SSLModeCfg: "wrongSSLMode", }, diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index cdaaf9344..aac58a7cd 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -26,14 +26,14 @@ import ( func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { cfgJSON := &MigratorCfgJson{ - Out_dataDB_type: utils.StringPointer(utils.REDIS), + Out_dataDB_type: utils.StringPointer(utils.Redis), Out_dataDB_host: utils.StringPointer("127.0.0.1"), Out_dataDB_port: utils.StringPointer("6379"), Out_dataDB_name: utils.StringPointer("10"), Out_dataDB_user: utils.StringPointer(utils.CGRateSLwr), Out_dataDB_password: utils.StringPointer(utils.EmptyString), Out_dataDB_encoding: utils.StringPointer(utils.MSGPACK), - Out_storDB_type: utils.StringPointer(utils.MYSQL), + Out_storDB_type: utils.StringPointer(utils.MySQL), Out_storDB_host: utils.StringPointer("127.0.0.1"), Out_storDB_port: utils.StringPointer("3306"), Out_storDB_name: utils.StringPointer(utils.CGRateSLwr), @@ -48,14 +48,14 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { }, } expected := &MigratorCgrCfg{ - OutDataDBType: utils.REDIS, + OutDataDBType: utils.Redis, OutDataDBHost: "127.0.0.1", OutDataDBPort: "6379", OutDataDBName: "10", OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, OutDataDBEncoding: utils.MSGPACK, - OutStorDBType: utils.MYSQL, + OutStorDBType: utils.MySQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", OutStorDBName: utils.CGRateSLwr, @@ -217,14 +217,14 @@ func TestMigratorCgrCfgAsMapInterface2(t *testing.T) { func TestMigratorCgrCfgClone(t *testing.T) { sa := &MigratorCgrCfg{ - OutDataDBType: utils.REDIS, + OutDataDBType: utils.Redis, OutDataDBHost: "127.0.0.1", OutDataDBPort: "6379", OutDataDBName: "10", OutDataDBUser: utils.CGRateSLwr, OutDataDBPassword: utils.EmptyString, OutDataDBEncoding: utils.MSGPACK, - OutStorDBType: utils.MYSQL, + OutStorDBType: utils.MySQL, OutStorDBHost: "127.0.0.1", OutStorDBPort: "3306", OutStorDBName: utils.CGRateSLwr, diff --git a/config/stordbcfg_test.go b/config/stordbcfg_test.go index 44c071067..4799fb30b 100644 --- a/config/stordbcfg_test.go +++ b/config/stordbcfg_test.go @@ -26,7 +26,7 @@ import ( func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) { cfgJSON := &DbJsonCfg{ - Db_type: utils.StringPointer(utils.MYSQL), + Db_type: utils.StringPointer(utils.MySQL), Db_host: utils.StringPointer("127.0.0.1"), Db_port: utils.IntPointer(-1), Db_name: utils.StringPointer(utils.CGRateSLwr), @@ -53,7 +53,7 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) { }, } expected := &StorDbCfg{ - Type: utils.MYSQL, + Type: utils.MySQL, Host: "127.0.0.1", Port: "-1", Name: utils.CGRateSLwr, @@ -261,7 +261,7 @@ func TestStorDbCfgAsMapInterface(t *testing.T) { func TestStorDbCfgClone(t *testing.T) { ban := &StorDbCfg{ - Type: utils.MYSQL, + Type: utils.MySQL, Host: "127.0.0.1", Port: "-1", Name: utils.CGRateSLwr, diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 3f9bfa14a..5767e69a6 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -202,7 +202,7 @@ func testDspSessionTestAuthKey(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -238,7 +238,7 @@ func testDspSessionAuthorize(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -291,7 +291,7 @@ func testDspSessionInit(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -368,7 +368,7 @@ func testDspSessionUpdate(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -405,7 +405,7 @@ func testDspSessionUpdate(t *testing.T) { utils.Destination: "1002", "OfficeGroup": "Marketing", utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: float64(reqUsage), @@ -443,7 +443,7 @@ func testDspSessionUpdate2(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -483,7 +483,7 @@ func testDspSessionUpdate2(t *testing.T) { "Password": "CGRateS.org", "PaypalAccount": "cgrates@paypal.com", utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: float64(reqUsage), @@ -523,7 +523,7 @@ func testDspSessionTerminate(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -596,7 +596,7 @@ func testDspSessionProcessEvent(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginHost: "disp", utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -641,7 +641,7 @@ func testDspSessionProcessEvent(t *testing.T) { "OfficeGroup": "Marketing", utils.OriginHost: "disp", utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, @@ -676,7 +676,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -721,7 +721,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.Destination: "1002", "Password": "CGRateS.org", utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, @@ -828,7 +828,7 @@ func testDspSessionPassive(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -844,7 +844,7 @@ func testDspSessionPassive(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -951,7 +951,7 @@ func testDspSessionProcessEvent3(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -997,7 +997,7 @@ func testDspSessionGetCost(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.MONETARY, utils.OriginID: "testSSv1ItProcessEventWithGetCost", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Subject: "ANY2CNT", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), diff --git a/ees/sql.go b/ees/sql.go index 44b344e8d..30d7b5b51 100644 --- a/ees/sql.go +++ b/ees/sql.go @@ -59,10 +59,10 @@ func NewSQLEe(cgrCfg *config.CGRConfig, cfgIdx int, filterS *engine.FilterS, var connString string switch u.Scheme { - case utils.MYSQL: + case utils.MySQL: connString = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&loc=Local&parseTime=true&sql_mode='ALLOW_INVALID_DATES'", u.User.Username(), password, u.Hostname(), u.Port(), dbname) - case utils.POSTGRES: + case utils.Postgres: connString = fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=%s", u.Hostname(), u.Port(), dbname, u.User.Username(), password, ssl) default: return nil, fmt.Errorf("unknown db_type %s", u.Scheme) diff --git a/engine/cdrs.go b/engine/cdrs.go index 03a68155d..8f8690d6b 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -167,7 +167,7 @@ func (cdrS *CDRServer) rateCDR(cdr *CDRWithOpts) ([]*CDR, error) { cdr.ExtraInfo = "" // Clean previous ExtraInfo, useful when re-rating var cdrsRated []*CDR _, hasLastUsed := cdr.ExtraFields[utils.LastUsed] - if utils.SliceHasMember([]string{utils.META_PREPAID, utils.PREPAID}, cdr.RequestType) && + if utils.SliceHasMember([]string{utils.MetaPrepaid, utils.PREPAID}, cdr.RequestType) && (cdr.Usage != 0 || hasLastUsed) && cdr.CostDetails == nil { // ToDo: Get rid of PREPAID as soon as we don't want to support it backwards // Should be previously calculated and stored in DB @@ -247,8 +247,8 @@ func (cdrS *CDRServer) rateCDR(cdr *CDRWithOpts) ([]*CDR, error) { return []*CDR{cdr.CDR}, nil } -var reqTypes = utils.NewStringSet([]string{utils.META_PSEUDOPREPAID, utils.MetaPostpaid, utils.META_PREPAID, - utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID, utils.MetaDynaprepaid}) +var reqTypes = utils.NewStringSet([]string{utils.META_PSEUDOPREPAID, utils.MetaPostpaid, utils.MetaPrepaid, + utils.PSEUDOPREPAID, utils.Postpaid, utils.PREPAID, utils.MetaDynaprepaid}) // getCostFromRater will retrieve the cost from RALs func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithOpts) (*CallCost, error) { diff --git a/engine/libtest.go b/engine/libtest.go index 30d430a6a..b220adc3a 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -339,7 +339,7 @@ func InitStorDb(cfg *config.CGRConfig) error { cfg.StorDbCfg().Type)); err != nil { return err } - if utils.IsSliceMember([]string{utils.MONGO, utils.MYSQL, utils.POSTGRES}, + if utils.IsSliceMember([]string{utils.Mongo, utils.MySQL, utils.Postgres}, cfg.StorDbCfg().Type) { if err := SetDBVersions(storDb); err != nil { return err diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index 8d5254f5f..ed0a6c6db 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -413,7 +413,7 @@ func TestMapEventAsCDR(t *testing.T) { utils.OriginHost: utils.FreeSWITCHAgent, utils.OriginID: "127.0.0.1", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Tenant: "cgrates.org", utils.Category: utils.CALL, utils.AccountField: "10010", @@ -431,7 +431,7 @@ func TestMapEventAsCDR(t *testing.T) { OriginHost: utils.FreeSWITCHAgent, OriginID: "127.0.0.1", ToR: utils.VOICE, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: utils.CALL, Account: "10010", diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go index 81d9c4fa4..ae12472ae 100644 --- a/engine/storage_mongo_stordb.go +++ b/engine/storage_mongo_stordb.go @@ -1743,5 +1743,5 @@ func (ms *MongoStorage) RemoveVersions(vrs Versions) (err error) { } func (ms *MongoStorage) GetStorageType() string { - return utils.MONGO + return utils.Mongo } diff --git a/engine/storage_mysql.go b/engine/storage_mysql.go index 6c5e4e4d9..ff6eaf70b 100644 --- a/engine/storage_mysql.go +++ b/engine/storage_mysql.go @@ -88,5 +88,5 @@ func (self *MySQLStorage) notExtraFieldsValueQry(field, value string) string { } func (self *MySQLStorage) GetStorageType() string { - return utils.MYSQL + return utils.MySQL } diff --git a/engine/storage_postgres.go b/engine/storage_postgres.go index 77ebb7958..1fa2c410f 100644 --- a/engine/storage_postgres.go +++ b/engine/storage_postgres.go @@ -92,5 +92,5 @@ func (self *PostgresStorage) notExtraFieldsValueQry(field, value string) string } func (self *PostgresStorage) GetStorageType() string { - return utils.POSTGRES + return utils.Postgres } diff --git a/engine/storage_redis.go b/engine/storage_redis.go index da8abbaf7..94b218f4c 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -1201,7 +1201,7 @@ func (rs *RedisStorage) RemoveDispatcherHostDrv(tenant, id string) (err error) { } func (rs *RedisStorage) GetStorageType() string { - return utils.REDIS + return utils.Redis } func (rs *RedisStorage) GetItemLoadIDsDrv(itemIDPrefix string) (loadIDs map[string]int64, err error) { diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 6b41be871..1e1f315cc 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -870,14 +870,14 @@ func (self *SQLStorage) RemoveSMCosts(qryFltr *utils.SMCostFilter) error { q = q.Where("created_at < ?", qryFltr.CreatedAt.End) } if qryFltr.Usage.Min != nil { - if self.db.Dialect().GetName() == utils.MYSQL { // MySQL needs escaping for usage + if self.db.Dialect().GetName() == utils.MySQL { // MySQL needs escaping for usage q = q.Where("`usage` >= ?", qryFltr.Usage.Min.Nanoseconds()) } else { q = q.Where("usage >= ?", qryFltr.Usage.Min.Nanoseconds()) } } if qryFltr.Usage.Max != nil { - if self.db.Dialect().GetName() == utils.MYSQL { // MySQL needs escaping for usage + if self.db.Dialect().GetName() == utils.MySQL { // MySQL needs escaping for usage q = q.Where("`usage` < ?", qryFltr.Usage.Max.Nanoseconds()) } else { q = q.Where("usage < ?", qryFltr.Usage.Max.Nanoseconds()) @@ -1140,7 +1140,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, case utils.SetupTime: orderVal = "setup_time" case utils.Usage: - if self.db.Dialect().GetName() == utils.MYSQL { + if self.db.Dialect().GetName() == utils.MySQL { orderVal = "`usage`" } else { orderVal = "usage" @@ -1160,7 +1160,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, if err != nil { return nil, 0, err } - if self.db.Dialect().GetName() == utils.MYSQL { // MySQL needs escaping for usage + if self.db.Dialect().GetName() == utils.MySQL { // MySQL needs escaping for usage q = q.Where("`usage` >= ?", minUsage.Nanoseconds()) } else { q = q.Where("usage >= ?", minUsage.Nanoseconds()) @@ -1171,7 +1171,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR, if err != nil { return nil, 0, err } - if self.db.Dialect().GetName() == utils.MYSQL { // MySQL needs escaping for usage + if self.db.Dialect().GetName() == utils.MySQL { // MySQL needs escaping for usage q = q.Where("`usage` < ?", maxUsage.Nanoseconds()) } else { q = q.Where("usage < ?", maxUsage.Nanoseconds()) diff --git a/engine/storage_utils.go b/engine/storage_utils.go index f77917b3f..ad0b18978 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -33,7 +33,7 @@ import ( func NewDataDBConn(dbType, host, port, name, user, pass, marshaler string, opts map[string]interface{}) (d DataDB, err error) { switch dbType { - case utils.REDIS: + case utils.Redis: var dbNo int dbNo, err = strconv.Atoi(name) if err != nil { @@ -64,7 +64,7 @@ func NewDataDBConn(dbType, host, port, name, user, utils.IfaceAsString(opts[utils.RedisClientCertificate]), utils.IfaceAsString(opts[utils.RedisClientKey]), utils.IfaceAsString(opts[utils.RedisCACertificate])) - case utils.MONGO: + case utils.Mongo: var ttl time.Duration if ttl, err = utils.IfaceAsDuration(opts[utils.QueryTimeoutCfg]); err != nil { return @@ -83,13 +83,13 @@ func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string, stringIndexedFields, prefixIndexedFields []string, opts map[string]interface{}) (db StorDB, err error) { switch dbType { - case utils.MONGO: + case utils.Mongo: var ttl time.Duration if ttl, err = utils.IfaceAsDuration(opts[utils.QueryTimeoutCfg]); err != nil { return nil, err } db, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, ttl) - case utils.POSTGRES: + case utils.Postgres: var maxConn, maxIdleConn, connMaxLifetime int64 if maxConn, err = utils.IfaceAsTInt64(opts[utils.MaxOpenConnsCfg]); err != nil { return @@ -102,7 +102,7 @@ func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string, } db, err = NewPostgresStorage(host, port, name, user, pass, utils.IfaceAsString(opts[utils.SSLModeCfg]), int(maxConn), int(maxIdleConn), int(connMaxLifetime)) - case utils.MYSQL: + case utils.MySQL: var maxConn, maxIdleConn, connMaxLifetime int64 if maxConn, err = utils.IfaceAsTInt64(opts[utils.MaxOpenConnsCfg]); err != nil { return @@ -118,7 +118,7 @@ func NewStorDBConn(dbType, host, port, name, user, pass, marshaler string, db = NewInternalDB(stringIndexedFields, prefixIndexedFields, false) default: err = fmt.Errorf("unknown db '%s' valid options are [%s, %s, %s, %s]", - dbType, utils.MYSQL, utils.MONGO, utils.POSTGRES, utils.INTERNAL) + dbType, utils.MySQL, utils.Mongo, utils.Postgres, utils.INTERNAL) } return } diff --git a/engine/version.go b/engine/version.go index bd3421f65..1e2194c7b 100644 --- a/engine/version.go +++ b/engine/version.go @@ -120,7 +120,7 @@ func OverwriteDBVersions(storage Storage) (err error) { func (vers Versions) Compare(curent Versions, storType string, isDataDB bool) string { var message map[string]string switch storType { - case utils.MONGO: + case utils.Mongo: if isDataDB { message = dataDBVers } else { @@ -128,9 +128,9 @@ func (vers Versions) Compare(curent Versions, storType string, isDataDB bool) st } case utils.INTERNAL: message = allVers - case utils.POSTGRES, utils.MYSQL: + case utils.Postgres, utils.MySQL: message = storDBVers - case utils.REDIS: + case utils.Redis: message = dataDBVers } for subsis, reason := range message { @@ -218,16 +218,16 @@ func CurrentAllDBVersions() Versions { // CurrentDBVersions returns versions based on dbType func CurrentDBVersions(storType string, isDataDB bool) Versions { switch storType { - case utils.MONGO: + case utils.Mongo: if isDataDB { return CurrentDataDBVersions() } return CurrentStorDBVersions() case utils.INTERNAL: return CurrentAllDBVersions() - case utils.POSTGRES, utils.MYSQL: + case utils.Postgres, utils.MySQL: return CurrentStorDBVersions() - case utils.REDIS: + case utils.Redis: return CurrentDataDBVersions() } return nil diff --git a/engine/version_test.go b/engine/version_test.go index 03c846db7..9d4ab7954 100644 --- a/engine/version_test.go +++ b/engine/version_test.go @@ -48,37 +48,37 @@ func TestVersionCompare(t *testing.T) { utils.SharedGroups: 2, utils.CostDetails: 2, utils.SessionSCosts: 2} - message1 := y.Compare(x, utils.MONGO, true) + message1 := y.Compare(x, utils.Mongo, true) if message1 != "cgr-migrator -exec=*accounts" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*accounts", message1) } - message2 := z.Compare(x, utils.MONGO, true) + message2 := z.Compare(x, utils.Mongo, true) if message2 != "cgr-migrator -exec=*action_plans" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*action_plans", message2) } - message3 := q.Compare(x, utils.MONGO, true) + message3 := q.Compare(x, utils.Mongo, true) if message3 != "cgr-migrator -exec=*shared_groups" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*shared_groups", message3) } - message4 := c.Compare(x, utils.MONGO, false) + message4 := c.Compare(x, utils.Mongo, false) if message4 != "cgr-migrator -exec=*cost_details" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*cost_details", message4) } - message5 := a.Compare(b, utils.MYSQL, false) + message5 := a.Compare(b, utils.MySQL, false) if message5 != "cgr-migrator -exec=*sessions_costs" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*sessions_costs", message5) } - message6 := a.Compare(b, utils.POSTGRES, false) + message6 := a.Compare(b, utils.Postgres, false) if message6 != "cgr-migrator -exec=*sessions_costs" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*sessions_costs", message6) } - message7 := y.Compare(x, utils.REDIS, true) + message7 := y.Compare(x, utils.Redis, true) if message7 != "cgr-migrator -exec=*accounts" { t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*accounts", message7) } y[utils.Accounts] = 2 - message8 := y.Compare(x, utils.REDIS, true) + message8 := y.Compare(x, utils.Redis, true) if message8 != utils.EmptyString { t.Errorf("Expected %+v, received %+v", utils.EmptyString, message8) } @@ -106,19 +106,19 @@ func TestCurrentDBVersions(t *testing.T) { utils.TpRatingProfile: 1, utils.TpChargers: 1, utils.TpDispatchers: 1, utils.TpRateProfiles: 1, utils.TpActionProfiles: 1, } - if vrs := CurrentDBVersions(utils.MONGO, true); !reflect.DeepEqual(expVersDataDB, vrs) { + if vrs := CurrentDBVersions(utils.Mongo, true); !reflect.DeepEqual(expVersDataDB, vrs) { t.Errorf("Expectred %+v, received %+v", expVersDataDB, vrs) } - if vrs := CurrentDBVersions(utils.MONGO, false); !reflect.DeepEqual(expVersStorDB, vrs) { + if vrs := CurrentDBVersions(utils.Mongo, false); !reflect.DeepEqual(expVersStorDB, vrs) { t.Errorf("Expectred %+v, received %+v", expVersStorDB, vrs) } - if vrs := CurrentDBVersions(utils.POSTGRES, false); !reflect.DeepEqual(expVersStorDB, vrs) { + if vrs := CurrentDBVersions(utils.Postgres, false); !reflect.DeepEqual(expVersStorDB, vrs) { t.Errorf("Expectred %+v, received %+v", expVersStorDB, vrs) } - if vrs := CurrentDBVersions(utils.REDIS, true); !reflect.DeepEqual(expVersDataDB, vrs) { + if vrs := CurrentDBVersions(utils.Redis, true); !reflect.DeepEqual(expVersDataDB, vrs) { t.Errorf("Expectred %+v, received %+v", expVersDataDB, vrs) } diff --git a/engine/z_storage_cdrs_it_test.go b/engine/z_storage_cdrs_it_test.go index 79ab68179..9289481e9 100644 --- a/engine/z_storage_cdrs_it_test.go +++ b/engine/z_storage_cdrs_it_test.go @@ -84,7 +84,7 @@ func testSetCDR(cfg *config.CGRConfig) error { Source: "testSetCDRs", OriginID: "testevent1", ToR: utils.VOICE, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1004", @@ -111,7 +111,7 @@ func testSetCDR(cfg *config.CGRConfig) error { Source: "testSetCDRs", OriginID: "testevent1", ToR: utils.VOICE, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1004", @@ -256,7 +256,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs", OriginID: "testevent1", ToR: utils.VOICE, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -276,7 +276,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs", OriginID: "testevent1", ToR: utils.VOICE, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -417,7 +417,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs5", OriginID: "testevent5", ToR: utils.SMS, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "sms", Account: "1001", @@ -437,7 +437,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Source: "testGetCDRs5", OriginID: "testevent5", ToR: utils.SMS, - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "sms", Account: "1001", @@ -514,7 +514,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{CGRIDs: []string{ utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()), utils.Sha1("testevent3", time.Date(2015, 12, 28, 12, 58, 0, 0, time.UTC).String()), - }, RequestTypes: []string{utils.META_PREPAID}}, false); err != nil { + }, RequestTypes: []string{utils.MetaPrepaid}}, false); err != nil { return fmt.Errorf("testGetCDRs #18 err: %v", err) } else if len(CDRs) != 2 { return fmt.Errorf("testGetCDRs #19, unexpected number of CDRs returned: %+v", CDRs) @@ -523,7 +523,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if _, count, err := cdrStorage.GetCDRs(&utils.CDRsFilter{CGRIDs: []string{ utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()), utils.Sha1("testevent3", time.Date(2015, 12, 28, 12, 58, 0, 0, time.UTC).String()), - }, RequestTypes: []string{utils.META_PREPAID}, Count: true}, false); err != nil { + }, RequestTypes: []string{utils.MetaPrepaid}, Count: true}, false); err != nil { return fmt.Errorf("testGetCDRs #20 err: %v", err) } else if count != 2 { return fmt.Errorf("testGetCDRs #21, unexpected count of CDRs returned: %d", count) @@ -578,13 +578,13 @@ func testGetCDRs(cfg *config.CGRConfig) error { return fmt.Errorf("testGetCDRs #33, unexpected number of CDRs returned: %+v", CDRs) } // Filter on reqType - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.META_PREPAID}}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.MetaPrepaid}}, false); err != nil { return fmt.Errorf("testGetCDRs #32 err: %v", err) } else if len(CDRs) != 4 { return fmt.Errorf("testGetCDRs #33, unexpected number of CDRs returned: %+v", len(CDRs)) } // Filter on multiple reqType - if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.META_PREPAID, utils.META_PSEUDOPREPAID}}, false); err != nil { + if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{RequestTypes: []string{utils.MetaPrepaid, utils.META_PSEUDOPREPAID}}, false); err != nil { return fmt.Errorf("testGetCDRs #34 err: %v", err) } else if len(CDRs) != 6 { return fmt.Errorf("testGetCDRs #35, unexpected number of CDRs returned: %+v", CDRs) diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 19a61b2b6..31e218396 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -128,14 +128,14 @@ func TestStorDBit(t *testing.T) { func testStorDBitIsDBEmpty(t *testing.T) { x := storDB.GetStorageType() switch x { - case utils.MONGO: + case utils.Mongo: test, err := storDB.IsDBEmpty() if err != nil { t.Error(err) } else if test != true { t.Errorf("Expecting: true got :%+v", test) } - case utils.POSTGRES, utils.MYSQL: + case utils.Postgres, utils.MySQL: test, err := storDB.IsDBEmpty() if err != nil { t.Error(err) diff --git a/engine/z_versions_it_test.go b/engine/z_versions_it_test.go index 358b64b6e..00ab28ff2 100644 --- a/engine/z_versions_it_test.go +++ b/engine/z_versions_it_test.go @@ -122,7 +122,7 @@ func testVersion(t *testing.T) { testVersion = allVersions testVersion[utils.Accounts] = 1 test = "Migration needed: please backup cgr data and run : " - case utils.MONGO, utils.REDIS: + case utils.Mongo, utils.Redis: currentVersion = dataDbVersions testVersion = dataDbVersions testVersion[utils.Accounts] = 1 @@ -164,7 +164,7 @@ func testVersion(t *testing.T) { testVersion = allVersions testVersion[utils.Accounts] = 1 test = "Migration needed: please backup cgr data and run : " - case utils.MONGO, utils.POSTGRES, utils.MYSQL: + case utils.Mongo, utils.Postgres, utils.MySQL: currentVersion = storDbVersions testVersion = allVersions testVersion[utils.CostDetails] = 1 diff --git a/ers/sql.go b/ers/sql.go index 5c7e731b6..69b1be2e3 100644 --- a/ers/sql.go +++ b/ers/sql.go @@ -233,10 +233,10 @@ func (rdr *SQLEventReader) setURL(inURL, outURL string, opts map[string]interfac rdr.tableName = utils.IfaceAsString(vals) } switch rdr.connType { - case utils.MYSQL: + case utils.MySQL: rdr.connString = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&loc=Local&parseTime=true&sql_mode='ALLOW_INVALID_DATES'", u.User.Username(), password, u.Hostname(), u.Port(), dbname) - case utils.POSTGRES: + case utils.Postgres: rdr.connString = fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=%s", u.Hostname(), u.Port(), dbname, u.User.Username(), password, ssl) default: return fmt.Errorf("unknown db_type %s", rdr.connType) @@ -282,10 +282,10 @@ func (rdr *SQLEventReader) setURL(inURL, outURL string, opts map[string]interfac } switch rdr.expConnType { - case utils.MYSQL: + case utils.MySQL: rdr.expConnString = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&loc=Local&parseTime=true&sql_mode='ALLOW_INVALID_DATES'", outUser, outPassword, outHost, outPort, outDBname) - case utils.POSTGRES: + case utils.Postgres: rdr.expConnString = fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=%s", outHost, outPort, outDBname, outUser, outPassword, outSSL) default: diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index f42bbc49b..3d5fcc574 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -203,7 +203,7 @@ func testA1itDataSession1(t *testing.T) { utils.Destination: "data", utils.Category: "data1", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Usage: "10240", @@ -240,7 +240,7 @@ func testA1itDataSession1(t *testing.T) { utils.InitialOriginID: "504966119", utils.LastUsed: "0s", utils.OriginID: "504966119-1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Subject: "rpdata1", utils.Tenant: "cgrates.org", utils.ToR: utils.DATA, @@ -276,7 +276,7 @@ func testA1itDataSession1(t *testing.T) { utils.LastUsed: "2202800", utils.OriginID: "504966119-1", utils.OriginIDPrefix: "504966119-1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2017-03-03 11:39:32 +0100 CET", utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Subject: "rpdata1", diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go index 6681d0b6a..d1fccade5 100644 --- a/general_tests/auth_test.go +++ b/general_tests/auth_test.go @@ -125,7 +125,7 @@ cgrates.org,call,*any,2013-01-06T00:00:00Z,RP_ANY,` } func TestAuthPostpaidNoAcnt(t *testing.T) { - cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.META_PREPAID, Tenant: "cgrates.org", + cdr := &engine.UsageRecord{ToR: utils.VOICE, RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "nonexistent", 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/data_it_test.go b/general_tests/data_it_test.go index ce7dd5123..098206afa 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -459,7 +459,7 @@ func testV1DataInitSession(t *testing.T) { utils.ToR: utils.DATA, utils.Category: "data", utils.OriginID: "781512335", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "testV1DataInitSession", utils.Subject: "10kilo", utils.Destination: "*any", @@ -506,7 +506,7 @@ func testV1DataUpdateWith1Mo(t *testing.T) { "InitialOriginID": "781512335", "LastUsed": 0, "OriginID": "781512335-11", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "testV1DataInitSession", utils.Subject: "10kilo", utils.Destination: "*any", @@ -552,7 +552,7 @@ func testV1DataUpdateWith1Go(t *testing.T) { "InitialOriginID": "781512335", "LastUsed": 946405, "OriginID": "781512335-11", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "testV1DataInitSession", utils.Subject: "10kilo", utils.Destination: "*any", diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index bcee851cb..7186e2c43 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -231,7 +231,7 @@ func testGOCSAuthSession(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -263,7 +263,7 @@ func testGOCSInitSession(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -341,7 +341,7 @@ func testGOCSUpdateSession(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -420,7 +420,7 @@ func testGOCSUpdateSession2(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -493,7 +493,7 @@ func testGOCSTerminateSession(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -553,7 +553,7 @@ func testGOCSProcessCDR(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginID: "testGOCS", utils.Category: "call", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 8eee380ec..7a151e597 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -210,7 +210,7 @@ func testRPCMethodsAuthorizeSession(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsAuthorizeSession", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -308,7 +308,7 @@ func testRPCMethodsInitSession(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsInitSession", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -408,7 +408,7 @@ func testRPCMethodsUpdateSession(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsUpdateSession", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -506,7 +506,7 @@ func testRPCMethodsTerminateSession(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsTerminateSession", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -554,7 +554,7 @@ func testRPCMethodsProcessCDR(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsProcessCDR", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -629,7 +629,7 @@ func testRPCMethodsProcessEvent(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testRPCMethodsProcessEvent", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", @@ -727,7 +727,7 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) { utils.ToR: utils.VOICE, utils.OriginHost: "host", utils.OriginID: "testRPCMethodsCdrsProcessCDR", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index 053c29e07..f6127b8bd 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -148,7 +148,7 @@ func testSes2ItInitSession(t *testing.T) { utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), }, }, @@ -199,7 +199,7 @@ func testSes2StirAuthenticate(t *testing.T) { Event: map[string]interface{}{ utils.ToR: utils.VOICE, utils.OriginID: "testSes2StirAuthorize", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", @@ -242,7 +242,7 @@ func testSes2StirInit(t *testing.T) { Event: map[string]interface{}{ utils.ToR: utils.VOICE, utils.OriginID: "testSes2StirInit", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 9bb4a9116..6b55fcd72 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -140,7 +140,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -185,7 +185,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.Destination: "1002", "OfficeGroup": "Marketing", utils.OriginID: "TestSSv1It2", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, @@ -312,7 +312,7 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "1001", utils.Destination: "1001", @@ -348,7 +348,7 @@ func testSes3ItTerminatWithoutInit(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "1001", utils.Destination: "1001", @@ -400,7 +400,7 @@ func testSes3ItCDRs(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestTerminate", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1002", utils.Subject: "1001", utils.Destination: "1001", diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index c86082a4b..4c9077311 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -160,7 +160,7 @@ func testSesItInitSession(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sesAccount, utils.Subject: "TEST", utils.Destination: "TEST", @@ -194,7 +194,7 @@ func testSesItTerminateSession(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sesAccount, utils.Subject: "TEST", utils.Destination: "TEST", diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 4f1512043..de254ae05 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -183,7 +183,7 @@ func testSessionSRplInitiate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1005", utils.Subject: "1005", utils.Destination: "1004", @@ -362,7 +362,7 @@ func testSessionSRplTerminate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1005", utils.Subject: "1005", utils.Destination: "1004", diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 78698baca..8934457b7 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -162,7 +162,7 @@ func testSrItInitSession(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, utils.Subject: "TEST", utils.Destination: "TEST", @@ -196,7 +196,7 @@ func testSrItTerminateSession(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, utils.Subject: "TEST", utils.Destination: "TEST", @@ -255,7 +255,7 @@ func testSrItInitSession2(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, utils.Subject: "TEST", utils.Destination: "1001", @@ -289,7 +289,7 @@ func testSrItTerminateSession2(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestRefund", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: sraccount, utils.Subject: "TEST", utils.Destination: "1001", diff --git a/general_tests/sessions_concur_test.go b/general_tests/sessions_concur_test.go index 892a76d9a..05fcf8dc1 100644 --- a/general_tests/sessions_concur_test.go +++ b/general_tests/sessions_concur_test.go @@ -233,7 +233,7 @@ func testRunSession(t *testing.T) { Event: map[string]interface{}{ utils.Tenant: "cgrates.org", utils.OriginID: originID, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: acntID, utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), utils.SetupTime: time.Now(), @@ -258,7 +258,7 @@ func testRunSession(t *testing.T) { ID: fmt.Sprintf("TestSCncrInit%s", originID), Event: map[string]interface{}{ utils.OriginID: originID, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: acntID, utils.Destination: fmt.Sprintf("%s%s", acntID, acntID), utils.AnswerTime: time.Now(), diff --git a/general_tests/sessions_race_test.go b/general_tests/sessions_race_test.go index 6ee08608f..908893f32 100644 --- a/general_tests/sessions_race_test.go +++ b/general_tests/sessions_race_test.go @@ -142,7 +142,7 @@ func TestSessionSRace(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", // utils.RatingSubject: "*zero1ms", utils.CGRDebitInterval: 10, @@ -169,7 +169,7 @@ func TestSessionSRace(t *testing.T) { utils.Tenant: "cgrates.org", utils.ToR: utils.VOICE, utils.OriginID: "testSSv1ItProcessEvent", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", // utils.RatingSubject: "*zero1ms", utils.CGRDebitInterval: 10, diff --git a/general_tests/tls_it_test.go b/general_tests/tls_it_test.go index 6f7fb1896..a7590c86b 100755 --- a/general_tests/tls_it_test.go +++ b/general_tests/tls_it_test.go @@ -148,7 +148,7 @@ func testTLSPing(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "ANY2CNT", utils.Destination: "1002", diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go index bb10659bf..7d0656b1f 100755 --- a/general_tests/tutorial_calls_test.go +++ b/general_tests/tutorial_calls_test.go @@ -509,7 +509,7 @@ func testCall1001Cdrs(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", len(reply)) } else { for _, cdr := range reply { - if cdr.RequestType != utils.META_PREPAID { + if cdr.RequestType != utils.MetaPrepaid { t.Errorf("Unexpected RequestType for CDR: %+v", cdr.RequestType) } if cdr.Destination == "1002" { @@ -576,7 +576,7 @@ func testCall1003Cdrs(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", len(reply)) } else { for _, cdr := range reply { - if cdr.RequestType != utils.META_PREPAID { + if cdr.RequestType != utils.MetaPrepaid { t.Errorf("Unexpected RequestType for CDR: %+v", cdr.RequestType) } // in case of Asterisk take the integer part from usage diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 8f2e08e9f..00628fec8 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -123,7 +123,7 @@ func testAcc2ITFlush(t *testing.T) { if err := engine.SetDBVersions(acc2Migrator.dmIN.DataManager().DataDB()); err != nil { t.Error("Error ", err.Error()) } - if acc2Migrator.dmOut.DataManager().DataDB().GetStorageType() != utils.REDIS { + if acc2Migrator.dmOut.DataManager().DataDB().GetStorageType() != utils.Redis { t.Errorf("Unexpected datadb type : %+v", acc2Migrator.dmOut.DataManager().DataDB().GetStorageType()) } if acc2Migrator.storDBIn.StorDB().GetStorageType() != utils.INTERNAL { diff --git a/migrator/action_plan.go b/migrator/action_plan.go index c7a644490..7e3991952 100644 --- a/migrator/action_plan.go +++ b/migrator/action_plan.go @@ -105,7 +105,7 @@ func (m *Migrator) migrateActionPlans() (err error) { if vrs, err = m.getVersions(utils.ActionPlans); err != nil { return } - if m.dmIN.DataManager().DataDB().GetStorageType() == utils.REDIS { // if redis rebuild action plans indexes + if m.dmIN.DataManager().DataDB().GetStorageType() == utils.Redis { // if redis rebuild action plans indexes redisDB, can := m.dmIN.DataManager().DataDB().(*engine.RedisStorage) if !can { return fmt.Errorf("Storage type %s could not be casted to <*engine.RedisStorage>", m.dmIN.DataManager().DataDB().GetStorageType()) diff --git a/migrator/migrator.go b/migrator/migrator.go index 8dba6828d..00c057f1a 100755 --- a/migrator/migrator.go +++ b/migrator/migrator.go @@ -88,22 +88,22 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) { fmt.Sprintf("error: <%s> when seting versions for StorDB", err.Error())), nil } case utils.MetaEnsureIndexes: - if m.storDBOut.StorDB().GetStorageType() == utils.MONGO { + if m.storDBOut.StorDB().GetStorageType() == utils.Mongo { mgo := m.storDBOut.StorDB().(*engine.MongoStorage) if err = mgo.EnsureIndexes(); err != nil { return } } else { - log.Printf("The StorDB type has to be %s .\n ", utils.MONGO) + log.Printf("The StorDB type has to be %s .\n ", utils.Mongo) } - if m.dmOut.DataManager().DataDB().GetStorageType() == utils.MONGO { + if m.dmOut.DataManager().DataDB().GetStorageType() == utils.Mongo { mgo := m.dmOut.DataManager().DataDB().(*engine.MongoStorage) if err = mgo.EnsureIndexes(); err != nil { return } } else { - log.Printf("The DataDB type has to be %s .\n ", utils.MONGO) + log.Printf("The DataDB type has to be %s .\n ", utils.Mongo) } case utils.MetaCDRs: err = m.migrateCDRs() @@ -344,7 +344,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) { } func (m *Migrator) ensureIndexesDataDB(cols ...string) error { - if m.dmOut.DataManager().DataDB().GetStorageType() != utils.MONGO { + if m.dmOut.DataManager().DataDB().GetStorageType() != utils.Mongo { return nil } mgo := m.dmOut.DataManager().DataDB().(*engine.MongoStorage) @@ -352,7 +352,7 @@ func (m *Migrator) ensureIndexesDataDB(cols ...string) error { } func (m *Migrator) ensureIndexesStorDB(cols ...string) error { - if m.storDBOut.StorDB().GetStorageType() != utils.MONGO { + if m.storDBOut.StorDB().GetStorageType() != utils.Mongo { return nil } mgo := m.storDBOut.StorDB().(*engine.MongoStorage) diff --git a/migrator/migrator_utils.go b/migrator/migrator_utils.go index 3961bff1e..1281718af 100644 --- a/migrator/migrator_utils.go +++ b/migrator/migrator_utils.go @@ -42,9 +42,9 @@ func NewMigratorDataDB(db_type, host, port, name, user, pass, dm := engine.NewDataManager(dbCon, cacheCfg, nil) var d MigratorDataDB switch db_type { - case utils.REDIS: + case utils.Redis: d = newRedisMigrator(dm) - case utils.MONGO: + case utils.Mongo: d = newMongoMigrator(dm) db = d.(MigratorDataDB) case utils.INTERNAL: @@ -52,7 +52,7 @@ func NewMigratorDataDB(db_type, host, port, name, user, pass, db = d.(MigratorDataDB) default: err = fmt.Errorf("unknown db '%s' valid options are '%s' or '%s or '%s'", - db_type, utils.REDIS, utils.MONGO, utils.INTERNAL) + db_type, utils.Redis, utils.Mongo, utils.INTERNAL) } return d, nil } @@ -67,13 +67,13 @@ func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler string, return nil, err } switch db_type { - case utils.MONGO: + case utils.Mongo: d = newMongoStorDBMigrator(storDb) db = d.(MigratorStorDB) - case utils.MYSQL: + case utils.MySQL: d = newMigratorSQL(storDb) db = d.(MigratorStorDB) - case utils.POSTGRES: + case utils.Postgres: d = newMigratorSQL(storDb) db = d.(MigratorStorDB) case utils.INTERNAL: @@ -81,7 +81,7 @@ func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler string, db = d.(MigratorStorDB) default: err = fmt.Errorf("Unknown db '%s' valid options are [%s, %s, %s, %s]", - db_type, utils.MYSQL, utils.MONGO, utils.POSTGRES, utils.INTERNAL) + db_type, utils.MySQL, utils.Mongo, utils.Postgres, utils.INTERNAL) } return d, nil } diff --git a/migrator/storage_sql.go b/migrator/storage_sql.go index 646770b64..d83cca2df 100755 --- a/migrator/storage_sql.go +++ b/migrator/storage_sql.go @@ -98,7 +98,7 @@ func (mgSQL *migratorSQL) remV1CDRs(v1Cdr *v1Cdrs) (err error) { func (mgSQL *migratorSQL) renameV1SMCosts() (err error) { qry := "RENAME TABLE sm_costs TO session_costs;" - if mgSQL.StorDB().GetStorageType() == utils.POSTGRES { + if mgSQL.StorDB().GetStorageType() == utils.Postgres { qry = "ALTER TABLE sm_costs RENAME TO session_costs" } if _, err := mgSQL.sqlStorage.Db.Exec(qry); err != nil { @@ -109,7 +109,7 @@ func (mgSQL *migratorSQL) renameV1SMCosts() (err error) { func (mgSQL *migratorSQL) createV1SMCosts() (err error) { qry := fmt.Sprint("CREATE TABLE sm_costs ( id int(11) NOT NULL AUTO_INCREMENT, cgrid varchar(40) NOT NULL, run_id varchar(64) NOT NULL, origin_host varchar(64) NOT NULL, origin_id varchar(128) NOT NULL, cost_source varchar(64) NOT NULL, `usage` BIGINT NOT NULL, cost_details MEDIUMTEXT, created_at TIMESTAMP NULL,deleted_at TIMESTAMP NULL, PRIMARY KEY (`id`),UNIQUE KEY costid (cgrid, run_id),KEY origin_idx (origin_host, origin_id),KEY run_origin_idx (run_id, origin_id),KEY deleted_at_idx (deleted_at));") - if mgSQL.StorDB().GetStorageType() == utils.POSTGRES { + if mgSQL.StorDB().GetStorageType() == utils.Postgres { qry = ` CREATE TABLE sm_costs ( id SERIAL PRIMARY KEY, diff --git a/services/datadb.go b/services/datadb.go index 495f2942b..dfc8772a0 100644 --- a/services/datadb.go +++ b/services/datadb.go @@ -94,7 +94,7 @@ func (db *DataDBService) Reload() (err error) { db.oldDBCfg = db.cfg.DataDbCfg().Clone() return } - if db.cfg.DataDbCfg().DataDbType == utils.MONGO { + if db.cfg.DataDbCfg().DataDbType == utils.Mongo { var ttl time.Duration if ttl, err = utils.IfaceAsDuration(db.cfg.DataDbCfg().Opts[utils.QueryTimeoutCfg]); err != nil { return @@ -161,7 +161,7 @@ func (db *DataDBService) needsConnectionReload() bool { db.oldDBCfg.DataDbPass != db.cfg.DataDbCfg().DataDbPass { return true } - return db.oldDBCfg.DataDbType == utils.REDIS && + return db.oldDBCfg.DataDbType == utils.Redis && (db.oldDBCfg.Opts[utils.RedisSentinelNameCfg] != db.cfg.DataDbCfg().Opts[utils.RedisSentinelNameCfg] || db.oldDBCfg.Opts[utils.RedisClusterCfg] != db.cfg.DataDbCfg().Opts[utils.RedisClusterCfg] || db.oldDBCfg.Opts[utils.RedisClusterSyncCfg] != db.cfg.DataDbCfg().Opts[utils.RedisClusterSyncCfg] || diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 4d38d022f..cc246060a 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -82,7 +82,7 @@ func TestDataDBReload(t *testing.T) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", db.dm, getDm) } oldcfg := &config.DataDbCfg{ - DataDbType: utils.MONGO, + DataDbType: utils.Mongo, DataDbHost: "127.0.0.1", DataDbPort: "27017", DataDbName: "10", diff --git a/services/datadb_test.go b/services/datadb_test.go index bdd34ffc4..9b62194a1 100644 --- a/services/datadb_test.go +++ b/services/datadb_test.go @@ -47,7 +47,7 @@ func TestDataDBCoverage(t *testing.T) { t.Errorf("Expected service to be running") } oldcfg := &config.DataDbCfg{ - DataDbType: utils.MONGO, + DataDbType: utils.Mongo, DataDbHost: "127.0.0.1", DataDbPort: "27017", DataDbName: "10", diff --git a/services/stordb.go b/services/stordb.go index 46d44e13b..b3e74fdc8 100644 --- a/services/stordb.go +++ b/services/stordb.go @@ -97,7 +97,7 @@ func (db *StorDBService) Reload() (err error) { db.sync() // sync only if needed return } - if db.cfg.StorDbCfg().Type == utils.MONGO { + if db.cfg.StorDbCfg().Type == utils.Mongo { mgo, canCast := db.db.(*engine.MongoStorage) if !canCast { return fmt.Errorf("can't conver StorDB of type %s to MongoStorage", @@ -108,8 +108,8 @@ func (db *StorDBService) Reload() (err error) { return } mgo.SetTTL(ttl) - } else if db.cfg.StorDbCfg().Type == utils.POSTGRES || - db.cfg.StorDbCfg().Type == utils.MYSQL { + } else if db.cfg.StorDbCfg().Type == utils.Postgres || + db.cfg.StorDbCfg().Type == utils.MySQL { msql, canCast := db.db.(*engine.SQLStorage) if !canCast { return fmt.Errorf("can't conver StorDB of type %s to SQLStorage", @@ -205,6 +205,6 @@ func (db *StorDBService) needsConnectionReload() bool { db.oldDBCfg.Password != db.cfg.StorDbCfg().Password { return true } - return db.cfg.StorDbCfg().Type == utils.POSTGRES && + return db.cfg.StorDbCfg().Type == utils.Postgres && utils.IfaceAsString(db.oldDBCfg.Opts[utils.SSLModeCfg]) != utils.IfaceAsString(db.cfg.StorDbCfg().Opts[utils.SSLModeCfg]) } diff --git a/sessions/libsessions.go b/sessions/libsessions.go index 5a09418c7..047ef69ad 100644 --- a/sessions/libsessions.go +++ b/sessions/libsessions.go @@ -36,7 +36,7 @@ var unratedReqs = engine.MapEvent{ } var authReqs = engine.MapEvent{ - utils.META_PREPAID: struct{}{}, + utils.MetaPrepaid: struct{}{}, utils.META_PSEUDOPREPAID: struct{}{}, } diff --git a/sessions/session_test.go b/sessions/session_test.go index 3e3082028..d5c43db4e 100644 --- a/sessions/session_test.go +++ b/sessions/session_test.go @@ -308,7 +308,7 @@ func TestSessionAsCGREventsRawEvent(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -335,7 +335,7 @@ func TestSessionAsCGREvents(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -351,7 +351,7 @@ func TestSessionAsCGREvents(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -390,7 +390,7 @@ func TestSessionAsExternalSessions(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -406,7 +406,7 @@ func TestSessionAsExternalSessions(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -431,7 +431,7 @@ func TestSessionAsExternalSessions(t *testing.T) { OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -470,7 +470,7 @@ func TestSessionAsExternalSessions2(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -486,7 +486,7 @@ func TestSessionAsExternalSessions2(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -516,7 +516,7 @@ func TestSessionAsExternalSessions2(t *testing.T) { OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -554,7 +554,7 @@ func TestSessionAsExternalSessions3(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -570,7 +570,7 @@ func TestSessionAsExternalSessions3(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -603,7 +603,7 @@ func TestSessionAsExternalSessions3(t *testing.T) { OriginID: "123451", // OriginHost: s.EventStart.GetStringIgnoreErrors(utils.OriginHost), Source: utils.SessionS + "_" + "TEST_EVENT", - RequestType: utils.META_PREPAID, + RequestType: utils.MetaPrepaid, Tenant: "cgrates.org", Category: "call", Account: "1001", @@ -716,7 +716,7 @@ func TestUpdateSRuns(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -732,7 +732,7 @@ func TestUpdateSRuns(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 2 * time.Second, @@ -761,11 +761,11 @@ func TestUpdateSRuns(t *testing.T) { utils.RequestType: utils.MetaPostpaid, } s.updateSRuns(updEv, utils.NewStringSet(nil)) - if s.SRuns[0].Event[utils.RequestType] != utils.META_PREPAID { + if s.SRuns[0].Event[utils.RequestType] != utils.MetaPrepaid { t.Errorf("Expected session to not change") } s.UpdateSRuns(updEv, utils.NewStringSet(nil)) - if s.SRuns[0].Event[utils.RequestType] != utils.META_PREPAID { + if s.SRuns[0].Event[utils.RequestType] != utils.MetaPrepaid { t.Errorf("Expected session to not change") } s.UpdateSRuns(updEv, utils.NewStringSet([]string{utils.RequestType})) diff --git a/sessions/sessions.go b/sessions/sessions.go index 89d36743b..173a3f60d 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1373,8 +1373,8 @@ func (sS *SessionS) initSessionDebitLoops(s *Session) { } for i, sr := range s.SRuns { if s.DebitInterval != 0 && - sr.Event.GetStringIgnoreErrors(utils.RequestType) == utils.META_PREPAID { - if s.debitStop == nil { // init the debitStop only for the first sRun with DebitInterval and RequestType META_PREPAID + sr.Event.GetStringIgnoreErrors(utils.RequestType) == utils.MetaPrepaid { + if s.debitStop == nil { // init the debitStop only for the first sRun with DebitInterval and RequestType MetaPrepaid s.debitStop = make(chan struct{}) } go sS.debitLoopSession(s, i, s.DebitInterval) @@ -1476,7 +1476,7 @@ func (sS *SessionS) updateSession(s *Session, updtEv, opts engine.MapEvent, isMs continue } var rplyMaxUsage time.Duration - if reqType != utils.META_PREPAID || s.debitStop != nil { + if reqType != utils.MetaPrepaid || s.debitStop != nil { rplyMaxUsage = reqMaxUsage } else if rplyMaxUsage, err = sS.debitSession(s, i, reqMaxUsage, updtEv.GetDurationPtrIgnoreErrors(utils.LastUsed)); err != nil { diff --git a/sessions/sessions_bench_test.go b/sessions/sessions_bench_test.go index 91a74a55e..163a8e822 100644 --- a/sessions/sessions_bench_test.go +++ b/sessions/sessions_bench_test.go @@ -117,7 +117,7 @@ func initSession(i int) { utils.ToR: utils.VOICE, utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), }, }, diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 448c17683..11ab1f738 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -180,7 +180,7 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 200 * time.Millisecond, @@ -224,7 +224,7 @@ func testSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: initArgs.CGREvent.Event[utils.Usage], @@ -306,7 +306,7 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { utils.Destination: "1005", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 200 * time.Millisecond, @@ -343,7 +343,7 @@ func testSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { utils.Destination: "1005", utils.Category: "call", utils.Tenant: attrSetBalance.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: 7 * time.Millisecond, diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 26e3f5948..152b2a2e2 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -167,7 +167,7 @@ func testSessionsDataLastUsedData(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "5120", // 5MB @@ -208,7 +208,7 @@ func testSessionsDataLastUsedData(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "5120", @@ -248,7 +248,7 @@ func testSessionsDataLastUsedData(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.LastUsed: "0", @@ -311,7 +311,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "6144", // 5MB @@ -359,7 +359,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "8192", // 8 MB @@ -409,7 +409,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", // 8 MB @@ -461,7 +461,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", // 8 MB @@ -505,7 +505,7 @@ func testSessionsDataLastUsedMultipleUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: acntAttrs.Tenant, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.LastUsed: "0", // refund 1024 (extra used) + 1024 (extra reserved) @@ -599,7 +599,7 @@ func testSessionsDataTTLExpired(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", @@ -690,7 +690,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "4096", // 4MB @@ -743,7 +743,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.LastUsed: "1024", @@ -835,7 +835,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "2048", @@ -886,7 +886,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", @@ -937,7 +937,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "0", @@ -990,7 +990,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.LastUsed: "0", @@ -1061,7 +1061,7 @@ func testSessionsDataTTLUsageProtection(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 53, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "2048", @@ -1143,7 +1143,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { utils.Destination: utils.DATA, utils.Category: "data", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 59, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 303d7fca2..60a8dd328 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -149,7 +149,7 @@ func testSessionsItTerminatNonexist(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -226,7 +226,7 @@ func testSessionsItUpdateNonexist(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -267,7 +267,7 @@ func testSessionsItUpdateNonexist(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -292,7 +292,7 @@ func testSessionsItTerminatePassive(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: time.Minute, @@ -349,7 +349,7 @@ func testSessionsItTerminatePassive(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: time.Minute, @@ -405,7 +405,7 @@ func testSessionsItEventCostCompressing(t *testing.T) { utils.OriginID: "TestSessionsItEventCostCompressing", utils.AccountField: "TestSessionsItEventCostCompressing", utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), utils.Usage: "1s", }, @@ -456,7 +456,7 @@ func testSessionsItEventCostCompressing(t *testing.T) { utils.OriginID: "TestSessionsItEventCostCompressing", utils.AccountField: "TestSessionsItEventCostCompressing", utils.Destination: "1002", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AnswerTime: time.Date(2019, time.March, 1, 13, 57, 05, 0, time.UTC), utils.Usage: "4s", }, diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 14984d7ba..513aba654 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -151,7 +151,7 @@ func testSessionSRplInitiate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1004", @@ -219,7 +219,7 @@ func testSessionSRplUpdate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1004", @@ -299,7 +299,7 @@ func testSessionSRplTerminate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1004", @@ -364,7 +364,7 @@ func testSessionSRplManualReplicate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123451", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1004", @@ -388,7 +388,7 @@ func testSessionSRplManualReplicate(t *testing.T) { utils.Tenant: "cgrates.org", utils.OriginID: "123481", utils.ToR: utils.VOICE, - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.AccountField: "1001", utils.Subject: "1001", utils.Destination: "1005", diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index fa339f8d7..5d66b58ca 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -50,7 +50,7 @@ var attrs = &engine.AttrSProcessEventReply{ utils.Destination: "1002", "OfficeGroup": "Marketing", utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2018-01-07T17:00:00Z", utils.Usage: 300000000000.0, }, diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 3669633c4..ddae30f41 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -142,7 +142,7 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -184,7 +184,7 @@ func testSessionsVoiceMonetaryRefund(t *testing.T) { utils.Destination: "1004", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -223,7 +223,7 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { utils.Destination: "1003", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -267,7 +267,7 @@ func testSessionsVoiceVoiceRefund(t *testing.T) { utils.Destination: "1003", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -312,7 +312,7 @@ func testSessionsVoiceMixedRefund(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -359,7 +359,7 @@ func testSessionsVoiceMixedRefund(t *testing.T) { utils.Destination: "1002", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -413,7 +413,7 @@ func testSessionsVoiceLastUsed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -454,7 +454,7 @@ func testSessionsVoiceLastUsed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Usage: usage, utils.LastUsed: lastUsage, }, @@ -493,7 +493,7 @@ func testSessionsVoiceLastUsed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -533,7 +533,7 @@ func testSessionsVoiceLastUsed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -582,7 +582,7 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -623,7 +623,7 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Usage: usage, utils.LastUsed: lastUsage, }, @@ -663,7 +663,7 @@ func testSessionsVoiceLastUsedEnd(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.LastUsed: "0s", }, }, @@ -710,7 +710,7 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -752,7 +752,7 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Usage: usage, utils.LastUsed: lastUsage, }, @@ -791,7 +791,7 @@ func testSessionsVoiceLastUsedNotFixed(t *testing.T) { utils.Destination: "1006", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.LastUsed: "0s", }, }, @@ -839,7 +839,7 @@ func testSessionsVoiceSessionTTL(t *testing.T) { utils.Destination: "1008", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -909,7 +909,7 @@ func testSessionsVoiceSessionTTL(t *testing.T) { utils.Destination: "1008", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.Usage: usage, utils.LastUsed: lastUsage, }, @@ -1016,7 +1016,7 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { utils.Destination: "1009", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -1075,7 +1075,7 @@ func testSessionsVoiceSessionTTLWithRelocate(t *testing.T) { utils.Destination: "1009", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -1193,7 +1193,7 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.Destination: "12371", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -1252,7 +1252,7 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.Destination: "12371", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, @@ -1308,7 +1308,7 @@ func testSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { utils.Destination: "12371", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: time.Date(2016, time.January, 5, 18, 30, 49, 0, time.UTC), utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: time.Minute, @@ -1383,7 +1383,7 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { utils.Destination: "+49", utils.Category: "call", utils.Tenant: "cgrates.org", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.MetaPrepaid, utils.SetupTime: "2016-01-05 18:30:49", utils.AnswerTime: "2016-01-05 18:31:05", utils.Usage: "100", diff --git a/utils/consts.go b/utils/consts.go index 4c246293c..48a8ad81d 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -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, MetaPostpaid, META_PSEUDOPREPAID}) + AccountableRequestTypes = NewStringSet([]string{MetaPrepaid, MetaPostpaid, META_PSEUDOPREPAID}) CacheStorDBPartitions = map[string]string{ TBLTPTimings: CacheTBLTPTimings, @@ -261,16 +261,16 @@ const ( DiameterFirmwareRevision = 918 RedisMaxConns = 10 CGRateSLwr = "cgrates" - POSTGRES = "postgres" - MYSQL = "mysql" - MONGO = "mongo" - REDIS = "redis" + Postgres = "postgres" + MySQL = "mysql" + Mongo = "mongo" + Redis = "redis" INTERNAL = "internal" DataManager = "DataManager" LOCALHOST = "127.0.0.1" PREPAID = "prepaid" - META_PREPAID = "*prepaid" - POSTPAID = "postpaid" + MetaPrepaid = "*prepaid" + Postpaid = "postpaid" MetaPostpaid = "*postpaid" PSEUDOPREPAID = "pseudoprepaid" META_PSEUDOPREPAID = "*pseudoprepaid" diff --git a/utils/struct_test.go b/utils/struct_test.go index 3ac6a8131..cbb887247 100644 --- a/utils/struct_test.go +++ b/utils/struct_test.go @@ -30,7 +30,7 @@ func TestMissingStructFieldsCorrect(t *testing.T) { Account string Type string ActionTimingsID string - }{"bevoip.eu", "danconns0001", META_PREPAID, "mama"} + }{"bevoip.eu", "danconns0001", MetaPrepaid, "mama"} if missing := MissingStructFields(&attr, []string{"Tenant", "Account", "Type", "ActionTimingsID"}); len(missing) != 0 { t.Error("Found missing field on correct struct", missing) @@ -83,7 +83,7 @@ func TestMissingMapFields(t *testing.T) { var attr = map[string]interface{}{ Tenant: "cgrates.org", AccountField: "1001", - "Type": META_PREPAID, + "Type": MetaPrepaid, "ActionTimingsID": "*asap", } if missing := MissingMapFields(attr, @@ -107,7 +107,7 @@ func TestMissingStructFieldsAppend(t *testing.T) { Account string Type string ActionTimingsID string - }{"", "", META_PREPAID, ""} + }{"", "", MetaPrepaid, ""} missing := MissingStructFields(&attr, []string{"Tenant", "Account", "Type", "ActionTimingsID"}) if len(missing) == 0 {