diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index 1c357d9cc..a3fe07e72 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -214,24 +214,24 @@ func testDiamItResetAllDB(t *testing.T) { if err != nil { t.Fatal(err) } - if err := engine.InitDataDb(allCfg); err != nil { + if err := engine.InitDataDB(allCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(allCfg); err != nil { + if err := engine.InitStorDB(allCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testDiamItResetDataDb(t *testing.T) { - if err := engine.InitDataDb(daCfg); err != nil { + if err := engine.InitDataDB(daCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testDiamItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(daCfg); err != nil { + if err := engine.InitStorDB(daCfg); err != nil { t.Fatal(err) } } diff --git a/agents/dnsagent_it_test.go b/agents/dnsagent_it_test.go index 10762cc5d..ca894da16 100644 --- a/agents/dnsagent_it_test.go +++ b/agents/dnsagent_it_test.go @@ -83,10 +83,10 @@ func testDNSitInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testDNSitResetDB(t *testing.T) { - if err := engine.InitDataDb(dnsCfg); err != nil { + if err := engine.InitDataDB(dnsCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(dnsCfg); err != nil { + if err := engine.InitStorDB(dnsCfg); err != nil { t.Fatal(err) } } diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index ee174fe1d..ae6519622 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -154,10 +154,10 @@ func testHAitHttp(t *testing.T) { // Remove data in both rating and accounting db func testHAitResetDB(t *testing.T) { - if err := engine.InitDataDb(haCfg); err != nil { + if err := engine.InitDataDB(haCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(haCfg); err != nil { + if err := engine.InitStorDB(haCfg); err != nil { t.Fatal(err) } } diff --git a/agents/radagent_it_test.go b/agents/radagent_it_test.go index 80cbd9424..03af5ed25 100644 --- a/agents/radagent_it_test.go +++ b/agents/radagent_it_test.go @@ -123,24 +123,24 @@ func testRadiusitResetAllDB(t *testing.T) { if err != nil { t.Fatal(err) } - if err := engine.InitDataDb(allCfg); err != nil { + if err := engine.InitDataDB(allCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(allCfg); err != nil { + if err := engine.InitStorDB(allCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testRAitResetDataDb(t *testing.T) { - if err := engine.InitDataDb(raCfg); err != nil { + if err := engine.InitDataDB(raCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testRAitResetStorDb(t *testing.T) { - if err := engine.InitStorDb(raCfg); err != nil { + if err := engine.InitStorDB(raCfg); err != nil { t.Fatal(err) } } diff --git a/agents/sipagent_it_test.go b/agents/sipagent_it_test.go index 68a8bec9c..2cab1f83a 100644 --- a/agents/sipagent_it_test.go +++ b/agents/sipagent_it_test.go @@ -90,14 +90,14 @@ func testSAitInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSAitResetDataDb(t *testing.T) { - if err := engine.InitDataDb(saCfg); err != nil { + if err := engine.InitDataDB(saCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testSAitResetStorDb(t *testing.T) { - if err := engine.InitStorDb(saCfg); err != nil { + if err := engine.InitStorDB(saCfg); err != nil { t.Fatal(err) } } diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index 763d8ec53..1d3b23fe6 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -97,14 +97,14 @@ func testAnalyzerSInitCfg(t *testing.T) { } func testAnalyzerSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(anzCfg); err != nil { + if err := engine.InitDataDB(anzCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAnalyzerSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(anzCfg); err != nil { + if err := engine.InitStorDB(anzCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/accountprofiles_it_test.go b/apier/v1/accountprofiles_it_test.go index 471047192..394377633 100644 --- a/apier/v1/accountprofiles_it_test.go +++ b/apier/v1/accountprofiles_it_test.go @@ -88,14 +88,14 @@ func testAccountSInitCfg(t *testing.T) { } func testAccountSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(accPrfCfg); err != nil { + if err := engine.InitDataDB(accPrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAccountSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(accPrfCfg); err != nil { + if err := engine.InitStorDB(accPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/accountsv1_it_test.go b/apier/v1/accountsv1_it_test.go index d0b09bf94..066f77162 100644 --- a/apier/v1/accountsv1_it_test.go +++ b/apier/v1/accountsv1_it_test.go @@ -91,14 +91,14 @@ func testAccountSv1InitCfg(t *testing.T) { } func testAccountSv1InitDataDb(t *testing.T) { - if err := engine.InitDataDb(acntSCfg); err != nil { + if err := engine.InitDataDB(acntSCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAccountSv1ResetStorDb(t *testing.T) { - if err := engine.InitStorDb(acntSCfg); err != nil { + if err := engine.InitStorDB(acntSCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/actions_it_test.go b/apier/v1/actions_it_test.go index 00372d5d9..fd46dcc55 100644 --- a/apier/v1/actions_it_test.go +++ b/apier/v1/actions_it_test.go @@ -98,14 +98,14 @@ func testActionSInitCfg(t *testing.T) { } func testActionSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(actPrfCfg); err != nil { + if err := engine.InitDataDB(actPrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testActionSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(actPrfCfg); err != nil { + if err := engine.InitStorDB(actPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 567510d81..a78123ae5 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -264,11 +264,11 @@ func (apierSv1 *APIerSv1) ImportTariffPlanFromFolder(attrs *utils.AttrImportTPFr } csvImporter := engine.TPCSVImporter{ TPid: attrs.TPid, - StorDb: apierSv1.StorDb, + StorDB: apierSv1.StorDb, DirPath: attrs.FolderPath, Sep: rune(attrs.CsvSeparator[0]), Verbose: false, - ImportId: attrs.RunId, + ImportID: attrs.RunId, } if err := csvImporter.Run(); err != nil { return utils.NewErrServerError(err) diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 1eef8a53b..bd8cca451 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -96,14 +96,14 @@ func testAPIerInitCfg(t *testing.T) { } func testAPIerInitDataDb(t *testing.T) { - if err := engine.InitDataDb(apierCfg); err != nil { + if err := engine.InitDataDB(apierCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAPIerResetStorDb(t *testing.T) { - if err := engine.InitStorDb(apierCfg); err != nil { + if err := engine.InitStorDB(apierCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index bc32c52b0..d678011c3 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -156,14 +156,14 @@ func testApierCreateDirs(t *testing.T) { } func testApierInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cfg); err != nil { + if err := engine.InitDataDB(cfg); err != nil { t.Fatal(err) } } // Empty tables before using them func testApierInitStorDb(t *testing.T) { - if err := engine.InitStorDb(cfg); err != nil { + if err := engine.InitStorDB(cfg); err != nil { t.Fatal(err) } } @@ -867,13 +867,13 @@ func testApierITGetCost(t *testing.T) { // Test LoadTPFromStorDb func testApierInitDataDb2(t *testing.T) { - if err := engine.InitDataDb(cfg); err != nil { + if err := engine.InitDataDB(cfg); err != nil { t.Fatal(err) } } func testApierInitStorDb2(t *testing.T) { - if err := engine.InitStorDb(cfg); err != nil { + if err := engine.InitStorDB(cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index fc5762bba..03b01b9ca 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -134,14 +134,14 @@ func testAttributeSInitCfg(t *testing.T) { } func testAttributeSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(alsPrfCfg); err != nil { + if err := engine.InitDataDB(alsPrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAttributeSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(alsPrfCfg); err != nil { + if err := engine.InitStorDB(alsPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/cache_replication_it_test.go b/apier/v1/cache_replication_it_test.go index 4ccd6d2e2..74d113561 100644 --- a/apier/v1/cache_replication_it_test.go +++ b/apier/v1/cache_replication_it_test.go @@ -74,20 +74,20 @@ func testCacheSReplicateLoadConfig(t *testing.T) { } func testCacheSReplicateInitDataDb(t *testing.T) { - if err := engine.InitDataDb(engine1Cfg); err != nil { + if err := engine.InitDataDB(engine1Cfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(engine2Cfg); err != nil { + if err := engine.InitDataDB(engine2Cfg); err != nil { t.Fatal(err) } } // Empty tables before using them func testCacheSReplicateInitStorDb(t *testing.T) { - if err := engine.InitStorDb(engine1Cfg); err != nil { + if err := engine.InitStorDB(engine1Cfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(engine2Cfg); err != nil { + if err := engine.InitStorDB(engine2Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/caches_it_test.go b/apier/v1/caches_it_test.go index e24beab90..bcad35602 100644 --- a/apier/v1/caches_it_test.go +++ b/apier/v1/caches_it_test.go @@ -90,14 +90,14 @@ func testCacheSLoadConfig(t *testing.T) { } func testCacheSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(chcCfg); err != nil { + if err := engine.InitDataDB(chcCfg); err != nil { t.Fatal(err) } } // Empty tables before using them func testCacheSInitStorDb(t *testing.T) { - if err := engine.InitStorDb(chcCfg); err != nil { + if err := engine.InitStorDB(chcCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/cdrs_it_test.go b/apier/v1/cdrs_it_test.go index 8145fc44a..90676ab30 100644 --- a/apier/v1/cdrs_it_test.go +++ b/apier/v1/cdrs_it_test.go @@ -87,14 +87,14 @@ func testV1CDRsInitConfig(t *testing.T) { } func testV1CDRsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cdrsCfg); err != nil { + if err := engine.InitDataDB(cdrsCfg); err != nil { t.Fatal(err) } } // InitDb so we can rely on count func testV1CDRsInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cdrsCfg); err != nil { + if err := engine.InitStorDB(cdrsCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index 034e8b83b..fabf2192a 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -132,14 +132,14 @@ func testChargerSInitCfg(t *testing.T) { } func testChargerSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(chargerCfg); err != nil { + if err := engine.InitDataDB(chargerCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testChargerSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(chargerCfg); err != nil { + if err := engine.InitStorDB(chargerCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/config_it_test.go b/apier/v1/config_it_test.go index 6906dc7eb..75d113222 100644 --- a/apier/v1/config_it_test.go +++ b/apier/v1/config_it_test.go @@ -91,14 +91,14 @@ func testConfigSInitCfg(t *testing.T) { } func testConfigSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(configCfg); err != nil { + if err := engine.InitDataDB(configCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testConfigSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(configCfg); err != nil { + if err := engine.InitStorDB(configCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/cost_bench_it_test.go b/apier/v1/cost_bench_it_test.go index 167aacbc3..ebd655f16 100644 --- a/apier/v1/cost_bench_it_test.go +++ b/apier/v1/cost_bench_it_test.go @@ -48,14 +48,14 @@ func testCostBenchInitCfg(b *testing.B) { } func testCostBenchInitDataDb(b *testing.B) { - if err := engine.InitDataDb(costBenchCfg); err != nil { + if err := engine.InitDataDB(costBenchCfg); err != nil { b.Fatal(err) } } // Wipe out the cdr database func testCostBenchResetStorDb(b *testing.B) { - if err := engine.InitStorDb(costBenchCfg); err != nil { + if err := engine.InitStorDB(costBenchCfg); err != nil { b.Fatal(err) } } diff --git a/apier/v1/dispatcher_it_test.go b/apier/v1/dispatcher_it_test.go index a634c20e6..0ba17a8cf 100644 --- a/apier/v1/dispatcher_it_test.go +++ b/apier/v1/dispatcher_it_test.go @@ -99,14 +99,14 @@ func testDispatcherSInitCfg(t *testing.T) { } func testDispatcherSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(dispatcherCfg); err != nil { + if err := engine.InitDataDB(dispatcherCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testDispatcherSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(dispatcherCfg); err != nil { + if err := engine.InitStorDB(dispatcherCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go index b87b6eb22..dd1e216ff 100644 --- a/apier/v1/dispatchersv1_it_test.go +++ b/apier/v1/dispatchersv1_it_test.go @@ -83,13 +83,13 @@ func testDspITLoadConfig(t *testing.T) { } func testDspITResetDataDB(t *testing.T) { - if err := engine.InitDataDb(dspCfg); err != nil { + if err := engine.InitDataDB(dspCfg); err != nil { t.Fatal(err) } } func testDspITResetStorDb(t *testing.T) { - if err := engine.InitStorDb(dspCfg); err != nil { + if err := engine.InitStorDB(dspCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/ees_it_test.go b/apier/v1/ees_it_test.go index 84fc95737..d0f52b1c9 100644 --- a/apier/v1/ees_it_test.go +++ b/apier/v1/ees_it_test.go @@ -94,14 +94,14 @@ func testEEsInitCfg(t *testing.T) { } func testEEsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(eeSCfg); err != nil { + if err := engine.InitDataDB(eeSCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testEEsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(eeSCfg); err != nil { + if err := engine.InitStorDB(eeSCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 04218467d..446d8368d 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -154,7 +154,7 @@ func testV1FIdxLoadConfig(t *testing.T) { } func testV1FIdxdxInitDataDb(t *testing.T) { - if err := engine.InitDataDb(tSv1Cfg); err != nil { + if err := engine.InitDataDB(tSv1Cfg); err != nil { t.Fatal(err) } } @@ -168,7 +168,7 @@ func testV1IndexClearCache(t *testing.T) { // Wipe out the cdr database func testV1FIdxResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tSv1Cfg); err != nil { + if err := engine.InitStorDB(tSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 0598340d7..bf32ed92d 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -106,14 +106,14 @@ func testV1FIdxCaLoadConfig(t *testing.T) { } func testV1FIdxCaInitDataDb(t *testing.T) { - if err := engine.InitDataDb(tSv1Cfg); err != nil { + if err := engine.InitDataDB(tSv1Cfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1FIdxCaResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tSv1Cfg); err != nil { + if err := engine.InitStorDB(tSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/filters_it_test.go b/apier/v1/filters_it_test.go index df8a4b211..47f2c25a9 100644 --- a/apier/v1/filters_it_test.go +++ b/apier/v1/filters_it_test.go @@ -88,7 +88,7 @@ func testFilterInitCfg(t *testing.T) { // Wipe out the cdr database func testFilterResetDataDB(t *testing.T) { - if err := engine.InitDataDb(filterCfg); err != nil { + if err := engine.InitDataDB(filterCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/full_remote_it_test.go b/apier/v1/full_remote_it_test.go index a61f5c688..5bd26dba4 100644 --- a/apier/v1/full_remote_it_test.go +++ b/apier/v1/full_remote_it_test.go @@ -92,7 +92,7 @@ func testFullRemoteITInitCfg(t *testing.T) { } func testFullRemoteITDataFlush(t *testing.T) { - if err := engine.InitDataDb(fullRemEngineOneCfg); err != nil { + if err := engine.InitDataDB(fullRemEngineOneCfg); err != nil { t.Fatal(err) } time.Sleep(100 * time.Millisecond) diff --git a/apier/v1/guardian_it_test.go b/apier/v1/guardian_it_test.go index c672c1d78..f43d30f17 100644 --- a/apier/v1/guardian_it_test.go +++ b/apier/v1/guardian_it_test.go @@ -53,11 +53,11 @@ func TestGuardianSIT(t *testing.T) { t.Error(err) } - if err = engine.InitDataDb(guardianCfg); err != nil { + if err = engine.InitDataDB(guardianCfg); err != nil { t.Fatal(err) } - if err = engine.InitStorDb(guardianCfg); err != nil { + if err = engine.InitStorDB(guardianCfg); err != nil { t.Fatal(err) } diff --git a/apier/v1/precache_it_test.go b/apier/v1/precache_it_test.go index 41529f8dc..c856e61bf 100644 --- a/apier/v1/precache_it_test.go +++ b/apier/v1/precache_it_test.go @@ -90,7 +90,7 @@ func testPrecacheInitCfg(t *testing.T) { } func testPrecacheResetDataDB(t *testing.T) { - if err := engine.InitDataDb(precacheCfg); err != nil { + if err := engine.InitDataDB(precacheCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go index 99f0cb2ed..6008e7a12 100644 --- a/apier/v1/rateprofiles_it_test.go +++ b/apier/v1/rateprofiles_it_test.go @@ -98,14 +98,14 @@ func testV1RatePrfLoadConfig(t *testing.T) { } func testV1RatePrfInitDataDb(t *testing.T) { - if err := engine.InitDataDb(ratePrfCfg); err != nil { + if err := engine.InitDataDB(ratePrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1RatePrfResetStorDb(t *testing.T) { - if err := engine.InitStorDb(ratePrfCfg); err != nil { + if err := engine.InitStorDB(ratePrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 5b32499de..13efd1e0c 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -138,10 +138,10 @@ func testInternalRemoteITInitCfg(t *testing.T) { } func testInternalRemoteITDataFlush(t *testing.T) { - if err := engine.InitDataDb(engineOneCfg); err != nil { + if err := engine.InitDataDB(engineOneCfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(engineTwoCfg); err != nil { + if err := engine.InitDataDB(engineTwoCfg); err != nil { t.Fatal(err) } time.Sleep(100 * time.Millisecond) diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index 2c9f79193..358c6f73f 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -109,10 +109,10 @@ func testInternalReplicateITInitCfg(t *testing.T) { } func testInternalReplicateITDataFlush(t *testing.T) { - if err := engine.InitDataDb(engineOneCfg); err != nil { + if err := engine.InitDataDB(engineOneCfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(engineTwoCfg); err != nil { + if err := engine.InitDataDB(engineTwoCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index ed42ace24..56a65531f 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -116,14 +116,14 @@ func testV1RsLoadConfig(t *testing.T) { } func testV1RsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(rlsV1Cfg); err != nil { + if err := engine.InitDataDB(rlsV1Cfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1RsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(rlsV1Cfg); err != nil { + if err := engine.InitStorDB(rlsV1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go index e216e9eae..19b61c87c 100644 --- a/apier/v1/routes_it_test.go +++ b/apier/v1/routes_it_test.go @@ -109,7 +109,7 @@ func testV1RouteLoadConfig(t *testing.T) { } func testV1RouteInitDataDb(t *testing.T) { - if err := engine.InitDataDb(routeSv1Cfg); err != nil { + if err := engine.InitDataDB(routeSv1Cfg); err != nil { t.Fatal(err) } } @@ -123,7 +123,7 @@ func testV1RouteClearCache(t *testing.T) { // Wipe out the cdr database func testV1RouteResetStorDb(t *testing.T) { - if err := engine.InitStorDb(routeSv1Cfg); err != nil { + if err := engine.InitStorDB(routeSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index db74e429a..162c74309 100755 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -100,13 +100,13 @@ func testSessionSv1ItInitCfg(t *testing.T) { } func testSessionSv1ItResetDataDb(t *testing.T) { - if err := engine.InitDataDb(sSv1Cfg2); err != nil { + if err := engine.InitDataDB(sSv1Cfg2); err != nil { t.Fatal(err) } } func testSessionSv1ItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sSv1Cfg2); err != nil { + if err := engine.InitStorDB(sSv1Cfg2); err != nil { t.Fatal(err) } } diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index a5951b935..2a0b1794e 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -141,13 +141,13 @@ func TestSSv1ItWithPseudoPrepaid(t *testing.T) { } func testSSv1ItResetDataDb(t *testing.T) { - if err := engine.InitDataDb(sSv1Cfg); err != nil { + if err := engine.InitDataDB(sSv1Cfg); err != nil { t.Fatal(err) } } func testSSv1ItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sSv1Cfg); err != nil { + if err := engine.InitStorDB(sSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index adf915f3e..c82df93b0 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -147,7 +147,7 @@ func testV1STSLoadConfig(t *testing.T) { } func testV1STSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(stsV1Cfg); err != nil { + if err := engine.InitDataDB(stsV1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index 48291581c..eea79864d 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -273,14 +273,14 @@ func testV1TSLoadConfig(t *testing.T) { } func testV1TSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(tSv1Cfg); err != nil { + if err := engine.InitDataDB(tSv1Cfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1TSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tSv1Cfg); err != nil { + if err := engine.InitStorDB(tSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tp.go b/apier/v1/tp.go index 160ce9a49..226587517 100644 --- a/apier/v1/tp.go +++ b/apier/v1/tp.go @@ -77,11 +77,11 @@ func (apierSv1 *APIerSv1) ImportTPZipFile(attrs *AttrImportTPZipFile, reply *str } csvImporter := engine.TPCSVImporter{ TPid: attrs.TPid, - StorDb: apierSv1.StorDb, + StorDB: apierSv1.StorDb, DirPath: path, Sep: utils.CSVSep, Verbose: false, - ImportId: "", + ImportID: "", } if errImport := csvImporter.Run(); errImport != nil { return errImport diff --git a/apier/v1/tp_it_test.go b/apier/v1/tp_it_test.go index ed280ed4f..ffaf8fc16 100644 --- a/apier/v1/tp_it_test.go +++ b/apier/v1/tp_it_test.go @@ -82,7 +82,7 @@ func testTPInitCfg(t *testing.T) { // Wipe out the cdr database func testTPResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpCfg); err != nil { + if err := engine.InitStorDB(tpCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpaccountprofiles_it_test.go b/apier/v1/tpaccountprofiles_it_test.go index 3b8b39cc2..0937f5a09 100644 --- a/apier/v1/tpaccountprofiles_it_test.go +++ b/apier/v1/tpaccountprofiles_it_test.go @@ -88,7 +88,7 @@ func testTPAcctPrfInitCfg(t *testing.T) { // Wipe out the cdr database func testTPAcctPrfResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpAcctPrfCfg); err != nil { + if err := engine.InitStorDB(tpAcctPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpactionprofiles_it_test.go b/apier/v1/tpactionprofiles_it_test.go index 3769d539f..a342547cd 100644 --- a/apier/v1/tpactionprofiles_it_test.go +++ b/apier/v1/tpactionprofiles_it_test.go @@ -90,7 +90,7 @@ func testTPActPrfInitCfg(t *testing.T) { // Wipe out the cdr database func testTPActPrfResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpActPrfCfg); err != nil { + if err := engine.InitStorDB(tpActPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpattributes_it_test.go b/apier/v1/tpattributes_it_test.go index 773e5fd7a..a7357f106 100644 --- a/apier/v1/tpattributes_it_test.go +++ b/apier/v1/tpattributes_it_test.go @@ -90,7 +90,7 @@ func testTPAlsPrfInitCfg(t *testing.T) { // Wipe out the cdr database func testTPAlsPrfResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpAlsPrfCfg); err != nil { + if err := engine.InitStorDB(tpAlsPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpchargers_it_test.go b/apier/v1/tpchargers_it_test.go index 4d94f6b5b..38c20da6c 100644 --- a/apier/v1/tpchargers_it_test.go +++ b/apier/v1/tpchargers_it_test.go @@ -90,7 +90,7 @@ func testTPChrgsInitCfg(t *testing.T) { // Wipe out the cdr database func testTPChrgsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpChrgsCfg); err != nil { + if err := engine.InitStorDB(tpChrgsCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpdestinations_it_test.go b/apier/v1/tpdestinations_it_test.go index c89fa2d2c..5c3bfc586 100644 --- a/apier/v1/tpdestinations_it_test.go +++ b/apier/v1/tpdestinations_it_test.go @@ -93,7 +93,7 @@ func testTPDestinationsInitCfg(t *testing.T) { // Wipe out the cdr database func testTPDestinationsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpDestinationCfg); err != nil { + if err := engine.InitStorDB(tpDestinationCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpdispatchers_it_test.go b/apier/v1/tpdispatchers_it_test.go index bdf6a8272..e4c7eebae 100644 --- a/apier/v1/tpdispatchers_it_test.go +++ b/apier/v1/tpdispatchers_it_test.go @@ -89,7 +89,7 @@ func testTPDispatcherInitCfg(t *testing.T) { // Wipe out the cdr database func testTPDispatcherResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpDispatcherCfg); err != nil { + if err := engine.InitStorDB(tpDispatcherCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpfilters_it_test.go b/apier/v1/tpfilters_it_test.go index 11c36239c..8424e0b74 100644 --- a/apier/v1/tpfilters_it_test.go +++ b/apier/v1/tpfilters_it_test.go @@ -91,7 +91,7 @@ func testTPFilterInitCfg(t *testing.T) { // Wipe out the cdr database func testTPFilterResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpFilterCfg); err != nil { + if err := engine.InitStorDB(tpFilterCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tprateprofiles_it_test.go b/apier/v1/tprateprofiles_it_test.go index b08f488d5..e285ee7cb 100644 --- a/apier/v1/tprateprofiles_it_test.go +++ b/apier/v1/tprateprofiles_it_test.go @@ -89,7 +89,7 @@ func testTPRatePrfInitCfg(t *testing.T) { // Wipe out the cdr database func testTPRatePrfResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpRatePrfCfg); err != nil { + if err := engine.InitStorDB(tpRatePrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpresources_it_test.go b/apier/v1/tpresources_it_test.go index f225267a8..c3fe2a45f 100644 --- a/apier/v1/tpresources_it_test.go +++ b/apier/v1/tpresources_it_test.go @@ -88,7 +88,7 @@ func testTPResInitCfg(t *testing.T) { // Wipe out the cdr database func testTPResResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpResCfg); err != nil { + if err := engine.InitStorDB(tpResCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tproutes_it_test.go b/apier/v1/tproutes_it_test.go index 3737c29a5..b14474b7b 100644 --- a/apier/v1/tproutes_it_test.go +++ b/apier/v1/tproutes_it_test.go @@ -91,7 +91,7 @@ func testTPRouteInitCfg(t *testing.T) { // Wipe out the cdr database func testTPRouteResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpRouteCfg); err != nil { + if err := engine.InitStorDB(tpRouteCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpstats_it_test.go b/apier/v1/tpstats_it_test.go index a787537bb..ada0573f6 100644 --- a/apier/v1/tpstats_it_test.go +++ b/apier/v1/tpstats_it_test.go @@ -89,7 +89,7 @@ func testTPStatsInitCfg(t *testing.T) { // Wipe out the cdr database func testTPStatsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpStatCfg); err != nil { + if err := engine.InitStorDB(tpStatCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tpthresholds_it_test.go b/apier/v1/tpthresholds_it_test.go index bf793d2aa..ea0556dfc 100644 --- a/apier/v1/tpthresholds_it_test.go +++ b/apier/v1/tpthresholds_it_test.go @@ -90,7 +90,7 @@ func testTPThreholdInitCfg(t *testing.T) { // Wipe out the cdr database func testTPThreholdResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpThresholdCfg); err != nil { + if err := engine.InitStorDB(tpThresholdCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/tptimings_it_test.go b/apier/v1/tptimings_it_test.go index 5f158b5e9..53599f3ae 100644 --- a/apier/v1/tptimings_it_test.go +++ b/apier/v1/tptimings_it_test.go @@ -93,7 +93,7 @@ func testTPTimingsInitCfg(t *testing.T) { // Wipe out the cdr database func testTPTimingsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpTimingCfg); err != nil { + if err := engine.InitStorDB(tpTimingCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v1/versions_it_test.go b/apier/v1/versions_it_test.go index 415d6aa5e..8977e59f4 100644 --- a/apier/v1/versions_it_test.go +++ b/apier/v1/versions_it_test.go @@ -96,7 +96,7 @@ func testVrsInitCfg(t *testing.T) { // Wipe out the cdr database func testVrsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(vrsCfg); err != nil { + if err := engine.InitStorDB(vrsCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index dad0c863f..6ea080219 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -90,14 +90,14 @@ func testAPIerSv2itLoadConfig(t *testing.T) { // Remove data in both rating and accounting db func testAPIerSv2itResetDataDb(t *testing.T) { - if err := engine.InitDataDb(apierCfg); err != nil { + if err := engine.InitDataDB(apierCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAPIerSv2itResetStorDb(t *testing.T) { - if err := engine.InitStorDb(apierCfg); err != nil { + if err := engine.InitStorDB(apierCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v2/attributes_it_test.go b/apier/v2/attributes_it_test.go index bc4ff99f8..ea82d309e 100644 --- a/apier/v2/attributes_it_test.go +++ b/apier/v2/attributes_it_test.go @@ -83,14 +83,14 @@ func testAttributeSInitCfg(t *testing.T) { } func testAttributeSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(alsPrfCfg); err != nil { + if err := engine.InitDataDB(alsPrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAttributeSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(alsPrfCfg); err != nil { + if err := engine.InitStorDB(alsPrfCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 2318cf0c6..3ac9dea2b 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -110,14 +110,14 @@ func testV2CDRsInitConfig(t *testing.T) { } func testV2CDRsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cdrsCfg); err != nil { + if err := engine.InitDataDB(cdrsCfg); err != nil { t.Fatal(err) } } // InitDb so we can rely on count func testV2CDRsInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cdrsCfg); err != nil { + if err := engine.InitStorDB(cdrsCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index b572d45b9..97529eb33 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -82,14 +82,14 @@ func testV2CDRsOfflineInitConfig(t *testing.T) { } func testV2CDRsOfflineInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cdrsOfflineCfg); err != nil { + if err := engine.InitDataDB(cdrsOfflineCfg); err != nil { t.Fatal(err) } } // InitDb so we can rely on count func testV2CDRsOfflineInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cdrsOfflineCfg); err != nil { + if err := engine.InitStorDB(cdrsOfflineCfg); err != nil { t.Fatal(err) } } diff --git a/apier/v2/tp_it_test.go b/apier/v2/tp_it_test.go index 29bf881b5..c642a27d3 100644 --- a/apier/v2/tp_it_test.go +++ b/apier/v2/tp_it_test.go @@ -91,14 +91,14 @@ func testTPitLoadConfig(t *testing.T) { // Remove data in both rating and accounting db func testTPitResetDataDb(t *testing.T) { - if err := engine.InitDataDb(tpCfg); err != nil { + if err := engine.InitDataDB(tpCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testTPitResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpCfg); err != nil { + if err := engine.InitStorDB(tpCfg); err != nil { t.Fatal(err) } } diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 789005c2b..f626b56ad 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -283,11 +283,11 @@ func importData(cfg *config.CGRConfig) (err error) { } csvImporter := engine.TPCSVImporter{ TPid: cfg.LoaderCgrCfg().TpID, - StorDb: storDB, + StorDB: storDB, DirPath: *dataPath, Sep: cfg.LoaderCgrCfg().FieldSeparator, Verbose: *verbose, - ImportId: *importID, + ImportID: *importID, } return csvImporter.Run() } diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index 300bbf5cf..9e91b098b 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -254,13 +254,13 @@ func testLoadItLoadConfig(t *testing.T) { } func testLoadItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(ldrItCfg); err != nil { + if err := engine.InitDataDB(ldrItCfg); err != nil { t.Fatal(err) } } func testLoadItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(ldrItCfg); err != nil { + if err := engine.InitStorDB(ldrItCfg); err != nil { t.Fatal(err) } } diff --git a/dispatchers/lib_test.go b/dispatchers/lib_test.go index db17771dc..a5d796183 100644 --- a/dispatchers/lib_test.go +++ b/dispatchers/lib_test.go @@ -107,14 +107,14 @@ func (d *testDispatcher) stopEngine(t *testing.T) { } func (d *testDispatcher) initDataDb(t *testing.T) { - if err := engine.InitDataDb(d.Cfg); err != nil { + if err := engine.InitDataDB(d.Cfg); err != nil { t.Fatalf("Error at DataDB init:%v\n", err) } } // Wipe out the cdr database func (d *testDispatcher) resetStorDb(t *testing.T) { - if err := engine.InitStorDb(d.Cfg); err != nil { + if err := engine.InitStorDB(d.Cfg); err != nil { t.Fatalf("Error at DataDB init:%v\n", err) } } diff --git a/ees/ee_test.go b/ees/ee_test.go index a6c791657..1dc4e0820 100644 --- a/ees/ee_test.go +++ b/ees/ee_test.go @@ -49,6 +49,9 @@ func TestNewEventExporter(t *testing.T) { t.Errorf("Expected %+v but got %+v", errExpect, err) } err = eeExpect.init() + if err != nil { + t.Error(err) + } newEE := ee.(*FileCSVee) newEE.dc[utils.TimeNow] = nil newEE.dc[utils.ExportPath] = nil @@ -74,11 +77,17 @@ func TestNewEventExporterCase2(t *testing.T) { "Local", utils.EmptyString, )) + if err != nil { + t.Error(err) + } eeExpect, err := NewFileFWVee(cgrCfg, 0, filterS, dc) if strings.Contains(errExpect, err.Error()) { t.Errorf("Expected %+v but got %+v", errExpect, err) } err = eeExpect.init() + if err != nil { + t.Error(err) + } newEE := ee.(*FileFWVee) newEE.dc[utils.TimeNow] = nil newEE.dc[utils.ExportPath] = nil diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go index b029ced34..aaf62b444 100644 --- a/ees/elastic_it_test.go +++ b/ees/elastic_it_test.go @@ -84,13 +84,13 @@ func testElasticLoadConfig(t *testing.T) { } func testElasticResetDataDB(t *testing.T) { - if err := engine.InitDataDb(elasticCfg); err != nil { + if err := engine.InitDataDB(elasticCfg); err != nil { t.Fatal(err) } } func testElasticResetStorDb(t *testing.T) { - if err := engine.InitStorDb(elasticCfg); err != nil { + if err := engine.InitStorDB(elasticCfg); err != nil { t.Fatal(err) } } diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go index af79d34e4..27168008a 100644 --- a/ees/filecsv_it_test.go +++ b/ees/filecsv_it_test.go @@ -79,13 +79,13 @@ func testCsvLoadConfig(t *testing.T) { } func testCsvResetDataDB(t *testing.T) { - if err := engine.InitDataDb(csvCfg); err != nil { + if err := engine.InitDataDB(csvCfg); err != nil { t.Fatal(err) } } func testCsvResetStorDb(t *testing.T) { - if err := engine.InitStorDb(csvCfg); err != nil { + if err := engine.InitStorDB(csvCfg); err != nil { t.Fatal(err) } } diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go index eed8e37a0..a718899f3 100644 --- a/ees/filefwv_it_test.go +++ b/ees/filefwv_it_test.go @@ -70,13 +70,13 @@ func testFwvLoadConfig(t *testing.T) { } func testFwvResetDataDB(t *testing.T) { - if err := engine.InitDataDb(fwvCfg); err != nil { + if err := engine.InitDataDB(fwvCfg); err != nil { t.Fatal(err) } } func testFwvResetStorDb(t *testing.T) { - if err := engine.InitStorDb(fwvCfg); err != nil { + if err := engine.InitStorDB(fwvCfg); err != nil { t.Fatal(err) } } diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go index 3e617a017..6fbfb413f 100644 --- a/ees/httppost_it_test.go +++ b/ees/httppost_it_test.go @@ -72,13 +72,13 @@ func testHTTPPostLoadConfig(t *testing.T) { } func testHTTPPostResetDataDB(t *testing.T) { - if err := engine.InitDataDb(httpPostCfg); err != nil { + if err := engine.InitDataDB(httpPostCfg); err != nil { t.Fatal(err) } } func testHTTPPostResetStorDb(t *testing.T) { - if err := engine.InitStorDb(httpPostCfg); err != nil { + if err := engine.InitStorDB(httpPostCfg); err != nil { t.Fatal(err) } } diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go index 8f6fcf6f9..763ecf032 100644 --- a/ees/posterjsonmap_it_test.go +++ b/ees/posterjsonmap_it_test.go @@ -72,13 +72,13 @@ func testHTTPJsonMapLoadConfig(t *testing.T) { } func testHTTPJsonMapResetDataDB(t *testing.T) { - if err := engine.InitDataDb(httpJSONMapCfg); err != nil { + if err := engine.InitDataDB(httpJSONMapCfg); err != nil { t.Fatal(err) } } func testHTTPJsonMapResetStorDb(t *testing.T) { - if err := engine.InitStorDb(httpJSONMapCfg); err != nil { + if err := engine.InitStorDB(httpJSONMapCfg); err != nil { t.Fatal(err) } } diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go index 247af3032..6df4414df 100644 --- a/ees/sql_it_test.go +++ b/ees/sql_it_test.go @@ -122,7 +122,7 @@ func testSqlEeLoadConfig(t *testing.T) { } func testSqlEeResetDataDB(t *testing.T) { - if err := engine.InitDataDb(sqlEeCfg); err != nil { + if err := engine.InitDataDB(sqlEeCfg); err != nil { t.Fatal(err) } } diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go index 9366e5c4c..7d70cb0b2 100644 --- a/ees/virtual_ee_it_test.go +++ b/ees/virtual_ee_it_test.go @@ -72,13 +72,13 @@ func testVirtLoadConfig(t *testing.T) { } func testVirtResetDataDB(t *testing.T) { - if err := engine.InitDataDb(virtCfg); err != nil { + if err := engine.InitDataDB(virtCfg); err != nil { t.Fatal(err) } } func testVirtResetStorDb(t *testing.T) { - if err := engine.InitStorDb(virtCfg); err != nil { + if err := engine.InitStorDB(virtCfg); err != nil { t.Fatal(err) } } diff --git a/engine/lib_test.go b/engine/lib_test.go deleted file mode 100644 index 30dbcdfd9..000000000 --- a/engine/lib_test.go +++ /dev/null @@ -1,47 +0,0 @@ -/* -Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments -Copyright (C) ITsysCOM GmbH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see -*/ - -package engine - -import ( - "errors" - "flag" - "net/rpc" - "net/rpc/jsonrpc" - - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/utils" -) - -var ( - dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here") - waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache") - encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication") - dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)") -) - -func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) { - switch *encoding { - case utils.MetaJSON: - return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen) - case utils.MetaGOB: - return rpc.Dial(utils.TCP, cfg.RPCGOBListen) - default: - return nil, errors.New("UNSUPPORTED_RPC") - } -} diff --git a/engine/libtest.go b/engine/libtest.go index f9efe68ea..2f38ad90f 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -167,7 +167,7 @@ cgrates.org,1001,,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,, ` ) -func InitDataDb(cfg *config.CGRConfig) error { +func InitDataDB(cfg *config.CGRConfig) error { d, err := NewDataDBConn(cfg.DataDbCfg().Type, cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, cfg.DataDbCfg().Name, cfg.DataDbCfg().User, @@ -188,8 +188,8 @@ func InitDataDb(cfg *config.CGRConfig) error { return nil } -func InitStorDb(cfg *config.CGRConfig) error { - storDb, err := NewStorDBConn(cfg.StorDbCfg().Type, +func InitStorDB(cfg *config.CGRConfig) error { + storDB, err := NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, @@ -198,13 +198,13 @@ func InitStorDb(cfg *config.CGRConfig) error { if err != nil { return err } - if err := storDb.Flush(path.Join(cfg.DataFolderPath, "storage", + if err := storDB.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDbCfg().Type)); err != nil { return err } if utils.IsSliceMember([]string{utils.Mongo, utils.MySQL, utils.Postgres}, cfg.StorDbCfg().Type) { - if err := SetDBVersions(storDb); err != nil { + if err := SetDBVersions(storDB); err != nil { return err } } @@ -278,7 +278,7 @@ func StopStartEngine(cfgPath string, waitEngine int) (*exec.Cmd, error) { return StartEngine(cfgPath, waitEngine) } -func LoadTariffPlanFromFolder(tpPath, timezone string, dm *DataManager, disable_reverse bool, +func LoadTariffPlanFromFolder(tpPath, timezone string, dm *DataManager, disableReverse bool, cacheConns, schedConns []string) error { loader, err := NewTpReader(dm.dataDB, NewFileCSVStorage(utils.CSVSep, tpPath), "", timezone, cacheConns, schedConns, false) @@ -288,14 +288,14 @@ func LoadTariffPlanFromFolder(tpPath, timezone string, dm *DataManager, disable_ if err := loader.LoadAll(); err != nil { return utils.NewErrServerError(err) } - if err := loader.WriteToDatabase(false, disable_reverse); err != nil { + if err := loader.WriteToDatabase(false, disableReverse); err != nil { return utils.NewErrServerError(err) } return nil } type PjsuaAccount struct { - Id, Username, Password, Realm, Registrar string + ID, Username, Password, Realm, Registrar string } // Returns file reference where we can write to control pjsua in terminal @@ -305,7 +305,7 @@ func StartPjsuaListener(acnts []*PjsuaAccount, localPort, waitDur time.Duration) if idx != 0 { cmdArgs = append(cmdArgs, "--next-account") } - cmdArgs = append(cmdArgs, "--id="+acnt.Id, "--registrar="+acnt.Registrar, "--username="+acnt.Username, "--password="+acnt.Password, "--realm="+acnt.Realm) + cmdArgs = append(cmdArgs, "--id="+acnt.ID, "--registrar="+acnt.Registrar, "--username="+acnt.Username, "--password="+acnt.Password, "--realm="+acnt.Realm) } pjsuaPath, err := exec.LookPath("pjsua") if err != nil { @@ -322,9 +322,9 @@ func StartPjsuaListener(acnts []*PjsuaAccount, localPort, waitDur time.Duration) return fPty, nil } -func PjsuaCallUri(acnt *PjsuaAccount, dstUri, outboundUri string, callDur time.Duration, localPort int) error { +func PjsuaCallURI(acnt *PjsuaAccount, dstURI, outboundURI string, callDur time.Duration, localPort int) error { cmdArgs := []string{"--null-audio", "--app-log-level=0", fmt.Sprintf("--local-port=%d", localPort), fmt.Sprintf("--duration=%d", int(callDur.Seconds())), - "--outbound=" + outboundUri, "--id=" + acnt.Id, "--username=" + acnt.Username, "--password=" + acnt.Password, "--realm=" + acnt.Realm, dstUri} + "--outbound=" + outboundURI, "--id=" + acnt.ID, "--username=" + acnt.Username, "--password=" + acnt.Password, "--realm=" + acnt.Realm, dstURI} pjsuaPath, err := exec.LookPath("pjsua") if err != nil { diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 0d7dbda41..c848a58d2 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -480,12 +480,12 @@ func (tps StatMdls) CSVHeader() (result []string) { utils.Stored, utils.Blocker, utils.Weight, utils.ThresholdIDs} } -func (models StatMdls) AsTPStats() (result []*utils.TPStatProfile) { +func (tps StatMdls) AsTPStats() (result []*utils.TPStatProfile) { filterMap := make(map[string]utils.StringSet) thresholdMap := make(map[string]utils.StringSet) statMetricsMap := make(map[string]map[string]*utils.MetricWithFilters) mst := make(map[string]*utils.TPStatProfile) - for _, model := range models { + for _, model := range tps { key := &utils.TenantID{Tenant: model.Tenant, ID: model.ID} st, found := mst[key.TenantID()] if !found { @@ -2410,11 +2410,11 @@ func (apm ActionProfileMdls) CSVHeader() (result []string) { } } -func (tps ActionProfileMdls) AsTPActionProfile() (result []*utils.TPActionProfile) { +func (apm ActionProfileMdls) AsTPActionProfile() (result []*utils.TPActionProfile) { filterIDsMap := make(map[string]utils.StringSet) targetIDsMap := make(map[string]map[string]utils.StringSet) actPrfMap := make(map[string]*utils.TPActionProfile) - for _, tp := range tps { + for _, tp := range apm { tenID := (&utils.TenantID{Tenant: tp.Tenant, ID: tp.ID}).TenantID() aPrf, found := actPrfMap[tenID] if !found { @@ -2664,11 +2664,11 @@ func (apm AccountProfileMdls) CSVHeader() (result []string) { } } -func (tps AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountProfile, err error) { +func (apm AccountProfileMdls) AsTPAccountProfile() (result []*utils.TPAccountProfile, err error) { filterIDsMap := make(map[string]utils.StringSet) thresholdIDsMap := make(map[string]utils.StringSet) actPrfMap := make(map[string]*utils.TPAccountProfile) - for _, tp := range tps { + for _, tp := range apm { tenID := (&utils.TenantID{Tenant: tp.Tenant, ID: tp.ID}).TenantID() aPrf, found := actPrfMap[tenID] if !found { diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go index 7ac9265c5..972d28879 100644 --- a/engine/model_helpers_test.go +++ b/engine/model_helpers_test.go @@ -256,7 +256,6 @@ func TestMapTPTimings(t *testing.T) { func TestAPItoModelTimings(t *testing.T) { ts := []*utils.ApierTPTiming{} - eOut := TimingMdls{} if rcv := APItoModelTimings(ts); rcv != nil { t.Errorf("Expecting: nil, received: %+v", utils.ToJSON(rcv)) } @@ -268,7 +267,7 @@ func TestAPItoModelTimings(t *testing.T) { Months: "1;2;3;4", }, } - eOut = TimingMdls{ + eOut := TimingMdls{ TimingMdl{ Tpid: "TPid1", Months: "1;2;3;4", @@ -3398,7 +3397,7 @@ func TestAsTPRateProfile(t *testing.T) { func TestModelHelperCsvLoadError(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag string `index:"cat" re:"\w+\s*,\s*"` Prefix string `index:"1" re:"\+?\d+.?\d*"` @@ -3413,7 +3412,7 @@ func TestModelHelperCsvLoadError(t *testing.T) { func TestModelHelperCsvLoadError2(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag string `index:"0" re:"cat"` Prefix string `index:"1" re:"\+?\d+.?\d*"` @@ -3429,7 +3428,7 @@ func TestModelHelperCsvLoadError2(t *testing.T) { func TestModelHelpersCsvDumpError(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag string `index:"cat" re:"\w+\s*,\s*"` Prefix string `index:"1" re:"\+?\d+.?\d*"` @@ -3444,11 +3443,9 @@ func TestModelHelpersCsvDumpError(t *testing.T) { func TestAPItoModelTPRoutesCase1(t *testing.T) { structTest := &utils.TPRouteProfile{} - structTest2 := RouteMdls{} - structTest2 = nil result := APItoModelTPRoutes(structTest) - if !reflect.DeepEqual(structTest2, result) { - t.Errorf("Expecting: <%+v>,\n Received: <%+v>", structTest2, result) + if result != nil { + t.Errorf("Expecting: <%+v>,\n Received: <%+v>", nil, result) } } @@ -3887,8 +3884,7 @@ func TestAPItoDispatcherProfileError(t *testing.T) { } func TestAPItoModelTPDispatcherProfileNil(t *testing.T) { - structTest := &utils.TPDispatcherProfile{} - structTest = nil + var structTest *utils.TPDispatcherProfile = nil expected := "null" result := APItoModelTPDispatcherProfile(structTest) if !reflect.DeepEqual(utils.ToJSON(result), expected) { @@ -4282,8 +4278,7 @@ func TestActionProfileMdlsAsTPActionProfile(t *testing.T) { func TestAPItoModelTPActionProfileTPActionProfileNil(t *testing.T) { testStruct := &utils.TPActionProfile{} - expStruct := ActionProfileMdls{} - expStruct = nil + var expStruct ActionProfileMdls = nil result := APItoModelTPActionProfile(testStruct) if !reflect.DeepEqual(result, expStruct) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(expStruct), utils.ToJSON(result)) @@ -4643,8 +4638,7 @@ func TestAPItoAttributeProfileError3(t *testing.T) { func TestAPItoModelTPAttributeNoAttributes(t *testing.T) { testStruct := &utils.TPAttributeProfile{} - expStruct := AttributeMdls{} - expStruct = nil + var expStruct AttributeMdls = nil result := APItoModelTPAttribute(testStruct) if !reflect.DeepEqual(result, expStruct) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(expStruct), utils.ToJSON(result)) @@ -5265,7 +5259,7 @@ func TestTpResourcesAsTpResources2(t *testing.T) { func TestModelHelpersCSVLoadErrorInt(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag int `index:"0" re:"\w+\s*,\s*"` CreatedAt time.Time @@ -5279,7 +5273,7 @@ func TestModelHelpersCSVLoadErrorInt(t *testing.T) { func TestModelHelpersCSVLoadErrorFloat64(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag float64 `index:"0" re:"\w+\s*,\s*"` CreatedAt time.Time @@ -5293,7 +5287,7 @@ func TestModelHelpersCSVLoadErrorFloat64(t *testing.T) { func TestModelHelpersCSVLoadErrorBool(t *testing.T) { type testStruct struct { - Id int64 + ID int64 Tpid string Tag bool `index:"0" re:"\w+\s*,\s*"` CreatedAt time.Time @@ -5518,8 +5512,7 @@ func TestAPItoModelTPAccountProfileNoBalance(t *testing.T) { Weights: "10.0", ThresholdIDs: []string{"WARN_RES1"}, } - exp := AccountProfileMdls{} - exp = nil + var exp AccountProfileMdls = nil result := APItoModelTPAccountProfile(testStruct) if !reflect.DeepEqual(exp, result) { t.Errorf("Expecting: %+v,\nreceived: %+v", utils.ToJSON(exp), utils.ToJSON(result)) diff --git a/engine/models.go b/engine/models.go index 4f54dc731..1c4ae08db 100644 --- a/engine/models.go +++ b/engine/models.go @@ -28,7 +28,7 @@ import ( // to be used by gorm orm type TimingMdl struct { - Id int64 + ID int64 Tpid string Tag string `index:"0" re:"\w+\s*,\s*"` Years string `index:"1" re:"\*any\s*,\s*|(?:\d{1,4};?)+\s*,\s*|\s*,\s*"` @@ -44,7 +44,7 @@ func (TimingMdl) TableName() string { } type DestinationMdl struct { - Id int64 + ID int64 Tpid string Tag string `index:"0" re:"\w+\s*,\s*"` Prefix string `index:"1" re:"\+?\d+.?\d*"` diff --git a/engine/routes.go b/engine/routes.go index 2704f29c2..97e2b7ee8 100644 --- a/engine/routes.go +++ b/engine/routes.go @@ -246,7 +246,6 @@ func (rpS *RouteService) costForEvent(ev *utils.CGREvent, // update the setup time and the usage sTime = sTime.Add(accountMaxUsage) initialUsage = usage - usage = usage - accountMaxUsage } for k, v := range acntCost { // update the costData with the infos from AccountS costData[k] = v diff --git a/engine/storage_csv.go b/engine/storage_csv.go index 2511956be..8d8acfbe2 100644 --- a/engine/storage_csv.go +++ b/engine/storage_csv.go @@ -183,7 +183,6 @@ func NewGoogleCSVStorage(sep rune, spreadsheetID string) (*CSVStorage, error) { func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { var destinationsPaths []string var timingsPaths []string - var ratesPaths []string var resourcesPaths []string var statsPaths []string var thresholdsPaths []string @@ -201,7 +200,6 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { if !strings.HasSuffix(baseURL, utils.CSVSuffix) { destinationsPaths = append(destinationsPaths, joinURL(baseURL, utils.DestinationsCsv)) timingsPaths = append(timingsPaths, joinURL(baseURL, utils.TimingsCsv)) - ratesPaths = append(ratesPaths, joinURL(baseURL, utils.RatesCsv)) resourcesPaths = append(resourcesPaths, joinURL(baseURL, utils.ResourcesCsv)) statsPaths = append(statsPaths, joinURL(baseURL, utils.StatsCsv)) thresholdsPaths = append(thresholdsPaths, joinURL(baseURL, utils.ThresholdsCsv)) @@ -221,8 +219,6 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { destinationsPaths = append(destinationsPaths, baseURL) case strings.HasSuffix(baseURL, utils.TimingsCsv): timingsPaths = append(timingsPaths, baseURL) - case strings.HasSuffix(baseURL, utils.RatesCsv): - ratesPaths = append(ratesPaths, baseURL) case strings.HasSuffix(baseURL, utils.ResourcesCsv): resourcesPaths = append(resourcesPaths, baseURL) case strings.HasSuffix(baseURL, utils.StatsCsv): diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index ce7c31198..ddb36df52 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -32,7 +32,6 @@ import ( // InternalDB is used as a DataDB and a StorDB type InternalDB struct { - mu sync.RWMutex stringIndexedFields []string prefixIndexedFields []string indexedFieldsMutex sync.RWMutex // used for reload diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index d83c9a156..ac88db3e2 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -503,7 +503,7 @@ func (ms *MongoStorage) getField(sctx mongo.SessionContext, col, prefix, subject } func (ms *MongoStorage) getField2(sctx mongo.SessionContext, col, prefix, subject string, tntID *utils.TenantID) (result []string, err error) { - idResult := struct{ Tenant, Id string }{} + idResult := struct{ Tenant, ID string }{} elem := bson.M{} if tntID.Tenant != "" { elem["tenant"] = tntID.Tenant @@ -522,7 +522,7 @@ func (ms *MongoStorage) getField2(sctx mongo.SessionContext, col, prefix, subjec if err != nil { return } - result = append(result, prefix+utils.ConcatenatedKey(idResult.Tenant, idResult.Id)) + result = append(result, prefix+utils.ConcatenatedKey(idResult.Tenant, idResult.ID)) } return result, iter.Close(sctx) } @@ -1548,6 +1548,9 @@ func (ms *MongoStorage) SetIndexesDrv(idxItmType, tntCtx string, if err = ms.query(func(sctx mongo.SessionContext) (err error) { var result []string result, err = ms.getField3(sctx, ColIndx, regexKey, "key") + if err != nil { + return + } for _, key := range result { idxKey := strings.TrimPrefix(key, dbKey) if _, err = ms.getCol(ColIndx).DeleteOne(sctx, diff --git a/engine/storage_mysql.go b/engine/storage_mysql.go index 0db0c3e27..4d9737042 100644 --- a/engine/storage_mysql.go +++ b/engine/storage_mysql.go @@ -41,19 +41,19 @@ func NewMySQLStorage(host, port, name, user, password string, } mySQLStorage := new(MySQLStorage) - if mySQLStorage.Db, err = db.DB(); err != nil { + if mySQLStorage.DB, err = db.DB(); err != nil { return nil, err } - if mySQLStorage.Db.Ping(); err != nil { + if mySQLStorage.DB.Ping(); err != nil { return nil, err } - mySQLStorage.Db.SetMaxIdleConns(maxIdleConn) - mySQLStorage.Db.SetMaxOpenConns(maxConn) - mySQLStorage.Db.SetConnMaxLifetime(time.Duration(connMaxLifetime) * time.Second) + mySQLStorage.DB.SetMaxIdleConns(maxIdleConn) + mySQLStorage.DB.SetMaxOpenConns(maxConn) + mySQLStorage.DB.SetConnMaxLifetime(time.Duration(connMaxLifetime) * time.Second) //db.LogMode(true) mySQLStorage.db = db return &SQLStorage{ - Db: mySQLStorage.Db, + DB: mySQLStorage.DB, db: mySQLStorage.db, StorDB: mySQLStorage, SQLImpl: mySQLStorage, diff --git a/engine/storage_postgres.go b/engine/storage_postgres.go index 97714e78c..651c5d0d4 100644 --- a/engine/storage_postgres.go +++ b/engine/storage_postgres.go @@ -35,19 +35,19 @@ func NewPostgresStorage(host, port, name, user, password, sslmode string, maxCon return nil, err } postgressStorage := new(PostgresStorage) - if postgressStorage.Db, err = db.DB(); err != nil { + if postgressStorage.DB, err = db.DB(); err != nil { return nil, err } - if err = postgressStorage.Db.Ping(); err != nil { + if err = postgressStorage.DB.Ping(); err != nil { return nil, err } - postgressStorage.Db.SetMaxIdleConns(maxIdleConn) - postgressStorage.Db.SetMaxOpenConns(maxConn) - postgressStorage.Db.SetConnMaxLifetime(time.Duration(connMaxLifetime) * time.Second) + postgressStorage.DB.SetMaxIdleConns(maxIdleConn) + postgressStorage.DB.SetMaxOpenConns(maxConn) + postgressStorage.DB.SetConnMaxLifetime(time.Duration(connMaxLifetime) * time.Second) //db.LogMode(true) postgressStorage.db = db return &SQLStorage{ - Db: postgressStorage.Db, + DB: postgressStorage.DB, db: postgressStorage.db, StorDB: postgressStorage, SQLImpl: postgressStorage, diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 52959869c..7d1998fbb 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -42,29 +42,29 @@ type RedisStorage struct { // Redis commands const ( - redis_AUTH = "AUTH" - redis_SELECT = "SELECT" - redis_FLUSHDB = "FLUSHDB" - redis_DEL = "DEL" - redis_HGETALL = "HGETALL" - redis_KEYS = "KEYS" - redis_SADD = "SADD" - redis_SMEMBERS = "SMEMBERS" - redis_SREM = "SREM" - redis_EXISTS = "EXISTS" - redis_GET = "GET" - redis_SET = "SET" - redis_LRANGE = "LRANGE" - redis_LLEN = "LLEN" - redis_RPOP = "RPOP" - redis_LPUSH = "LPUSH" - redis_RPUSH = "RPUSH" - redis_LPOP = "LPOP" - redis_HMGET = "HMGET" - redis_HDEL = "HDEL" - redis_HGET = "HGET" - redis_RENAME = "RENAME" - redis_HMSET = "HMSET" + redisAUTH = "AUTH" + redisSELECT = "SELECT" + redisFLUSHDB = "FLUSHDB" + redisDEL = "DEL" + redisHGETALL = "HGETALL" + redisKEYS = "KEYS" + redisSADD = "SADD" + redisSMEMBERS = "SMEMBERS" + redisSREM = "SREM" + redisEXISTS = "EXISTS" + redisGET = "GET" + redisSET = "SET" + redisLRANGE = "LRANGE" + redisLLEN = "LLEN" + redisRPOP = "RPOP" + redisLPUSH = "LPUSH" + redisRPUSH = "RPUSH" + redisLPOP = "LPOP" + redisHMGET = "HMGET" + redisHDEL = "HDEL" + redisHGET = "HGET" + redisRENAME = "RENAME" + redisHMSET = "HMSET" ) func NewRedisStorage(address string, db int, user, pass, mrshlerStr string, @@ -175,7 +175,7 @@ func (rs *RedisStorage) Close() { } func (rs *RedisStorage) Flush(ignore string) error { - return rs.Cmd(nil, redis_FLUSHDB) + return rs.Cmd(nil, redisFLUSHDB) } func (rs *RedisStorage) Marshaler() Marshaler { @@ -183,7 +183,7 @@ func (rs *RedisStorage) Marshaler() Marshaler { } func (rs *RedisStorage) SelectDatabase(dbName string) (err error) { - return rs.Cmd(nil, redis_SELECT, dbName) + return rs.Cmd(nil, redisSELECT, dbName) } func (rs *RedisStorage) IsDBEmpty() (resp bool, err error) { @@ -204,7 +204,7 @@ func (rs *RedisStorage) RemoveKeysForPrefix(prefix string) (err error) { return } for _, key := range keys { - if err = rs.Cmd(nil, redis_DEL, key); err != nil { + if err = rs.Cmd(nil, redisDEL, key); err != nil { return } } @@ -214,7 +214,7 @@ func (rs *RedisStorage) RemoveKeysForPrefix(prefix string) (err error) { func (rs *RedisStorage) getKeysForFilterIndexesKeys(fkeys []string) (keys []string, err error) { for _, itemIDPrefix := range fkeys { mp := make(map[string]string) - if err = rs.Cmd(&mp, redis_HGETALL, itemIDPrefix); err != nil { + if err = rs.Cmd(&mp, redisHGETALL, itemIDPrefix); err != nil { return } else if len(mp) == 0 { return nil, utils.ErrNotFound @@ -227,7 +227,7 @@ func (rs *RedisStorage) getKeysForFilterIndexesKeys(fkeys []string) (keys []stri } func (rs *RedisStorage) GetKeysForPrefix(prefix string) (keys []string, err error) { - err = rs.Cmd(&keys, redis_KEYS, prefix+"*") + err = rs.Cmd(&keys, redisKEYS, prefix+"*") if err != nil { return } @@ -245,14 +245,14 @@ func (rs *RedisStorage) HasDataDrv(category, subject, tenant string) (exists boo var i int switch category { case utils.DestinationPrefix: - err = rs.Cmd(&i, redis_EXISTS, category+subject) + err = rs.Cmd(&i, redisEXISTS, category+subject) return i == 1, err case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, utils.StatQueueProfilePrefix, utils.ThresholdPrefix, utils.ThresholdProfilePrefix, utils.FilterPrefix, utils.RouteProfilePrefix, utils.AttributeProfilePrefix, utils.ChargerProfilePrefix, utils.DispatcherProfilePrefix, utils.DispatcherHostPrefix, utils.RateProfilePrefix: - err := rs.Cmd(&i, redis_EXISTS, category+utils.ConcatenatedKey(tenant, subject)) + err := rs.Cmd(&i, redisEXISTS, category+utils.ConcatenatedKey(tenant, subject)) return i == 1, err } return false, errors.New("unsupported HasData category") @@ -261,7 +261,7 @@ func (rs *RedisStorage) HasDataDrv(category, subject, tenant string) (exists boo // GetDestination retrieves a destination with id from tp_db func (rs *RedisStorage) GetDestinationDrv(key, transactionID string) (dest *Destination, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.DestinationPrefix+key); err != nil { + if err = rs.Cmd(&values, redisGET, utils.DestinationPrefix+key); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -290,12 +290,12 @@ func (rs *RedisStorage) SetDestinationDrv(dest *Destination, transactionID strin w := zlib.NewWriter(&b) w.Write(result) w.Close() - err = rs.Cmd(nil, redis_SET, utils.DestinationPrefix+dest.ID, b.String()) + err = rs.Cmd(nil, redisSET, utils.DestinationPrefix+dest.ID, b.String()) return } func (rs *RedisStorage) GetReverseDestinationDrv(key, transactionID string) (ids []string, err error) { - if err = rs.Cmd(&ids, redis_SMEMBERS, utils.ReverseDestinationPrefix+key); err != nil { + if err = rs.Cmd(&ids, redisSMEMBERS, utils.ReverseDestinationPrefix+key); err != nil { return } if len(ids) == 0 { @@ -306,7 +306,7 @@ func (rs *RedisStorage) GetReverseDestinationDrv(key, transactionID string) (ids func (rs *RedisStorage) SetReverseDestinationDrv(destID string, prefixes []string, transactionID string) (err error) { for _, p := range prefixes { - if err = rs.Cmd(nil, redis_SADD, utils.ReverseDestinationPrefix+p, destID); err != nil { + if err = rs.Cmd(nil, redisSADD, utils.ReverseDestinationPrefix+p, destID); err != nil { return } } @@ -314,11 +314,11 @@ func (rs *RedisStorage) SetReverseDestinationDrv(destID string, prefixes []strin } func (rs *RedisStorage) RemoveDestinationDrv(destID, transactionID string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.DestinationPrefix+destID) + return rs.Cmd(nil, redisDEL, utils.DestinationPrefix+destID) } func (rs *RedisStorage) RemoveReverseDestinationDrv(dstID, prfx, transactionID string) (err error) { - return rs.Cmd(nil, redis_SREM, utils.ReverseDestinationPrefix+prfx, dstID) + return rs.Cmd(nil, redisSREM, utils.ReverseDestinationPrefix+prfx, dstID) } // Limit will only retrieve the last n items out of history, newest first @@ -345,7 +345,7 @@ func (rs *RedisStorage) GetLoadHistory(limit int, skipCache bool, } cCommit := cacheCommit(transactionID) var marshaleds [][]byte - if err = rs.Cmd(&marshaleds, redis_LRANGE, + if err = rs.Cmd(&marshaleds, redisLRANGE, utils.LoadInstKey, "0", strconv.Itoa(limit)); err != nil { if errCh := Cache.Set(utils.LoadInstKey, "", nil, nil, cCommit, transactionID); errCh != nil { @@ -383,15 +383,15 @@ func (rs *RedisStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize } _, err = guardian.Guardian.Guard(func() (interface{}, error) { // Make sure we do it locked since other instance can modify history while we read it var histLen int - if err := rs.Cmd(&histLen, redis_LLEN, utils.LoadInstKey); err != nil { + if err := rs.Cmd(&histLen, redisLLEN, utils.LoadInstKey); err != nil { return nil, err } if histLen >= loadHistSize { // Have hit maximum history allowed, remove oldest element in order to add new one - if err = rs.Cmd(nil, redis_RPOP, utils.LoadInstKey); err != nil { + if err = rs.Cmd(nil, redisRPOP, utils.LoadInstKey); err != nil { return nil, err } } - return nil, rs.Cmd(nil, redis_LPUSH, utils.LoadInstKey, string(marshaled)) + return nil, rs.Cmd(nil, redisLPUSH, utils.LoadInstKey, string(marshaled)) }, config.CgrConfig().GeneralCfg().LockingTimeout, utils.LoadInstKey) if errCh := Cache.Remove(utils.LoadInstKey, "", @@ -403,7 +403,7 @@ func (rs *RedisStorage) AddLoadHistory(ldInst *utils.LoadInstance, loadHistSize func (rs *RedisStorage) GetResourceProfileDrv(tenant, id string) (rsp *ResourceProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ResourceProfilesPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ResourceProfilesPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -418,16 +418,16 @@ func (rs *RedisStorage) SetResourceProfileDrv(rsp *ResourceProfile) (err error) if result, err = rs.ms.Marshal(rsp); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ResourceProfilesPrefix+rsp.TenantID(), string(result)) + return rs.Cmd(nil, redisSET, utils.ResourceProfilesPrefix+rsp.TenantID(), string(result)) } func (rs *RedisStorage) RemoveResourceProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ResourceProfilesPrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ResourceProfilesPrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetResourceDrv(tenant, id string) (r *Resource, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ResourcesPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ResourcesPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -442,16 +442,16 @@ func (rs *RedisStorage) SetResourceDrv(r *Resource) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ResourcesPrefix+r.TenantID(), string(result)) + return rs.Cmd(nil, redisSET, utils.ResourcesPrefix+r.TenantID(), string(result)) } func (rs *RedisStorage) RemoveResourceDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ResourcesPrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ResourcesPrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetTimingDrv(id string) (t *utils.TPTiming, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.TimingsPrefix+id); err != nil { + if err = rs.Cmd(&values, redisGET, utils.TimingsPrefix+id); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -466,18 +466,18 @@ func (rs *RedisStorage) SetTimingDrv(t *utils.TPTiming) (err error) { if result, err = rs.ms.Marshal(t); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.TimingsPrefix+t.ID, string(result)) + return rs.Cmd(nil, redisSET, utils.TimingsPrefix+t.ID, string(result)) } func (rs *RedisStorage) RemoveTimingDrv(id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.TimingsPrefix+id) + return rs.Cmd(nil, redisDEL, utils.TimingsPrefix+id) } func (rs *RedisStorage) GetVersions(itm string) (vrs Versions, err error) { if itm != "" { var fldVal int64 mn := radix.MaybeNil{Rcv: &fldVal} - if err = rs.Cmd(&mn, redis_HGET, utils.TBLVersions, itm); err != nil { + if err = rs.Cmd(&mn, redisHGET, utils.TBLVersions, itm); err != nil { return nil, err } else if mn.Nil { err = utils.ErrNotFound @@ -486,7 +486,7 @@ func (rs *RedisStorage) GetVersions(itm string) (vrs Versions, err error) { return Versions{itm: fldVal}, nil } var mp map[string]string - if err = rs.Cmd(&mp, redis_HGETALL, utils.TBLVersions); err != nil { + if err = rs.Cmd(&mp, redisHGETALL, utils.TBLVersions); err != nil { return nil, err } if len(mp) == 0 { @@ -504,25 +504,25 @@ func (rs *RedisStorage) SetVersions(vrs Versions, overwrite bool) (err error) { return } } - return rs.FlatCmd(nil, redis_HMSET, utils.TBLVersions, vrs) + return rs.FlatCmd(nil, redisHMSET, utils.TBLVersions, vrs) } func (rs *RedisStorage) RemoveVersions(vrs Versions) (err error) { if len(vrs) != 0 { for key := range vrs { - if err = rs.Cmd(nil, redis_HDEL, utils.TBLVersions, key); err != nil { + if err = rs.Cmd(nil, redisHDEL, utils.TBLVersions, key); err != nil { return } } return } - return rs.Cmd(nil, redis_DEL, utils.TBLVersions) + return rs.Cmd(nil, redisDEL, utils.TBLVersions) } // GetStatQueueProfileDrv retrieves a StatQueueProfile from dataDB func (rs *RedisStorage) GetStatQueueProfileDrv(tenant string, id string) (sq *StatQueueProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -538,18 +538,18 @@ func (rs *RedisStorage) SetStatQueueProfileDrv(sq *StatQueueProfile) (err error) if result, err = rs.ms.Marshal(sq); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(sq.Tenant, sq.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(sq.Tenant, sq.ID), string(result)) } // RemStatQueueProfileDrv removes a StatsQueue from dataDB func (rs *RedisStorage) RemStatQueueProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.StatQueueProfilePrefix+utils.ConcatenatedKey(tenant, id)) } // GetStatQueueDrv retrieves the stored metrics for a StatsQueue func (rs *RedisStorage) GetStatQueueDrv(tenant, id string) (sq *StatQueue, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.StatQueuePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.StatQueuePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -574,18 +574,18 @@ func (rs *RedisStorage) SetStatQueueDrv(ssq *StoredStatQueue, sq *StatQueue) (er if result, err = rs.ms.Marshal(ssq); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.StatQueuePrefix+ssq.SqID(), string(result)) + return rs.Cmd(nil, redisSET, utils.StatQueuePrefix+ssq.SqID(), string(result)) } // RemStatQueueDrv removes a StatsQueue func (rs *RedisStorage) RemStatQueueDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.StatQueuePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.StatQueuePrefix+utils.ConcatenatedKey(tenant, id)) } // GetThresholdProfileDrv retrieves a ThresholdProfile from dataDB func (rs *RedisStorage) GetThresholdProfileDrv(tenant, ID string) (tp *ThresholdProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ThresholdProfilePrefix+utils.ConcatenatedKey(tenant, ID)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ThresholdProfilePrefix+utils.ConcatenatedKey(tenant, ID)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -601,17 +601,17 @@ func (rs *RedisStorage) SetThresholdProfileDrv(tp *ThresholdProfile) (err error) if result, err = rs.ms.Marshal(tp); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ThresholdProfilePrefix+tp.TenantID(), string(result)) + return rs.Cmd(nil, redisSET, utils.ThresholdProfilePrefix+tp.TenantID(), string(result)) } // RemThresholdProfileDrv removes a ThresholdProfile from dataDB/cache func (rs *RedisStorage) RemThresholdProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ThresholdProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ThresholdProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetThresholdDrv(tenant, id string) (r *Threshold, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ThresholdPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ThresholdPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -626,16 +626,16 @@ func (rs *RedisStorage) SetThresholdDrv(r *Threshold) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ThresholdPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.ThresholdPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveThresholdDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ThresholdPrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ThresholdPrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetFilterDrv(tenant, id string) (r *Filter, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.FilterPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.FilterPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -650,16 +650,16 @@ func (rs *RedisStorage) SetFilterDrv(r *Filter) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.FilterPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.FilterPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveFilterDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.FilterPrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.FilterPrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetRouteProfileDrv(tenant, id string) (r *RouteProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.RouteProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.RouteProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -674,16 +674,16 @@ func (rs *RedisStorage) SetRouteProfileDrv(r *RouteProfile) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.RouteProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.RouteProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveRouteProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.RouteProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.RouteProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetAttributeProfileDrv(tenant, id string) (r *AttributeProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.AttributeProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.AttributeProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -698,16 +698,16 @@ func (rs *RedisStorage) SetAttributeProfileDrv(r *AttributeProfile) (err error) if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.AttributeProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.AttributeProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveAttributeProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.AttributeProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.AttributeProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetChargerProfileDrv(tenant, id string) (r *ChargerProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ChargerProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ChargerProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -722,16 +722,16 @@ func (rs *RedisStorage) SetChargerProfileDrv(r *ChargerProfile) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ChargerProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.ChargerProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveChargerProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ChargerProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ChargerProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetDispatcherProfileDrv(tenant, id string) (r *DispatcherProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -746,16 +746,16 @@ func (rs *RedisStorage) SetDispatcherProfileDrv(r *DispatcherProfile) (err error if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveDispatcherProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.DispatcherProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetDispatcherHostDrv(tenant, id string) (r *DispatcherHost, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.DispatcherHostPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.DispatcherHostPrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -770,11 +770,11 @@ func (rs *RedisStorage) SetDispatcherHostDrv(r *DispatcherHost) (err error) { if result, err = rs.ms.Marshal(r); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.DispatcherHostPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.DispatcherHostPrefix+utils.ConcatenatedKey(r.Tenant, r.ID), string(result)) } func (rs *RedisStorage) RemoveDispatcherHostDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.DispatcherHostPrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.DispatcherHostPrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetStorageType() string { @@ -785,7 +785,7 @@ func (rs *RedisStorage) GetItemLoadIDsDrv(itemIDPrefix string) (loadIDs map[stri if itemIDPrefix != "" { var fldVal int64 mn := radix.MaybeNil{Rcv: &fldVal} - if err = rs.Cmd(&mn, redis_HGET, utils.LoadIDs, itemIDPrefix); err != nil { + if err = rs.Cmd(&mn, redisHGET, utils.LoadIDs, itemIDPrefix); err != nil { return } else if mn.Nil { err = utils.ErrNotFound @@ -794,7 +794,7 @@ func (rs *RedisStorage) GetItemLoadIDsDrv(itemIDPrefix string) (loadIDs map[stri return map[string]int64{itemIDPrefix: fldVal}, nil } mpLoadIDs := make(map[string]string) - if err = rs.Cmd(&mpLoadIDs, redis_HGETALL, utils.LoadIDs); err != nil { + if err = rs.Cmd(&mpLoadIDs, redisHGETALL, utils.LoadIDs); err != nil { return } if len(mpLoadIDs) == 0 { @@ -810,16 +810,16 @@ func (rs *RedisStorage) GetItemLoadIDsDrv(itemIDPrefix string) (loadIDs map[stri } func (rs *RedisStorage) SetLoadIDsDrv(loadIDs map[string]int64) error { - return rs.FlatCmd(nil, redis_HMSET, utils.LoadIDs, loadIDs) + return rs.FlatCmd(nil, redisHMSET, utils.LoadIDs, loadIDs) } func (rs *RedisStorage) RemoveLoadIDsDrv() (err error) { - return rs.Cmd(nil, redis_DEL, utils.LoadIDs) + return rs.Cmd(nil, redisDEL, utils.LoadIDs) } func (rs *RedisStorage) GetRateProfileDrv(tenant, id string) (rpp *utils.RateProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.RateProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.RateProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -834,16 +834,16 @@ func (rs *RedisStorage) SetRateProfileDrv(rpp *utils.RateProfile) (err error) { if result, err = rs.ms.Marshal(rpp); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.RateProfilePrefix+utils.ConcatenatedKey(rpp.Tenant, rpp.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.RateProfilePrefix+utils.ConcatenatedKey(rpp.Tenant, rpp.ID), string(result)) } func (rs *RedisStorage) RemoveRateProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.RateProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.RateProfilePrefix+utils.ConcatenatedKey(tenant, id)) } func (rs *RedisStorage) GetActionProfileDrv(tenant, id string) (ap *ActionProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.ActionProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.ActionProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -858,11 +858,11 @@ func (rs *RedisStorage) SetActionProfileDrv(ap *ActionProfile) (err error) { if result, err = rs.ms.Marshal(ap); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.ActionProfilePrefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.ActionProfilePrefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) } func (rs *RedisStorage) RemoveActionProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.ActionProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.ActionProfilePrefix+utils.ConcatenatedKey(tenant, id)) } // GetIndexesDrv retrieves Indexes from dataDB @@ -870,14 +870,14 @@ func (rs *RedisStorage) GetIndexesDrv(idxItmType, tntCtx, idxKey string) (indexe mp := make(map[string]string) dbKey := utils.CacheInstanceToPrefix[idxItmType] + tntCtx if len(idxKey) == 0 { - if err = rs.Cmd(&mp, redis_HGETALL, dbKey); err != nil { + if err = rs.Cmd(&mp, redisHGETALL, dbKey); err != nil { return } else if len(mp) == 0 { return nil, utils.ErrNotFound } } else { var itmMpStrLst []string - if err = rs.Cmd(&itmMpStrLst, redis_HMGET, dbKey, idxKey); err != nil { + if err = rs.Cmd(&itmMpStrLst, redisHMGET, dbKey, idxKey); err != nil { return } else if itmMpStrLst[0] == utils.EmptyString { return nil, utils.ErrNotFound @@ -904,7 +904,7 @@ func (rs *RedisStorage) SetIndexesDrv(idxItmType, tntCtx string, dbKey = "tmp_" + utils.ConcatenatedKey(dbKey, transactionID) } if commit && transactionID != utils.EmptyString { - return rs.Cmd(nil, redis_RENAME, dbKey, originKey) + return rs.Cmd(nil, redisRENAME, dbKey, originKey) } mp := make(map[string]string) deleteArgs := []string{dbKey} // the dbkey is necesary for the HDEL command @@ -920,26 +920,26 @@ func (rs *RedisStorage) SetIndexesDrv(idxItmType, tntCtx string, mp[key] = string(encodedMp) } if len(deleteArgs) != 1 { - if err = rs.Cmd(nil, redis_HDEL, deleteArgs...); err != nil { + if err = rs.Cmd(nil, redisHDEL, deleteArgs...); err != nil { return } } if len(mp) != 0 { - return rs.FlatCmd(nil, redis_HMSET, dbKey, mp) + return rs.FlatCmd(nil, redisHMSET, dbKey, mp) } return } func (rs *RedisStorage) RemoveIndexesDrv(idxItmType, tntCtx, idxKey string) (err error) { if idxKey == utils.EmptyString { - return rs.Cmd(nil, redis_DEL, utils.CacheInstanceToPrefix[idxItmType]+tntCtx) + return rs.Cmd(nil, redisDEL, utils.CacheInstanceToPrefix[idxItmType]+tntCtx) } - return rs.Cmd(nil, redis_HDEL, utils.CacheInstanceToPrefix[idxItmType]+tntCtx, idxKey) + return rs.Cmd(nil, redisHDEL, utils.CacheInstanceToPrefix[idxItmType]+tntCtx, idxKey) } func (rs *RedisStorage) GetAccountProfileDrv(tenant, id string) (ap *utils.AccountProfile, err error) { var values []byte - if err = rs.Cmd(&values, redis_GET, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { + if err = rs.Cmd(&values, redisGET, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)); err != nil { return } else if len(values) == 0 { err = utils.ErrNotFound @@ -954,9 +954,9 @@ func (rs *RedisStorage) SetAccountProfileDrv(ap *utils.AccountProfile) (err erro if result, err = rs.ms.Marshal(ap); err != nil { return } - return rs.Cmd(nil, redis_SET, utils.AccountProfilePrefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) + return rs.Cmd(nil, redisSET, utils.AccountProfilePrefix+utils.ConcatenatedKey(ap.Tenant, ap.ID), string(result)) } func (rs *RedisStorage) RemoveAccountProfileDrv(tenant, id string) (err error) { - return rs.Cmd(nil, redis_DEL, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)) + return rs.Cmd(nil, redisDEL, utils.AccountProfilePrefix+utils.ConcatenatedKey(tenant, id)) } diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 5e81c3d4f..10a880ebe 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -39,14 +39,14 @@ type SQLImpl interface { } type SQLStorage struct { - Db *sql.DB + DB *sql.DB db *gorm.DB StorDB SQLImpl } func (sqls *SQLStorage) Close() { - sqls.Db.Close() + sqls.DB.Close() // sqls.db } @@ -60,13 +60,13 @@ func (sqls *SQLStorage) Flush(scriptsPath string) (err error) { return err } } - if _, err := sqls.Db.Query(fmt.Sprintf("SELECT 1 FROM %s", utils.CDRsTBL)); err != nil { + if _, err := sqls.DB.Query(fmt.Sprintf("SELECT 1 FROM %s", utils.CDRsTBL)); err != nil { return err } return nil } -func (rs *SQLStorage) SelectDatabase(dbName string) (err error) { +func (sqls *SQLStorage) SelectDatabase(dbName string) (err error) { return } @@ -89,7 +89,7 @@ func (sqls *SQLStorage) CreateTablesFromScript(scriptPath string) error { if len(qry) == 0 { continue } - if _, err := sqls.Db.Exec(qry); err != nil { + if _, err := sqls.DB.Exec(qry); err != nil { return err } } @@ -138,7 +138,7 @@ func (sqls *SQLStorage) GetTpIds(colName string) ([]string, error) { } qryStr = strings.TrimPrefix(qryStr, "UNION ") } - rows, err = sqls.Db.Query(qryStr) + rows, err = sqls.DB.Query(qryStr) if err != nil { return nil, err } @@ -186,7 +186,7 @@ func (sqls *SQLStorage) GetTpTableIds(tpid, table string, distinct []string, } } } - rows, err := sqls.Db.Query(qry) + rows, err := sqls.DB.Query(qry) if err != nil { return nil, err } diff --git a/engine/storage_utils.go b/engine/storage_utils.go index b0103455f..73af5a93d 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -54,13 +54,13 @@ func NewDataDBConn(dbType, host, port, name, user, if clusterOnDownDelay, err = utils.IfaceAsDuration(opts[utils.RedisClusterOnDownDelayCfg]); err != nil { return } - var hasTlsConn bool - if hasTlsConn, err = utils.IfaceAsBool(opts[utils.RedisTLS]); err != nil { + var hasTLSConn bool + if hasTLSConn, err = utils.IfaceAsBool(opts[utils.RedisTLS]); err != nil { return } d, err = NewRedisStorage(host, dbNo, user, pass, marshaler, utils.RedisMaxConns, utils.IfaceAsString(opts[utils.RedisSentinelNameCfg]), - isCluster, clusterSync, clusterOnDownDelay, hasTlsConn, + isCluster, clusterSync, clusterOnDownDelay, hasTLSConn, utils.IfaceAsString(opts[utils.RedisClientCertificate]), utils.IfaceAsString(opts[utils.RedisClientKey]), utils.IfaceAsString(opts[utils.RedisCACertificate])) diff --git a/engine/thresholds.go b/engine/thresholds.go index b8594d9e2..f6af417cc 100644 --- a/engine/thresholds.go +++ b/engine/thresholds.go @@ -322,13 +322,13 @@ func (attr *ThresholdsArgsProcessEvent) Clone() *ThresholdsArgsProcessEvent { // processEvent processes a new event, dispatching to matching thresholds func (tS *ThresholdService) processEvent(tnt string, args *ThresholdsArgsProcessEvent) (thresholdsIDs []string, err error) { - matchTs, err := tS.matchingThresholdsForEvent(tnt, args) + matchTS, err := tS.matchingThresholdsForEvent(tnt, args) if err != nil { return nil, err } var withErrors bool var tIDs []string - for _, t := range matchTs { + for _, t := range matchTS { tIDs = append(tIDs, t.ID) t.Hits++ err = t.ProcessEvent(args, tS.dm) diff --git a/engine/tpexporter.go b/engine/tpexporter.go index 7ecd9e75d..354bcd358 100644 --- a/engine/tpexporter.go +++ b/engine/tpexporter.go @@ -32,7 +32,7 @@ import ( "github.com/cgrates/cgrates/utils" ) -func NewTPExporter(storDb LoadStorage, tpID, expPath, fileFormat, sep string, compress bool) (*TPExporter, error) { +func NewTPExporter(storDB LoadStorage, tpID, expPath, fileFormat, sep string, compress bool) (*TPExporter, error) { if len(tpID) == 0 { return nil, errors.New("Missing TPid") } @@ -40,7 +40,7 @@ func NewTPExporter(storDb LoadStorage, tpID, expPath, fileFormat, sep string, co return nil, errors.New("Unsupported file format") } tpExp := &TPExporter{ - storDb: storDb, + storDB: storDB, tpID: tpID, exportPath: expPath, fileFormat: fileFormat, @@ -69,7 +69,7 @@ func NewTPExporter(storDb LoadStorage, tpID, expPath, fileFormat, sep string, co // Export TariffPlan to a folder type TPExporter struct { - storDb LoadStorage // StorDb connection handle + storDB LoadStorage // StorDb connection handle tpID string // Load data on this tpid exportPath string // Directory path to export to fileFormat string // The file format @@ -85,7 +85,7 @@ func (tpExp *TPExporter) Run() error { var withError bool toExportMap := make(map[string][]interface{}) - storDataTimings, err := tpExp.storDb.GetTPTimings(tpExp.tpID, "") + storDataTimings, err := tpExp.storDB.GetTPTimings(tpExp.tpID, "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpTiming)) withError = true @@ -96,7 +96,7 @@ func (tpExp *TPExporter) Run() error { toExportMap[utils.TimingsCsv][i] = sd } - storDataDestinations, err := tpExp.storDb.GetTPDestinations(tpExp.tpID, "") + storDataDestinations, err := tpExp.storDB.GetTPDestinations(tpExp.tpID, "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpDestinations)) withError = true @@ -108,7 +108,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataResources, err := tpExp.storDb.GetTPResources(tpExp.tpID, "", "") + storDataResources, err := tpExp.storDB.GetTPResources(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpResources)) withError = true @@ -120,7 +120,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataStats, err := tpExp.storDb.GetTPStats(tpExp.tpID, "", "") + storDataStats, err := tpExp.storDB.GetTPStats(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpStats)) withError = true @@ -132,7 +132,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataThresholds, err := tpExp.storDb.GetTPThresholds(tpExp.tpID, "", "") + storDataThresholds, err := tpExp.storDB.GetTPThresholds(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpThresholds)) withError = true @@ -144,7 +144,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataFilters, err := tpExp.storDb.GetTPFilters(tpExp.tpID, "", "") + storDataFilters, err := tpExp.storDB.GetTPFilters(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpFilters)) withError = true @@ -156,7 +156,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataRoutes, err := tpExp.storDb.GetTPRoutes(tpExp.tpID, "", "") + storDataRoutes, err := tpExp.storDB.GetTPRoutes(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpRoutes)) withError = true @@ -168,7 +168,7 @@ func (tpExp *TPExporter) Run() error { } } - storeDataAttributes, err := tpExp.storDb.GetTPAttributes(tpExp.tpID, "", "") + storeDataAttributes, err := tpExp.storDB.GetTPAttributes(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpAttributes)) withError = true @@ -180,7 +180,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataChargers, err := tpExp.storDb.GetTPChargers(tpExp.tpID, "", "") + storDataChargers, err := tpExp.storDB.GetTPChargers(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpChargers)) withError = true @@ -192,7 +192,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataDispatcherProfiles, err := tpExp.storDb.GetTPDispatcherProfiles(tpExp.tpID, "", "") + storDataDispatcherProfiles, err := tpExp.storDB.GetTPDispatcherProfiles(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpDispatcherProfiles)) withError = true @@ -204,7 +204,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataDispatcherHosts, err := tpExp.storDb.GetTPDispatcherHosts(tpExp.tpID, "", "") + storDataDispatcherHosts, err := tpExp.storDB.GetTPDispatcherHosts(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpDispatcherHosts)) withError = true @@ -213,7 +213,7 @@ func (tpExp *TPExporter) Run() error { toExportMap[utils.DispatcherHostsCsv] = append(toExportMap[utils.DispatcherHostsCsv], APItoModelTPDispatcherHost(sd)) } - storDataRateProfiles, err := tpExp.storDb.GetTPRateProfiles(tpExp.tpID, "", "") + storDataRateProfiles, err := tpExp.storDB.GetTPRateProfiles(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpRateProfiles)) withError = true @@ -225,7 +225,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataActionProfiles, err := tpExp.storDb.GetTPActionProfiles(tpExp.tpID, "", "") + storDataActionProfiles, err := tpExp.storDB.GetTPActionProfiles(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpActionProfiles)) withError = true @@ -237,7 +237,7 @@ func (tpExp *TPExporter) Run() error { } } - storDataAccountProfiles, err := tpExp.storDb.GetTPAccountProfiles(tpExp.tpID, "", "") + storDataAccountProfiles, err := tpExp.storDB.GetTPAccountProfiles(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.ApierS, err, utils.TpAccountProfiles)) withError = true diff --git a/engine/tpimporter_csv.go b/engine/tpimporter_csv.go index 2d770217e..703a26925 100644 --- a/engine/tpimporter_csv.go +++ b/engine/tpimporter_csv.go @@ -29,11 +29,11 @@ import ( // Import tariff plan from csv into storDb type TPCSVImporter struct { TPid string // Load data on this tpid - StorDb LoadWriter // StorDb connection handle + StorDB LoadWriter // StorDb connection handle DirPath string // Directory path to import from Sep rune // Separator in the csv file Verbose bool // If true will print a detailed information instead of silently discarding it - ImportId string // Use this to differentiate between imports (eg: when autogenerating fields like RatingProfileID + ImportID string // Use this to differentiate between imports (eg: when autogenerating fields like RatingProfileID csvr LoadReader } @@ -89,7 +89,7 @@ func (tpImp *TPCSVImporter) importTimings(fn string) error { tps[i].TPid = tpImp.TPid } - return tpImp.StorDb.SetTPTimings(tps) + return tpImp.StorDB.SetTPTimings(tps) } func (tpImp *TPCSVImporter) importDestinations(fn string) error { @@ -104,7 +104,7 @@ func (tpImp *TPCSVImporter) importDestinations(fn string) error { tps[i].TPid = tpImp.TPid } - return tpImp.StorDb.SetTPDestinations(tps) + return tpImp.StorDB.SetTPDestinations(tps) } func (tpImp *TPCSVImporter) importResources(fn string) error { @@ -115,7 +115,7 @@ func (tpImp *TPCSVImporter) importResources(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPResources(rls) + return tpImp.StorDB.SetTPResources(rls) } func (tpImp *TPCSVImporter) importStats(fn string) error { @@ -126,7 +126,7 @@ func (tpImp *TPCSVImporter) importStats(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPStats(sts) + return tpImp.StorDB.SetTPStats(sts) } func (tpImp *TPCSVImporter) importThresholds(fn string) error { @@ -137,7 +137,7 @@ func (tpImp *TPCSVImporter) importThresholds(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPThresholds(sts) + return tpImp.StorDB.SetTPThresholds(sts) } func (tpImp *TPCSVImporter) importFilters(fn string) error { @@ -148,7 +148,7 @@ func (tpImp *TPCSVImporter) importFilters(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPFilters(sts) + return tpImp.StorDB.SetTPFilters(sts) } func (tpImp *TPCSVImporter) importRoutes(fn string) error { @@ -159,7 +159,7 @@ func (tpImp *TPCSVImporter) importRoutes(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPRoutes(rls) + return tpImp.StorDB.SetTPRoutes(rls) } func (tpImp *TPCSVImporter) importAttributeProfiles(fn string) error { @@ -170,7 +170,7 @@ func (tpImp *TPCSVImporter) importAttributeProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPAttributes(rls) + return tpImp.StorDB.SetTPAttributes(rls) } func (tpImp *TPCSVImporter) importChargerProfiles(fn string) error { @@ -181,7 +181,7 @@ func (tpImp *TPCSVImporter) importChargerProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPChargers(rls) + return tpImp.StorDB.SetTPChargers(rls) } func (tpImp *TPCSVImporter) importDispatcherProfiles(fn string) error { @@ -192,7 +192,7 @@ func (tpImp *TPCSVImporter) importDispatcherProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPDispatcherProfiles(dpps) + return tpImp.StorDB.SetTPDispatcherProfiles(dpps) } func (tpImp *TPCSVImporter) importDispatcherHosts(fn string) error { @@ -203,7 +203,7 @@ func (tpImp *TPCSVImporter) importDispatcherHosts(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPDispatcherHosts(dpps) + return tpImp.StorDB.SetTPDispatcherHosts(dpps) } func (tpImp *TPCSVImporter) importRateProfiles(fn string) error { @@ -214,7 +214,7 @@ func (tpImp *TPCSVImporter) importRateProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPRateProfiles(rpps) + return tpImp.StorDB.SetTPRateProfiles(rpps) } func (tpImp *TPCSVImporter) importActionProfiles(fn string) error { @@ -225,7 +225,7 @@ func (tpImp *TPCSVImporter) importActionProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPActionProfiles(rpps) + return tpImp.StorDB.SetTPActionProfiles(rpps) } func (tpImp *TPCSVImporter) importAccountProfiles(fn string) error { @@ -236,5 +236,5 @@ func (tpImp *TPCSVImporter) importAccountProfiles(fn string) error { if err != nil { return err } - return tpImp.StorDb.SetTPAccountProfiles(rpps) + return tpImp.StorDB.SetTPAccountProfiles(rpps) } diff --git a/engine/version.go b/engine/version.go index bcef875f0..ded0dcda0 100644 --- a/engine/version.go +++ b/engine/version.go @@ -202,13 +202,13 @@ func CurrentStorDBVersions() Versions { // CurrentAllDBVersions returns the both DataDB and StorDB versions func CurrentAllDBVersions() Versions { - dataDbVersions := CurrentDataDBVersions() - storDbVersions := CurrentStorDBVersions() + dataDBVersions := CurrentDataDBVersions() + storDBVersions := CurrentStorDBVersions() allVersions := make(Versions) - for k, v := range dataDbVersions { + for k, v := range dataDBVersions { allVersions[k] = v } - for k, v := range storDbVersions { + for k, v := range storDBVersions { allVersions[k] = v } return allVersions diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index dcc573748..3e090daff 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -110,14 +110,14 @@ func testActionsInitCdrsStore(t *testing.T) { } func testActionsInitDataDb(t *testing.T) { - if err := InitDataDb(actsCfg); err != nil { + if err := InitDataDB(actsCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testActionsResetStorDb(t *testing.T) { - if err := InitStorDb(actsCfg); err != nil { + if err := InitStorDB(actsCfg); err != nil { t.Fatal(err) } } diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index 278a1eb14..5c3a630c5 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -94,10 +94,10 @@ func testActionsitInitCfg(t *testing.T) { } func testActionsitInitCdrDb(t *testing.T) { - if err := InitDataDb(actsLclCfg); err != nil { // need it for versions + if err := InitDataDB(actsLclCfg); err != nil { // need it for versions t.Fatal(err) } - if err := InitStorDb(actsLclCfg); err != nil { + if err := InitStorDB(actsLclCfg); err != nil { t.Fatal(err) } } diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index e9e36f048..f5a2aca21 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -491,11 +491,11 @@ func testLoaderITWriteToDatabase(t *testing.T) { func testLoaderITImportToStorDb(t *testing.T) { csvImporter := TPCSVImporter{ TPid: utils.TestSQL, - StorDb: storDb, + StorDB: storDb, DirPath: path.Join(*dataDir, "tariffplans", *tpCsvScenario), Sep: utils.CSVSep, Verbose: false, - ImportId: utils.TestSQL} + ImportID: utils.TestSQL} if err := csvImporter.Run(); err != nil { t.Error("Error when importing tpdata to storDb: ", err) } diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go index d4e582c72..27289183d 100644 --- a/engine/z_resources_test.go +++ b/engine/z_resources_test.go @@ -2607,8 +2607,6 @@ func TestResourceCaching(t *testing.T) { defaultCfg.ResourceSCfg().StoreInterval = 1 defaultCfg.ResourceSCfg().StringIndexedFields = nil defaultCfg.ResourceSCfg().PrefixIndexedFields = nil - resService := NewResourceService(dmRES, defaultCfg, - &FilterS{dm: dmRES, cfg: defaultCfg}, nil) if err != nil { t.Errorf("Error: %+v", err) } @@ -2758,7 +2756,7 @@ func TestResourceCaching(t *testing.T) { defaultCfg.ResourceSCfg().StoreInterval = 1 defaultCfg.ResourceSCfg().StringIndexedFields = nil defaultCfg.ResourceSCfg().PrefixIndexedFields = nil - resService = NewResourceService(dmRES, defaultCfg, + resService := NewResourceService(dmRES, defaultCfg, &FilterS{dm: dmRES, cfg: defaultCfg}, nil) if err != nil { t.Errorf("Error: %+v", err) diff --git a/engine/z_storage_cdrs_it_test.go b/engine/z_storage_cdrs_it_test.go index 53e3a43aa..3088500e2 100644 --- a/engine/z_storage_cdrs_it_test.go +++ b/engine/z_storage_cdrs_it_test.go @@ -64,7 +64,7 @@ func TestITCDRs(t *testing.T) { // helper function to populate CDRs and check if they were stored in storDb func testSetCDR(cfg *config.CGRConfig) error { - if err := InitStorDb(cfg); err != nil { + if err := InitStorDB(cfg); err != nil { return err } cdrStorage, err := NewStorDBConn(cfg.StorDbCfg().Type, @@ -170,7 +170,7 @@ func testSetCDR(cfg *config.CGRConfig) error { } func testSMCosts(cfg *config.CGRConfig) error { - if err := InitStorDb(cfg); err != nil { + if err := InitStorDB(cfg); err != nil { return fmt.Errorf("testSMCosts #1 err: %v", err) } cdrStorage, err := NewStorDBConn(cfg.StorDbCfg().Type, @@ -223,7 +223,7 @@ func testSMCosts(cfg *config.CGRConfig) error { } func testGetCDRs(cfg *config.CGRConfig) error { - if err := InitStorDb(cfg); err != nil { + if err := InitStorDB(cfg); err != nil { return fmt.Errorf("testGetCDRs #1: %v", err) } cfg.StorDbCfg().StringIndexedFields = []string{utils.CGRID, diff --git a/ers/ers_reload_it_test.go b/ers/ers_reload_it_test.go index 1b8a61ef7..b7f4c46a5 100644 --- a/ers/ers_reload_it_test.go +++ b/ers/ers_reload_it_test.go @@ -79,14 +79,14 @@ func testReloadITInitConfig(t *testing.T) { // InitDb so we can rely on count func testReloadITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(reloadCfg); err != nil { + if err := engine.InitStorDB(reloadCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testReloadITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(reloadCfg); err != nil { + if err := engine.InitDataDB(reloadCfg); err != nil { t.Fatal(err) } } diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go index 1f18d53aa..587779679 100644 --- a/ers/filecsv_it_test.go +++ b/ers/filecsv_it_test.go @@ -109,14 +109,14 @@ func testCsvITInitConfig(t *testing.T) { // InitDb so we can rely on count func testCsvITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(csvCfg); err != nil { + if err := engine.InitStorDB(csvCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testCsvITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(csvCfg); err != nil { + if err := engine.InitDataDB(csvCfg); err != nil { t.Fatal(err) } } diff --git a/ers/filefwv_it_test.go b/ers/filefwv_it_test.go index b68dfd6fd..a31948e88 100644 --- a/ers/filefwv_it_test.go +++ b/ers/filefwv_it_test.go @@ -84,14 +84,14 @@ func testFWVITInitConfig(t *testing.T) { // InitDb so we can rely on count func testFWVITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(fwvCfg); err != nil { + if err := engine.InitStorDB(fwvCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testFWVITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(fwvCfg); err != nil { + if err := engine.InitDataDB(fwvCfg); err != nil { t.Fatal(err) } } diff --git a/ers/filejson_it_test.go b/ers/filejson_it_test.go index 049918550..53963c047 100644 --- a/ers/filejson_it_test.go +++ b/ers/filejson_it_test.go @@ -99,14 +99,14 @@ func testJSONInitConfig(t *testing.T) { // InitDb so we can rely on count func testJSONInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(jsonCfg); err != nil { + if err := engine.InitStorDB(jsonCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testJSONResetDataDb(t *testing.T) { - if err := engine.InitDataDb(jsonCfg); err != nil { + if err := engine.InitDataDB(jsonCfg); err != nil { t.Fatal(err) } } diff --git a/ers/filexml_it_test.go b/ers/filexml_it_test.go index d4342033a..6752654a6 100644 --- a/ers/filexml_it_test.go +++ b/ers/filexml_it_test.go @@ -81,14 +81,14 @@ func testXMLITInitConfig(t *testing.T) { // InitDb so we can rely on count func testXMLITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(xmlCfg); err != nil { + if err := engine.InitStorDB(xmlCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testXMLITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(xmlCfg); err != nil { + if err := engine.InitDataDB(xmlCfg); err != nil { t.Fatal(err) } } diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go index 63b3d6720..f621e82f3 100644 --- a/ers/flatstore_it_test.go +++ b/ers/flatstore_it_test.go @@ -101,14 +101,14 @@ func testFlatstoreITInitConfig(t *testing.T) { // InitDb so we can rely on count func testFlatstoreITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(flatstoreCfg); err != nil { + if err := engine.InitStorDB(flatstoreCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testFlatstoreITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(flatstoreCfg); err != nil { + if err := engine.InitDataDB(flatstoreCfg); err != nil { t.Fatal(err) } } diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go index a22fb627e..f3b0db82e 100644 --- a/ers/partial_csv_it_test.go +++ b/ers/partial_csv_it_test.go @@ -99,14 +99,14 @@ func testPartITInitConfig(t *testing.T) { // InitDb so we can rely on count func testPartITInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(partCfg); err != nil { + if err := engine.InitStorDB(partCfg); err != nil { t.Fatal(err) } } // Remove data in both rating and accounting db func testPartITResetDataDb(t *testing.T) { - if err := engine.InitDataDb(partCfg); err != nil { + if err := engine.InitDataDB(partCfg); err != nil { t.Fatal(err) } } diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go index 4421d03b7..4aaeb1a86 100644 --- a/ers/sql_it_test.go +++ b/ers/sql_it_test.go @@ -118,7 +118,7 @@ func testSQLInitConfig(t *testing.T) { } func testSQLInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(sqlCfg); err != nil { + if err := engine.InitStorDB(sqlCfg); err != nil { t.Fatal(err) } } @@ -395,7 +395,7 @@ func testSQLInitConfig2(t *testing.T) { } func testSQLInitCdrDb2(t *testing.T) { - if err := engine.InitStorDb(sqlCfg); err != nil { + if err := engine.InitStorDB(sqlCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 939c14f0b..dc392001a 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -83,13 +83,13 @@ func testA1itLoadConfig(t *testing.T) { } func testA1itResetDataDB(t *testing.T) { - if err := engine.InitDataDb(a1Cfg); err != nil { + if err := engine.InitDataDB(a1Cfg); err != nil { t.Fatal(err) } } func testA1itResetStorDb(t *testing.T) { - if err := engine.InitStorDb(a1Cfg); err != nil { + if err := engine.InitStorDB(a1Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/accountactions_it_test.go b/general_tests/accountactions_it_test.go index 44ce228d2..36a2152a3 100644 --- a/general_tests/accountactions_it_test.go +++ b/general_tests/accountactions_it_test.go @@ -85,14 +85,14 @@ func testAccActionsInitCfg(t *testing.T) { } func testAccActionsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(accPrfCfg); err != nil { + if err := engine.InitDataDB(accPrfCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAccActionsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(accPrfCfg); err != nil { + if err := engine.InitStorDB(accPrfCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index 41e59c005..6f624a71b 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -90,13 +90,13 @@ func testV1AccLoadConfig(t *testing.T) { } func testV1AccInitDataDb(t *testing.T) { - if err := engine.InitDataDb(accCfg); err != nil { + if err := engine.InitDataDB(accCfg); err != nil { t.Fatal(err) } } func testAccResetStorDb(t *testing.T) { - if err := engine.InitStorDb(accCfg); err != nil { + if err := engine.InitStorDB(accCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 4a890413b..21e831be7 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -88,14 +88,14 @@ func testAttributeSInitCfg(t *testing.T) { } func testAttributeSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(attrCfg); err != nil { + if err := engine.InitDataDB(attrCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testAttributeSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(attrCfg); err != nil { + if err := engine.InitStorDB(attrCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index e77b6db72..4dbbff87f 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -88,13 +88,13 @@ func testbrodcastItLoadConfig(t *testing.T) { } func testbrodcastItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(brodcastInternalCfg); err != nil { + if err := engine.InitDataDB(brodcastInternalCfg); err != nil { t.Fatal(err) } } func testbrodcastItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(brodcastInternalCfg); err != nil { + if err := engine.InitStorDB(brodcastInternalCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index 5be8aad9e..d03d58a62 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -151,10 +151,10 @@ func testCacheRplAAInitCfg(t *testing.T) { } func testCacheRplInitDataDb(t *testing.T) { - if err := engine.InitDataDb(dspEngine1Cfg); err != nil { + if err := engine.InitDataDB(dspEngine1Cfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(dspEngine2Cfg); err != nil { + if err := engine.InitDataDB(dspEngine2Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index b48e07094..0cad2be3d 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -139,10 +139,10 @@ func testCDRsExpInitConfig(t *testing.T) { } func testCDRsExpInitDB(t *testing.T) { - if err := engine.InitDataDb(cdrsExpCfg); err != nil { + if err := engine.InitDataDB(cdrsExpCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(cdrsExpCfg); err != nil { + if err := engine.InitStorDB(cdrsExpCfg); err != nil { t.Fatal(err) } if err := os.RemoveAll(cdrsExpCfg.GeneralCfg().FailedPostsDir); err != nil { diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index c2cdcc7fb..6dd5f61fc 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -108,14 +108,14 @@ func testV2CDRsInitConfig(t *testing.T) { } func testV2CDRsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cdrsCfg); err != nil { + if err := engine.InitDataDB(cdrsCfg); err != nil { t.Fatal(err) } } // InitDb so we can rely on count func testV2CDRsInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cdrsCfg); err != nil { + if err := engine.InitStorDB(cdrsCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index 5ed8252b6..bf36437a9 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -100,16 +100,16 @@ func testCDRsOnExpInitConfig(t *testing.T) { // InitDb so we can rely on count func testCDRsOnExpInitCdrDb(t *testing.T) { - if err := engine.InitDataDb(cdrsMasterCfg); err != nil { + if err := engine.InitDataDB(cdrsMasterCfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(cdrsSlaveCfg); err != nil { + if err := engine.InitDataDB(cdrsSlaveCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(cdrsMasterCfg); err != nil { + if err := engine.InitStorDB(cdrsMasterCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(cdrsSlaveCfg); err != nil { + if err := engine.InitStorDB(cdrsSlaveCfg); err != nil { t.Fatal(err) } if err := os.RemoveAll(cdrsMasterCfg.GeneralCfg().FailedPostsDir); err != nil { diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go index f50d7b038..d736ae5aa 100644 --- a/general_tests/cdrs_post_failover_it_test.go +++ b/general_tests/cdrs_post_failover_it_test.go @@ -87,14 +87,14 @@ func testCDRsPostFailoverInitConfig(t *testing.T) { } func testCDRsPostFailoverInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cdrsPostFailCfg); err != nil { + if err := engine.InitDataDB(cdrsPostFailCfg); err != nil { t.Fatal(err) } } // InitDb so we can rely on count func testCDRsPostFailoverInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cdrsPostFailCfg); err != nil { + if err := engine.InitStorDB(cdrsPostFailCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index 85873c935..382f8006a 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -91,13 +91,13 @@ func testV1CDRsInitConfig(t *testing.T) { } func testV1CDRsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(pecdrsCfg); err != nil { + if err := engine.InitDataDB(pecdrsCfg); err != nil { t.Fatal(err) } } func testV1CDRsInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(pecdrsCfg); err != nil { + if err := engine.InitStorDB(pecdrsCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/cgrloader_it_test.go b/general_tests/cgrloader_it_test.go index 78ec38fea..53ea4f60b 100644 --- a/general_tests/cgrloader_it_test.go +++ b/general_tests/cgrloader_it_test.go @@ -82,13 +82,13 @@ func testCGRLoaderInitConfig(t *testing.T) { } func testCGRLoaderInitDataDb(t *testing.T) { - if err := engine.InitDataDb(cgrloaderCfg); err != nil { + if err := engine.InitDataDB(cgrloaderCfg); err != nil { t.Fatal(err) } } func testCGRLoaderInitCdrDb(t *testing.T) { - if err := engine.InitStorDb(cgrloaderCfg); err != nil { + if err := engine.InitStorDB(cgrloaderCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 9441df14d..3d33a6548 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -88,13 +88,13 @@ func testV1DataLoadConfig(t *testing.T) { } func testV1DataInitDataDb(t *testing.T) { - if err := engine.InitDataDb(dataCfg); err != nil { + if err := engine.InitDataDB(dataCfg); err != nil { t.Fatal(err) } } func testV1DataResetStorDb(t *testing.T) { - if err := engine.InitStorDb(dataCfg); err != nil { + if err := engine.InitStorDB(dataCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go index a5233a20b..fd063b03a 100644 --- a/general_tests/destination_combined_it_test.go +++ b/general_tests/destination_combined_it_test.go @@ -75,10 +75,10 @@ func testDestinationLoadConfig(t *testing.T) { } func testDestinationResetDB(t *testing.T) { - if err := engine.InitDataDb(tutorialCfg); err != nil { + if err := engine.InitDataDB(tutorialCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(tutorialCfg); err != nil { + if err := engine.InitStorDB(tutorialCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index 52223e0f9..310c6e692 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -82,7 +82,7 @@ func testdoubleRemoveLoadConfig(t *testing.T) { } func testdoubleRemoveInitDataDb(t *testing.T) { - if err := engine.InitDataDb(doubleRemove); err != nil { + if err := engine.InitDataDB(doubleRemove); err != nil { t.Fatal(err) } } diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 2f3100f49..15fafd84e 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -94,13 +94,13 @@ func testExpLoadConfig(t *testing.T) { } func testExpResetDataDB(t *testing.T) { - if err := engine.InitDataDb(expCfg); err != nil { + if err := engine.InitDataDB(expCfg); err != nil { t.Fatal(err) } } func testExpResetStorDb(t *testing.T) { - if err := engine.InitStorDb(expCfg); err != nil { + if err := engine.InitStorDB(expCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index e404193a8..86a988ffb 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -110,19 +110,19 @@ func testFltrRplInitCfg(t *testing.T) { } func testFltrRplInitDBs(t *testing.T) { - if err := engine.InitDataDb(fltrRplEngine1Cfg); err != nil { + if err := engine.InitDataDB(fltrRplEngine1Cfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(fltrRplEngine1Cfg); err != nil { + if err := engine.InitStorDB(fltrRplEngine1Cfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(fltrRplEngine2Cfg); err != nil { + if err := engine.InitDataDB(fltrRplEngine2Cfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(fltrRplEngine2Cfg); err != nil { + if err := engine.InitStorDB(fltrRplEngine2Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 0f0879ef4..45d0b8635 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -95,13 +95,13 @@ func testV1FltrLoadConfig(t *testing.T) { } func testV1FltrInitDataDb(t *testing.T) { - if err := engine.InitDataDb(fltrCfg); err != nil { + if err := engine.InitDataDB(fltrCfg); err != nil { t.Fatal(err) } } func testV1FltrResetStorDb(t *testing.T) { - if err := engine.InitStorDb(fltrCfg); err != nil { + if err := engine.InitStorDB(fltrCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index 94aa667e8..7aa61f8f5 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -85,22 +85,22 @@ func testGOCSInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testGOCSResetDB(t *testing.T) { - if err := engine.InitDataDb(auCfg); err != nil { + if err := engine.InitDataDB(auCfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(usCfg); err != nil { + if err := engine.InitDataDB(usCfg); err != nil { t.Fatal(err) } - if err := engine.InitDataDb(dspCfg); err != nil { + if err := engine.InitDataDB(dspCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(auCfg); err != nil { + if err := engine.InitStorDB(auCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(usCfg); err != nil { + if err := engine.InitStorDB(usCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(dspCfg); err != nil { + if err := engine.InitStorDB(dspCfg); err != nil { t.Fatal(err) } // give some time to flush DataDB and StorDB for all 3 engines diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go index 05713b02a..ce631dcca 100644 --- a/general_tests/poster_it_test.go +++ b/general_tests/poster_it_test.go @@ -89,10 +89,10 @@ func testPosterITInitCfg(t *testing.T) { } func testPosterITInitCdrDb(t *testing.T) { - if err := engine.InitDataDb(pstrCfg); err != nil { // need it for versions + if err := engine.InitDataDB(pstrCfg); err != nil { // need it for versions t.Fatal(err) } - if err := engine.InitStorDb(pstrCfg); err != nil { + if err := engine.InitStorDB(pstrCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go index b74ebff69..b65d0c061 100644 --- a/general_tests/redis_cluster_it_test.go +++ b/general_tests/redis_cluster_it_test.go @@ -167,7 +167,7 @@ func testClsrInitConfig(t *testing.T) { } func testClsrFlushDb(t *testing.T) { - if err := engine.InitDataDb(clsrConfig); err != nil { + if err := engine.InitDataDB(clsrConfig); err != nil { t.Fatal(err) } } diff --git a/general_tests/redis_tls_it_test.go b/general_tests/redis_tls_it_test.go index e0c15f9b7..0740caa02 100644 --- a/general_tests/redis_tls_it_test.go +++ b/general_tests/redis_tls_it_test.go @@ -83,7 +83,7 @@ func testRedisTLSInitConfig(t *testing.T) { } func testRedisTLSFlushDb(t *testing.T) { - if err := engine.InitDataDb(redisTLSCfg); err != nil { + if err := engine.InitDataDB(redisTLSCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index 2785a698d..21c69f65a 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -77,14 +77,14 @@ func testV1RsLoadConfig(t *testing.T) { } func testV1RsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(rlsV1Cfg); err != nil { + if err := engine.InitDataDB(rlsV1Cfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1RsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(rlsV1Cfg); err != nil { + if err := engine.InitStorDB(rlsV1Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go index c822a6242..c6b72ec17 100644 --- a/general_tests/route_it_test.go +++ b/general_tests/route_it_test.go @@ -91,14 +91,14 @@ func testV1SplSLoadConfig(t *testing.T) { } func testV1SplSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(splSv1Cfg); err != nil { + if err := engine.InitDataDB(splSv1Cfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testV1SplSResetStorDb(t *testing.T) { - if err := engine.InitStorDb(splSv1Cfg); err != nil { + if err := engine.InitStorDB(splSv1Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 9dd15b765..ed89c1904 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -97,14 +97,14 @@ func testRPCMethodsLoadConfig(t *testing.T) { } func testRPCMethodsInitDataDb(t *testing.T) { - if err := engine.InitDataDb(rpcCfg); err != nil { + if err := engine.InitDataDB(rpcCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testRPCMethodsResetStorDb(t *testing.T) { - if err := engine.InitStorDb(rpcCfg); err != nil { + if err := engine.InitStorDB(rpcCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/rpcclient_it_test.go b/general_tests/rpcclient_it_test.go index 5c93d0380..dba18c9e4 100644 --- a/general_tests/rpcclient_it_test.go +++ b/general_tests/rpcclient_it_test.go @@ -104,7 +104,7 @@ func testRPCITLclInitCfg(t *testing.T) { if err != nil { t.Error(err) } - if err := engine.InitDataDb(rpcITCfg1); err != nil { + if err := engine.InitDataDB(rpcITCfg1); err != nil { t.Fatal(err) } } diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index 228748fd0..f1eb8154f 100755 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -118,7 +118,7 @@ func testRedisSentinelInitConfig(t *testing.T) { } func testRedisSentinelFlushDb(t *testing.T) { - if err := engine.InitDataDb(sentinelConfig); err != nil { + if err := engine.InitDataDB(sentinelConfig); err != nil { t.Fatal(err) } } diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index 04fe7e98b..e6086fe5f 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -81,13 +81,13 @@ func testSes2ItLoadConfig(t *testing.T) { } func testSes2ItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(ses2Cfg); err != nil { + if err := engine.InitDataDB(ses2Cfg); err != nil { t.Fatal(err) } } func testSes2ItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(ses2Cfg); err != nil { + if err := engine.InitStorDB(ses2Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index c12e29354..b6e3c8afc 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -88,13 +88,13 @@ func testSes3ItLoadConfig(t *testing.T) { } func testSes3ItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(ses3Cfg); err != nil { + if err := engine.InitDataDB(ses3Cfg); err != nil { t.Fatal(err) } } func testSes3ItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(ses3Cfg); err != nil { + if err := engine.InitStorDB(ses3Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go index 7264b2422..25b764069 100644 --- a/general_tests/session4_it_test.go +++ b/general_tests/session4_it_test.go @@ -78,13 +78,13 @@ func testSes4ItLoadConfig(t *testing.T) { } func testSes4ItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(ses4Cfg); err != nil { + if err := engine.InitDataDB(ses4Cfg); err != nil { t.Fatal(err) } } func testSes4ItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(ses4Cfg); err != nil { + if err := engine.InitStorDB(ses4Cfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index 7362a82d0..657eb8f71 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -80,13 +80,13 @@ func testSesItLoadConfig(t *testing.T) { } func testSesItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(sesCfg); err != nil { + if err := engine.InitDataDB(sesCfg); err != nil { t.Fatal(err) } } func testSesItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sesCfg); err != nil { + if err := engine.InitStorDB(sesCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 23a5611a6..19009f488 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -121,10 +121,10 @@ func testSessionSRplInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionSRplResetDB(t *testing.T) { - if err := engine.InitDataDb(smgRplcMasterCfg); err != nil { + if err := engine.InitDataDB(smgRplcMasterCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(smgRplcMasterCfg); err != nil { + if err := engine.InitStorDB(smgRplcMasterCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/sessionpause_it_test.go b/general_tests/sessionpause_it_test.go index d97963ddc..574a74551 100644 --- a/general_tests/sessionpause_it_test.go +++ b/general_tests/sessionpause_it_test.go @@ -83,13 +83,13 @@ func testSesPauseItLoadConfig(t *testing.T) { } func testSesPauseItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(sesPauseCfg); err != nil { + if err := engine.InitDataDB(sesPauseCfg); err != nil { t.Fatal(err) } } func testSesPauseItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sesPauseCfg); err != nil { + if err := engine.InitStorDB(sesPauseCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 2e632236d..8f97696ec 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -82,13 +82,13 @@ func testSrItLoadConfig(t *testing.T) { } func testSrItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(srCfg); err != nil { + if err := engine.InitDataDB(srCfg); err != nil { t.Fatal(err) } } func testSrItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(srCfg); err != nil { + if err := engine.InitStorDB(srCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/sessionroutes_it_test.go b/general_tests/sessionroutes_it_test.go index a4fef3aad..731ccffe5 100644 --- a/general_tests/sessionroutes_it_test.go +++ b/general_tests/sessionroutes_it_test.go @@ -81,13 +81,13 @@ func testSesRoutesItLoadConfig(t *testing.T) { } func testSesRoutesItResetDataDB(t *testing.T) { - if err := engine.InitDataDb(sesRoutesCfg); err != nil { + if err := engine.InitDataDB(sesRoutesCfg); err != nil { t.Fatal(err) } } func testSesRoutesItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sesRoutesCfg); err != nil { + if err := engine.InitStorDB(sesRoutesCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/tls_it_test.go b/general_tests/tls_it_test.go index c5fe877d0..08541a565 100755 --- a/general_tests/tls_it_test.go +++ b/general_tests/tls_it_test.go @@ -71,7 +71,7 @@ func testTLSLoadConfig(t *testing.T) { } func testTLSInitDataDb(t *testing.T) { - if err := engine.InitDataDb(tlsCfg); err != nil { + if err := engine.InitDataDB(tlsCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index 232cb0713..9f8d2a1b3 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -91,14 +91,14 @@ func testTpInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testTpResetDataDb(t *testing.T) { - if err := engine.InitDataDb(tpCfg); err != nil { + if err := engine.InitDataDB(tpCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testTpResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tpCfg); err != nil { + if err := engine.InitStorDB(tpCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 97988e478..b1938a853 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -83,14 +83,14 @@ func testTutSMGInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testTutSMGResetDataDb(t *testing.T) { - if err := engine.InitDataDb(tutSMGCfg); err != nil { + if err := engine.InitDataDB(tutSMGCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testTutSMGResetStorDb(t *testing.T) { - if err := engine.InitStorDb(tutSMGCfg); err != nil { + if err := engine.InitStorDB(tutSMGCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go index 865c74111..c59006ce1 100644 --- a/general_tests/tutorial2_it_test.go +++ b/general_tests/tutorial2_it_test.go @@ -85,10 +85,10 @@ func testTutLoadConfig(t *testing.T) { } func testTutResetDB(t *testing.T) { - if err := engine.InitDataDb(tutCfg); err != nil { + if err := engine.InitDataDB(tutCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(tutCfg); err != nil { + if err := engine.InitStorDB(tutCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/tutorial_it_test.go b/general_tests/tutorial_it_test.go index 68362f55c..622005e76 100644 --- a/general_tests/tutorial_it_test.go +++ b/general_tests/tutorial_it_test.go @@ -96,10 +96,10 @@ func testTutorialLoadConfig(t *testing.T) { } func testTutorialResetDB(t *testing.T) { - if err := engine.InitDataDb(tutorialCfg); err != nil { + if err := engine.InitDataDB(tutorialCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(tutorialCfg); err != nil { + if err := engine.InitStorDB(tutorialCfg); err != nil { t.Fatal(err) } } diff --git a/general_tests/twoengines_it_test.go b/general_tests/twoengines_it_test.go index 0ff737dd2..063a0c132 100644 --- a/general_tests/twoengines_it_test.go +++ b/general_tests/twoengines_it_test.go @@ -75,12 +75,12 @@ func testTwoEnginesInitConfig(t *testing.T) { } func testTwoEnginesInitDataDB(t *testing.T) { - if err := engine.InitDataDb(engineOneCfg); err != nil { + if err := engine.InitDataDB(engineOneCfg); err != nil { t.Fatal(err) } } func testTwoEnginesInitStorDB(t *testing.T) { - if err := engine.InitStorDb(engineOneCfg); err != nil { + if err := engine.InitStorDB(engineOneCfg); err != nil { t.Fatal(err) } } diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index d9871f82e..d8e6bd7ec 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -139,7 +139,7 @@ func testLoaderMakeFolders(t *testing.T) { // Wipe out the cdr database func testLoaderResetDataDB(t *testing.T) { - if err := engine.InitDataDb(loaderCfg); err != nil { + if err := engine.InitDataDB(loaderCfg); err != nil { t.Fatal(err) } engine.Cache.Clear(nil) diff --git a/migrator/storage_sql.go b/migrator/storage_sql.go index 0313147c7..49bdf0f74 100755 --- a/migrator/storage_sql.go +++ b/migrator/storage_sql.go @@ -51,7 +51,7 @@ func (sqlMig *migratorSQL) StorDB() engine.StorDB { func (mgSQL *migratorSQL) getV1CDR() (v1Cdr *v1Cdrs, err error) { if mgSQL.rowIter == nil { - mgSQL.rowIter, err = mgSQL.sqlStorage.Db.Query("SELECT * FROM cdrs") + mgSQL.rowIter, err = mgSQL.sqlStorage.DB.Query("SELECT * FROM cdrs") if err != nil { return nil, err } @@ -101,7 +101,7 @@ func (mgSQL *migratorSQL) renameV1SMCosts() (err error) { if mgSQL.StorDB().GetStorageType() == utils.Postgres { qry = "ALTER TABLE sm_costs RENAME TO session_costs" } - if _, err := mgSQL.sqlStorage.Db.Exec(qry); err != nil { + if _, err := mgSQL.sqlStorage.DB.Exec(qry); err != nil { return err } return @@ -126,13 +126,13 @@ func (mgSQL *migratorSQL) createV1SMCosts() (err error) { ); ` } - if _, err := mgSQL.sqlStorage.Db.Exec("DROP TABLE IF EXISTS session_costs;"); err != nil { + if _, err := mgSQL.sqlStorage.DB.Exec("DROP TABLE IF EXISTS session_costs;"); err != nil { return err } - if _, err := mgSQL.sqlStorage.Db.Exec("DROP TABLE IF EXISTS sm_costs;"); err != nil { + if _, err := mgSQL.sqlStorage.DB.Exec("DROP TABLE IF EXISTS sm_costs;"); err != nil { return err } - if _, err := mgSQL.sqlStorage.Db.Exec(qry); err != nil { + if _, err := mgSQL.sqlStorage.DB.Exec(qry); err != nil { return err } return diff --git a/registrarc/registrarc_it_test.go b/registrarc/registrarc_it_test.go index 2dcedfefe..4722e691b 100644 --- a/registrarc/registrarc_it_test.go +++ b/registrarc/registrarc_it_test.go @@ -92,10 +92,10 @@ func testDsphInitCfg(t *testing.T) { } func testDsphInitDB(t *testing.T) { - if err := engine.InitDataDb(dspCfg); err != nil { + if err := engine.InitDataDB(dspCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(dspCfg); err != nil { + if err := engine.InitStorDB(dspCfg); err != nil { t.Fatal(err) } } diff --git a/registrarc/registrarcrpc_it_test.go b/registrarc/registrarcrpc_it_test.go index 476d39593..ff027ff54 100644 --- a/registrarc/registrarcrpc_it_test.go +++ b/registrarc/registrarcrpc_it_test.go @@ -88,10 +88,10 @@ func testRPCInitCfg(t *testing.T) { } func testRPCInitDB(t *testing.T) { - if err := engine.InitDataDb(rpcsCfg); err != nil { + if err := engine.InitDataDB(rpcsCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(rpcsCfg); err != nil { + if err := engine.InitStorDB(rpcsCfg); err != nil { t.Fatal(err) } } diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index bb2e38a32..b8fd52566 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -88,14 +88,14 @@ func testSessionsBiRPCInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionsBiRPCResetDataDb(t *testing.T) { - if err := engine.InitDataDb(sessionsBiRPCCfg); err != nil { + if err := engine.InitDataDB(sessionsBiRPCCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testSessionsBiRPCResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sessionsBiRPCCfg); err != nil { + if err := engine.InitStorDB(sessionsBiRPCCfg); err != nil { t.Fatal(err) } } diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 0bdf155fc..6a2d32369 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -85,14 +85,14 @@ func testSessionsDataInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionsDataResetDataDb(t *testing.T) { - if err := engine.InitDataDb(dataCfg); err != nil { + if err := engine.InitDataDB(dataCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testSessionsDataResetStorDb(t *testing.T) { - if err := engine.InitStorDb(dataCfg); err != nil { + if err := engine.InitStorDB(dataCfg); err != nil { t.Fatal(err) } } diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index c254b545f..1a0824ae8 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -82,14 +82,14 @@ func testSessionsItInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionsItResetDataDb(t *testing.T) { - if err := engine.InitDataDb(sItCfg); err != nil { + if err := engine.InitDataDB(sItCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testSessionsItResetStorDb(t *testing.T) { - if err := engine.InitStorDb(sItCfg); err != nil { + if err := engine.InitStorDB(sItCfg); err != nil { t.Fatal(err) } } diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index db8d3b610..8e83131b7 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -89,10 +89,10 @@ func testSessionSRplInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionSRplResetDB(t *testing.T) { - if err := engine.InitDataDb(smgRplcMasterCfg); err != nil { + if err := engine.InitDataDB(smgRplcMasterCfg); err != nil { t.Fatal(err) } - if err := engine.InitStorDb(smgRplcMasterCfg); err != nil { + if err := engine.InitStorDB(smgRplcMasterCfg); err != nil { t.Fatal(err) } } diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 98c26285d..ec6db9116 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -87,14 +87,14 @@ func testSessionsVoiceInitCfg(t *testing.T) { // Remove data in both rating and accounting db func testSessionsVoiceResetDataDb(t *testing.T) { - if err := engine.InitDataDb(voiceCfg); err != nil { + if err := engine.InitDataDB(voiceCfg); err != nil { t.Fatal(err) } } // Wipe out the cdr database func testSessionsVoiceResetStorDb(t *testing.T) { - if err := engine.InitStorDb(voiceCfg); err != nil { + if err := engine.InitStorDB(voiceCfg); err != nil { t.Fatal(err) } } diff --git a/utils/consts.go b/utils/consts.go index 55100f8dd..d8c6f4368 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1622,7 +1622,6 @@ const ( const ( TimingsCsv = "Timings.csv" DestinationsCsv = "Destinations.csv" - RatesCsv = "Rates.csv" ResourcesCsv = "Resources.csv" StatsCsv = "Stats.csv" ThresholdsCsv = "Thresholds.csv"