From 35e5fb2f9df0aeeac58d59ca3ea5ac5e40486af4 Mon Sep 17 00:00:00 2001 From: adragusin Date: Wed, 29 Jan 2020 15:49:41 +0200 Subject: [PATCH] renamed dbType *sql to *mysql --- agents/diam_it_test.go | 8 ++++---- agents/dnsagent_it_test.go | 2 +- agents/httpagent_it_test.go | 4 ++-- agents/radagent_it_test.go | 2 +- apier/v1/accounts_it_test.go | 4 ++-- apier/v1/apier2_it_test.go | 2 +- apier/v1/apier_it_test.go | 2 +- apier/v1/attributes_it_test.go | 2 +- apier/v1/caches_it_test.go | 2 +- apier/v1/cdre_it_test.go | 2 +- apier/v1/cdrs_it_test.go | 2 +- apier/v1/chargers_it_test.go | 2 +- apier/v1/costs_it_test.go | 2 +- apier/v1/dispatcher_it_test.go | 2 +- apier/v1/dispatchersv1_it_test.go | 2 +- apier/v1/dm_remote_it_test.go | 2 +- apier/v1/filter_indexes_it_test.go | 2 +- apier/v1/filterindexecache_it_test.go | 2 +- apier/v1/filters_it_test.go | 2 +- apier/v1/guardian_it_test.go | 2 +- apier/v1/precache_it_test.go | 2 +- apier/v1/resourcesv1_it_test.go | 2 +- apier/v1/schedulers_it_test.go | 6 +++--- apier/v1/sessions_process_event_it_test.go | 8 ++++---- apier/v1/sessions_thresholds_it_test.go | 2 +- apier/v1/sessionsv1_it_test.go | 2 +- apier/v1/stats_it_test.go | 2 +- apier/v1/suppliers_it_test.go | 2 +- apier/v1/thresholds_it_test.go | 2 +- apier/v1/tp_it_test.go | 2 +- apier/v1/versions_it_test.go | 2 +- apier/v2/apierv2_it_test.go | 2 +- apier/v2/attributes_it_test.go | 2 +- apier/v2/cdrs_it_test.go | 2 +- apier/v2/cdrs_offline_it_test.go | 2 +- apier/v2/tp_it_test.go | 2 +- dispatchers/attributes_it_test.go | 4 ++-- dispatchers/caches_it_test.go | 2 +- dispatchers/cdrs_it_test.go | 4 ++-- dispatchers/chargers_it_test.go | 2 +- dispatchers/config_it_test.go | 2 +- dispatchers/guardian_it_test.go | 2 +- dispatchers/rals_it_test.go | 2 +- dispatchers/resources_it_test.go | 2 +- dispatchers/responder_it_test.go | 2 +- dispatchers/scheduler_it_test.go | 2 +- dispatchers/sessions_it_test.go | 2 +- dispatchers/stats_it_test.go | 2 +- dispatchers/suppliers_it_test.go | 2 +- dispatchers/thresholds_it_test.go | 2 +- engine/actions2_it_test.go | 4 ++-- engine/actions_it_test.go | 2 +- engine/datamanager_it_test.go | 2 +- engine/filterindexer_it_test.go | 2 +- engine/loader_it_test.go | 2 +- engine/onstor_it_test.go | 2 +- engine/storage_cdrs_it_test.go | 2 +- engine/stordb_it_test.go | 2 +- engine/versions_it_test.go | 2 +- ers/ers_reload_it_test.go | 2 +- ers/filecsv_it_test.go | 2 +- ers/filefwv_it_test.go | 2 +- ers/filexml_it_test.go | 2 +- ers/flatstore_it_test.go | 2 +- ers/partial_csv_it_test.go | 2 +- general_tests/a1_it_test.go | 2 +- general_tests/accounts_it_test.go | 2 +- general_tests/broadcast_client_it_test.go | 2 +- general_tests/cdre_it_test.go | 2 +- general_tests/cdrs_internal_it_test.go | 2 +- general_tests/cdrs_it_test.go | 2 +- general_tests/cdrs_onlexp_it_test.go | 2 +- general_tests/cdrs_processevent_it_test.go | 2 +- general_tests/data_it_test.go | 2 +- general_tests/destination_combined_it_test.go | 2 +- general_tests/filters_it_test.go | 2 +- general_tests/resourcesv1_it_test.go | 2 +- general_tests/rpccaching_it_test.go | 2 +- general_tests/rpcclient_it_test.go | 2 +- general_tests/sentinel_it_test.go | 2 +- general_tests/session2_it_test.go | 2 +- general_tests/session3_it_test.go | 2 +- general_tests/session_it_test.go | 2 +- .../session_replications_automaticdebit_it_test.go | 2 +- general_tests/sessionrefund_it_test.go | 2 +- general_tests/supplier_it_test.go | 2 +- general_tests/tp_it_test.go | 2 +- general_tests/tut_smgeneric_it_test.go | 2 +- general_tests/tutorial2_it_test.go | 2 +- general_tests/tutorial_it_test.go | 2 +- loaders/loader_it_test.go | 2 +- sessions/sessions_birpc_it_test.go | 2 +- sessions/sessions_data_it_test.go | 2 +- sessions/sessions_it_test.go | 2 +- sessions/sessions_rpl_it_test.go | 2 +- sessions/sessions_voice_it_test.go | 2 +- utils/consts.go | 1 + 97 files changed, 110 insertions(+), 109 deletions(-) diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index e594647ed..ca07833b5 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -71,7 +71,7 @@ func TestDiamItTcp(t *testing.T) { switch *dbType { case utils.MetaInternal: diamConfigDIR = "diamagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: diamConfigDIR = "diamagent_mysql" case utils.MetaMongo: diamConfigDIR = "diamagent_mongo" @@ -107,7 +107,7 @@ func TestDiamItSctp(t *testing.T) { switch *dbType { case utils.MetaInternal: diamConfigDIR = "diamsctpagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: diamConfigDIR = "diamsctpagent_mysql" case utils.MetaMongo: diamConfigDIR = "diamsctpagent_mongo" @@ -126,7 +126,7 @@ func TestDiamItMaxConn(t *testing.T) { switch *dbType { case utils.MetaInternal: diamConfigDIR = "diamagentmaxconn_internal" - case utils.MetaSQL: + case utils.MetaMySQL: diamConfigDIR = "diamagentmaxconn_mysql" case utils.MetaMongo: diamConfigDIR = "diamagentmaxconn_mongo" @@ -147,7 +147,7 @@ func TestDiamItSessionDisconnect(t *testing.T) { switch *dbType { case utils.MetaInternal: diamConfigDIR = "diamagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: diamConfigDIR = "diamagent_mysql" case utils.MetaMongo: diamConfigDIR = "diamagent_mongo" diff --git a/agents/dnsagent_it_test.go b/agents/dnsagent_it_test.go index e8e3e39d7..1c71b34f3 100644 --- a/agents/dnsagent_it_test.go +++ b/agents/dnsagent_it_test.go @@ -57,7 +57,7 @@ func TestDNSitSimple(t *testing.T) { switch *dbType { case utils.MetaInternal: dnsCfgDIR = "dnsagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: dnsCfgDIR = "dnsagent_mysql" case utils.MetaMongo: dnsCfgDIR = "dnsagent_mongo" diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index 281bcf4b4..e916d2a1c 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -67,7 +67,7 @@ func TestHAit(t *testing.T) { switch *dbType { case utils.MetaInternal: haCfgDIR = "httpagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: haCfgDIR = "httpagent_mysql" case utils.MetaMongo: haCfgDIR = "httpagent_mongo" @@ -91,7 +91,7 @@ func TestHAitTls(t *testing.T) { switch *dbType { case utils.MetaInternal: haCfgDIR = "httpagenttls_internal" - case utils.MetaSQL: + case utils.MetaMySQL: haCfgDIR = "httpagenttls_mysql" case utils.MetaMongo: haCfgDIR = "httpagenttls_mongo" diff --git a/agents/radagent_it_test.go b/agents/radagent_it_test.go index aa81c7890..767f61b5c 100644 --- a/agents/radagent_it_test.go +++ b/agents/radagent_it_test.go @@ -63,7 +63,7 @@ func TestRAit(t *testing.T) { switch *dbType { case utils.MetaInternal: raonfigDIR = "radagent_internal" - case utils.MetaSQL: + case utils.MetaMySQL: raonfigDIR = "radagent_mysql" case utils.MetaMongo: raonfigDIR = "radagent_mongo" diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index 926dad75b..9771ee311 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -69,7 +69,7 @@ func TestAccITWithRemove(t *testing.T) { switch *dbType { case utils.MetaInternal: accTestsConfig = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: accTestsConfig = "tutmysql" case utils.MetaMongo: accTestsConfig = "tutmongo" @@ -92,7 +92,7 @@ func TestAccITWithoutRemove(t *testing.T) { switch *dbType { case utils.MetaInternal: accTestsConfig = "acc_balance_keep_internal" - case utils.MetaSQL: + case utils.MetaMySQL: accTestsConfig = "acc_balance_keep_mysql" case utils.MetaMongo: accTestsConfig = "acc_balance_keep_mongo" diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 9a6087840..788ec3d43 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -67,7 +67,7 @@ func TestApierIT2(t *testing.T) { switch *dbType { case utils.MetaInternal: apierv2ConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: apierv2ConfigDIR = "tutmysql" case utils.MetaMongo: apierv2ConfigDIR = "tutmongo" diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 3340850c5..f23a5c88d 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -145,7 +145,7 @@ func TestApierIT(t *testing.T) { case utils.MetaInternal: t.SkipNow() // need tests redesign // apierv1ConfigDIR = "apier_internal" - case utils.MetaSQL: + case utils.MetaMySQL: apierv1ConfigDIR = "apier_mysql" case utils.MetaMongo: apierv1ConfigDIR = "apier_mongo" diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index eb601e74b..610162a81 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -93,7 +93,7 @@ func TestAttributeSIT(t *testing.T) { case utils.MetaInternal: attrsTests = sTestsAlsPrf[:29] alsPrfConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: alsPrfConfigDIR = "tutmysql" case utils.MetaMongo: alsPrfConfigDIR = "tutmongo" diff --git a/apier/v1/caches_it_test.go b/apier/v1/caches_it_test.go index 528f33500..19e64465b 100644 --- a/apier/v1/caches_it_test.go +++ b/apier/v1/caches_it_test.go @@ -66,7 +66,7 @@ func TestCacheSv1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: cacheConfigDIR = "tutmysql" case utils.MetaMongo: cacheConfigDIR = "tutmongo" diff --git a/apier/v1/cdre_it_test.go b/apier/v1/cdre_it_test.go index 0049e36eb..5f9ce56f2 100755 --- a/apier/v1/cdre_it_test.go +++ b/apier/v1/cdre_it_test.go @@ -59,7 +59,7 @@ func TestCDRExport(t *testing.T) { switch *dbType { case utils.MetaInternal: cdreConfigDIR = "cdrewithfilter_internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdreConfigDIR = "cdrewithfilter_mysql" case utils.MetaMongo: cdreConfigDIR = "cdrewithfilter_mongo" diff --git a/apier/v1/cdrs_it_test.go b/apier/v1/cdrs_it_test.go index 533bb5626..2be249b6d 100644 --- a/apier/v1/cdrs_it_test.go +++ b/apier/v1/cdrs_it_test.go @@ -54,7 +54,7 @@ func TestCDRsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsConfDIR = "cdrsv1internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdrsConfDIR = "cdrsv1mysql" case utils.MetaMongo: cdrsConfDIR = "cdrsv1mongo" diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index aa3af9834..4afef324f 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -84,7 +84,7 @@ func TestChargerSIT(t *testing.T) { switch *dbType { case utils.MetaInternal: chargerConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: chargerConfigDIR = "tutmysql" case utils.MetaMongo: chargerConfigDIR = "tutmongo" diff --git a/apier/v1/costs_it_test.go b/apier/v1/costs_it_test.go index 35eaf3b31..b6efc60d2 100644 --- a/apier/v1/costs_it_test.go +++ b/apier/v1/costs_it_test.go @@ -55,7 +55,7 @@ func TestCostIT(t *testing.T) { switch *dbType { case utils.MetaInternal: costConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: costConfigDIR = "tutmysql" case utils.MetaMongo: costConfigDIR = "tutmongo" diff --git a/apier/v1/dispatcher_it_test.go b/apier/v1/dispatcher_it_test.go index ad8e4b7cc..c7a99ed7a 100644 --- a/apier/v1/dispatcher_it_test.go +++ b/apier/v1/dispatcher_it_test.go @@ -69,7 +69,7 @@ func TestDispatcherSIT(t *testing.T) { switch *dbType { case utils.MetaInternal: dispatcherConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: dispatcherConfigDIR = "tutmysql" case utils.MetaMongo: dispatcherConfigDIR = "tutmongo" diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go index d843072f2..edfa670ee 100644 --- a/apier/v1/dispatchersv1_it_test.go +++ b/apier/v1/dispatchersv1_it_test.go @@ -57,7 +57,7 @@ func TestDspDspv1(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: dispatcherConfigDIR = "dispatchers_mysql" case utils.MetaMongo: dispatcherConfigDIR = "dispatchers_mongo" diff --git a/apier/v1/dm_remote_it_test.go b/apier/v1/dm_remote_it_test.go index aa6a9ee38..b228f9edb 100644 --- a/apier/v1/dm_remote_it_test.go +++ b/apier/v1/dm_remote_it_test.go @@ -84,7 +84,7 @@ func TestInternalRemoteIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: engineOneCfgDirPath = "engine1_redis" engineTwoCfgDirPath = "engine2_redis" case utils.MetaMongo: diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 8eb9853d4..7898b4c68 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -101,7 +101,7 @@ func TestFIdxV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: tSv1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tSv1ConfDIR = "tutmysql" case utils.MetaMongo: tSv1ConfDIR = "tutmongo" diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index c0b01503c..a51c4777e 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -83,7 +83,7 @@ func TestFIdxCaV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: tSv1ConfDIR = "tutmysql" case utils.MetaMongo: tSv1ConfDIR = "tutmongo" diff --git a/apier/v1/filters_it_test.go b/apier/v1/filters_it_test.go index c765c4f40..a797186f4 100644 --- a/apier/v1/filters_it_test.go +++ b/apier/v1/filters_it_test.go @@ -62,7 +62,7 @@ func TestFilterIT(t *testing.T) { switch *dbType { case utils.MetaInternal: filterConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: filterConfigDIR = "tutmysql" case utils.MetaMongo: filterConfigDIR = "tutmongo" diff --git a/apier/v1/guardian_it_test.go b/apier/v1/guardian_it_test.go index bc0495697..a0353d51a 100644 --- a/apier/v1/guardian_it_test.go +++ b/apier/v1/guardian_it_test.go @@ -38,7 +38,7 @@ func TestGuardianSIT(t *testing.T) { switch *dbType { case utils.MetaInternal: guardianConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: guardianConfigDIR = "tutmysql" case utils.MetaMongo: guardianConfigDIR = "tutmongo" diff --git a/apier/v1/precache_it_test.go b/apier/v1/precache_it_test.go index c4bd1cf46..800a3b270 100644 --- a/apier/v1/precache_it_test.go +++ b/apier/v1/precache_it_test.go @@ -58,7 +58,7 @@ func TestPrecacheIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: precacheConfigDIR = "tutmysql" case utils.MetaMongo: precacheConfigDIR = "tutmongo" diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index c03b103b6..966b85d3e 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -70,7 +70,7 @@ func TestRsV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: rlsV1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: rlsV1ConfDIR = "tutmysql" case utils.MetaMongo: rlsV1ConfDIR = "tutmongo" diff --git a/apier/v1/schedulers_it_test.go b/apier/v1/schedulers_it_test.go index 73b9f66c9..7b4af1d74 100644 --- a/apier/v1/schedulers_it_test.go +++ b/apier/v1/schedulers_it_test.go @@ -56,7 +56,7 @@ func TestSchedWithoutFilters(t *testing.T) { switch *dbType { case utils.MetaInternal: schedConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: schedConfDIR = "tutmysql" case utils.MetaMongo: schedConfDIR = "tutmongo" @@ -76,7 +76,7 @@ func TestSchedWithFiltersSingleAccount(t *testing.T) { switch *dbType { case utils.MetaInternal: schedConfDIR = "filtered_scheduler_internal" - case utils.MetaSQL: + case utils.MetaMySQL: schedConfDIR = "filtered_scheduler_mysql" case utils.MetaMongo: schedConfDIR = "filtered_scheduler_mongo" @@ -95,7 +95,7 @@ func TestSchedWithFilters2(t *testing.T) { switch *dbType { case utils.MetaInternal: schedConfDIR = "filtered_scheduler2_internal" - case utils.MetaSQL: + case utils.MetaMySQL: schedConfDIR = "filtered_scheduler2_mysql" case utils.MetaMongo: schedConfDIR = "filtered_scheduler2_mongo" diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index aa73ff037..9a1c4446e 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -56,7 +56,7 @@ func TestSSv1ItProcessEventWithPrepaid(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" @@ -76,7 +76,7 @@ func TestSSv1ItProcessEventWithPostPaid(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" @@ -97,7 +97,7 @@ func TestSSv1ItProcessEventWithRated(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" @@ -118,7 +118,7 @@ func TestSSv1ItProcessEventWithPseudoPrepaid(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" diff --git a/apier/v1/sessions_thresholds_it_test.go b/apier/v1/sessions_thresholds_it_test.go index 4b5b20583..9938ef549 100755 --- a/apier/v1/sessions_thresholds_it_test.go +++ b/apier/v1/sessions_thresholds_it_test.go @@ -67,7 +67,7 @@ func TestSessionSITtests(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index ccf482941..e0d7a450a 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -73,7 +73,7 @@ func testSSv1ItInitCfgDir(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsConfDIR = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsConfDIR = "sessions_mysql" case utils.MetaMongo: sessionsConfDIR = "sessions_mongo" diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 1599df60b..717cdf7c0 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -94,7 +94,7 @@ func TestSTSV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: stsV1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: stsV1ConfDIR = "tutmysql" case utils.MetaMongo: stsV1ConfDIR = "tutmongo" diff --git a/apier/v1/suppliers_it_test.go b/apier/v1/suppliers_it_test.go index 1dbb05e1d..eadee039e 100644 --- a/apier/v1/suppliers_it_test.go +++ b/apier/v1/suppliers_it_test.go @@ -80,7 +80,7 @@ func TestSuplSV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: splSv1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: splSv1ConfDIR = "tutmysql" case utils.MetaMongo: splSv1ConfDIR = "tutmongo" diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index 88e0c7953..a3a9d6102 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -202,7 +202,7 @@ func TestTSV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: tSv1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tSv1ConfDIR = "tutmysql" case utils.MetaMongo: tSv1ConfDIR = "tutmongo" diff --git a/apier/v1/tp_it_test.go b/apier/v1/tp_it_test.go index cf897e63f..230f22fd0 100644 --- a/apier/v1/tp_it_test.go +++ b/apier/v1/tp_it_test.go @@ -56,7 +56,7 @@ func TestTPIT(t *testing.T) { switch *dbType { case utils.MetaInternal: tpConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tpConfigDIR = "tutmysql" case utils.MetaMongo: tpConfigDIR = "tutmongo" diff --git a/apier/v1/versions_it_test.go b/apier/v1/versions_it_test.go index 9f1dc2fc3..bec85e8c2 100644 --- a/apier/v1/versions_it_test.go +++ b/apier/v1/versions_it_test.go @@ -59,7 +59,7 @@ func TestVrsIT(t *testing.T) { // vrsConfigDIR = "tutinternal" // vrsStorageType = utils.INTERNAL t.SkipNow() // as is commented below - case utils.MetaSQL: + case utils.MetaMySQL: vrsConfigDIR = "tutmysql" vrsStorageType = utils.REDIS case utils.MetaMongo: diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index 5f6ded7b3..f37534987 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -63,7 +63,7 @@ func TestV2IT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.Skip() - case utils.MetaSQL: + case utils.MetaMySQL: apierv2ConfDIR = "tutmysql" case utils.MetaMongo: apierv2ConfDIR = "tutmongo" diff --git a/apier/v2/attributes_it_test.go b/apier/v2/attributes_it_test.go index e050e1b66..270e79cf2 100644 --- a/apier/v2/attributes_it_test.go +++ b/apier/v2/attributes_it_test.go @@ -59,7 +59,7 @@ func TestAttributeSIT(t *testing.T) { switch *dbType { case utils.MetaInternal: alsPrfConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: alsPrfConfigDIR = "tutmysql" case utils.MetaMongo: alsPrfConfigDIR = "tutmongo" diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index f8c015af4..dc61e994c 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -73,7 +73,7 @@ func TestCDRsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsConfDIR = "cdrsv2internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdrsConfDIR = "cdrsv2mysql" case utils.MetaMongo: cdrsConfDIR = "cdrsv2mongo" diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index 05f0062d7..f28a1ece7 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -59,7 +59,7 @@ func TestCDRsOfflineIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsOfflineConfDIR = "cdrsv2internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdrsOfflineConfDIR = "cdrsv2mysql" case utils.MetaMongo: cdrsOfflineConfDIR = "cdrsv2mongo" diff --git a/apier/v2/tp_it_test.go b/apier/v2/tp_it_test.go index 17d6fcf76..c806eb885 100644 --- a/apier/v2/tp_it_test.go +++ b/apier/v2/tp_it_test.go @@ -61,7 +61,7 @@ func TestTPit(t *testing.T) { switch *dbType { case utils.MetaInternal: configDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: configDIR = "tutmysql" case utils.MetaMongo: configDIR = "tutmongo" diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index a8e3f68d2..b9da25a96 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -51,7 +51,7 @@ func TestDspAttributeS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" @@ -73,7 +73,7 @@ func TestDspAttributeS(t *testing.T) { } func TestDspAttributeSNoConn(t *testing.T) { - if *dbType != utils.MetaSQL { + if *dbType != utils.MetaMySQL { t.SkipNow() } testDsp(t, []func(t *testing.T){ diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index 8ed4f0dff..d9f31b319 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -50,7 +50,7 @@ func TestDspCacheSv1(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index 91eb0b7ca..c1399d260 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -60,7 +60,7 @@ func TestDspCDRsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" @@ -82,7 +82,7 @@ func TestDspCDRsIT(t *testing.T) { } func TestDspCDRsITMySQLWithoutAuth(t *testing.T) { - if *dbType != utils.MetaSQL { + if *dbType != utils.MetaMySQL { t.SkipNow() } if *encoding == utils.MetaGOB { diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index 511d26955..e44f49c6d 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -46,7 +46,7 @@ func TestDspChargerST(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/config_it_test.go b/dispatchers/config_it_test.go index c45de7de1..9625a713c 100644 --- a/dispatchers/config_it_test.go +++ b/dispatchers/config_it_test.go @@ -38,7 +38,7 @@ func TestDspConfigIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/guardian_it_test.go b/dispatchers/guardian_it_test.go index e3770d5ab..1322cbca9 100644 --- a/dispatchers/guardian_it_test.go +++ b/dispatchers/guardian_it_test.go @@ -39,7 +39,7 @@ func TestDspGuardianST(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/rals_it_test.go b/dispatchers/rals_it_test.go index 4012ea36c..9bfcf6244 100644 --- a/dispatchers/rals_it_test.go +++ b/dispatchers/rals_it_test.go @@ -38,7 +38,7 @@ func TestDspRALsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index b3ad0d0e7..ecd371da1 100755 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -43,7 +43,7 @@ func TestDspResourceSIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 45d92289a..51422e00a 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -42,7 +42,7 @@ func TestDspResponder(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/scheduler_it_test.go b/dispatchers/scheduler_it_test.go index bcd767d3c..dcc129618 100644 --- a/dispatchers/scheduler_it_test.go +++ b/dispatchers/scheduler_it_test.go @@ -37,7 +37,7 @@ func TestDspSchedulerS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 79dc18dda..01f4d5fff 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -62,7 +62,7 @@ func TestDspSessionS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 7f4a0a83f..10b5e0f00 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -46,7 +46,7 @@ func TestDspStatS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/suppliers_it_test.go b/dispatchers/suppliers_it_test.go index 8c48b0dbc..ba0fe07e3 100755 --- a/dispatchers/suppliers_it_test.go +++ b/dispatchers/suppliers_it_test.go @@ -47,7 +47,7 @@ func TestDspSupplierS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index 6b90f7041..6d1cd00e8 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -46,7 +46,7 @@ func TestDspThresholdS(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: config1 = "all_mysql" config2 = "all2_mysql" config3 = "dispatchers_mysql" diff --git a/engine/actions2_it_test.go b/engine/actions2_it_test.go index dbc239609..c63494262 100644 --- a/engine/actions2_it_test.go +++ b/engine/actions2_it_test.go @@ -55,7 +55,7 @@ func TestActionsITRemoveSMCost(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: actsCfgDir = "actions_mysql" case utils.MetaMongo: actsCfgDir = "cdrsv2mongo" @@ -86,7 +86,7 @@ func testActionsInitCdrsStore(t *testing.T) { switch *dbType { case utils.MetaInternal: actsCdrStore = NewInternalDB(actsCfg.StorDbCfg().StringIndexedFields, actsCfg.StorDbCfg().PrefixIndexedFields, true, actsCfg.StorDbCfg().Items) - case utils.MetaSQL: + case utils.MetaMySQL: if actsCdrStore, err = NewMySQLStorage(actsCfg.StorDbCfg().Host, actsCfg.StorDbCfg().Port, actsCfg.StorDbCfg().Name, actsCfg.StorDbCfg().User, actsCfg.StorDbCfg().Password, diff --git a/engine/actions_it_test.go b/engine/actions_it_test.go index 436c7fbbe..54da24ce7 100644 --- a/engine/actions_it_test.go +++ b/engine/actions_it_test.go @@ -58,7 +58,7 @@ func TestActionsit(t *testing.T) { switch *dbType { case utils.MetaInternal: actionsConfigDIR = "actions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: actionsConfigDIR = "actions_mysql" case utils.MetaMongo: actionsConfigDIR = "actions_mongo" diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go index 87ab3d800..b30243d44 100644 --- a/engine/datamanager_it_test.go +++ b/engine/datamanager_it_test.go @@ -49,7 +49,7 @@ func TestDMitinitDB(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: dataDB, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, diff --git a/engine/filterindexer_it_test.go b/engine/filterindexer_it_test.go index 21ded98f6..425c7e086 100644 --- a/engine/filterindexer_it_test.go +++ b/engine/filterindexer_it_test.go @@ -68,7 +68,7 @@ func TestFilterIndexerIT(t *testing.T) { case utils.MetaInternal: dataManager = NewDataManager(NewInternalDB(nil, nil, true, config.CgrConfig().DataDbCfg().Items), config.CgrConfig().CacheCfg(), nil) - case utils.MetaSQL: + case utils.MetaMySQL: cfg, _ := config.NewDefaultCGRConfig() redisDB, err := NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), diff --git a/engine/loader_it_test.go b/engine/loader_it_test.go index 371056128..f5ee3f363 100644 --- a/engine/loader_it_test.go +++ b/engine/loader_it_test.go @@ -59,7 +59,7 @@ func TestLoaderIT(t *testing.T) { switch *dbType { case utils.MetaInternal: loaderConfigDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: loaderConfigDIR = "tutmysql" case utils.MetaMongo: loaderConfigDIR = "tutmongo" diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go index 1b1424afe..4b31adf9e 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -88,7 +88,7 @@ func TestOnStorIT(t *testing.T) { sleepDelay = 10 * time.Millisecond onStor = NewDataManager(NewInternalDB(nil, nil, true, config.CgrConfig().DataDbCfg().Items), config.CgrConfig().CacheCfg(), nil) - case utils.MetaSQL: + case utils.MetaMySQL: cfg, _ := config.NewDefaultCGRConfig() rdsITdb, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), diff --git a/engine/storage_cdrs_it_test.go b/engine/storage_cdrs_it_test.go index 4af662668..d6e5ef8f7 100644 --- a/engine/storage_cdrs_it_test.go +++ b/engine/storage_cdrs_it_test.go @@ -36,7 +36,7 @@ func TestITCDRs(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsConfigDIR = "internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdrsConfigDIR = "mysql" case utils.MetaMongo: cdrsConfigDIR = "mongo" diff --git a/engine/stordb_it_test.go b/engine/stordb_it_test.go index 6aa2ef13a..a8b4e8f18 100644 --- a/engine/stordb_it_test.go +++ b/engine/stordb_it_test.go @@ -68,7 +68,7 @@ func TestStorDBit(t *testing.T) { } config.SetCgrConfig(cfg) storDB = NewInternalDB(nil, nil, false, cfg.StorDbCfg().Items) - case utils.MetaSQL: + case utils.MetaMySQL: if cfg, err = config.NewCGRConfigFromPath(path.Join(*dataDir, "conf", "samples", "storage", "mysql")); err != nil { t.Fatal(err) } diff --git a/engine/versions_it_test.go b/engine/versions_it_test.go index 48d6f8618..e6a0de3f7 100644 --- a/engine/versions_it_test.go +++ b/engine/versions_it_test.go @@ -46,7 +46,7 @@ func TestVersionsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: versionsConfigDIR = "tutmysql" case utils.MetaMongo: versionsConfigDIR = "tutmongo" diff --git a/ers/ers_reload_it_test.go b/ers/ers_reload_it_test.go index 74fa3920d..248d770b2 100644 --- a/ers/ers_reload_it_test.go +++ b/ers/ers_reload_it_test.go @@ -54,7 +54,7 @@ func TestERsReload(t *testing.T) { switch *dbType { case utils.MetaInternal: ersReloadConfigDIR = "disabled_internal" - case utils.MetaSQL: + case utils.MetaMySQL: ersReloadConfigDIR = "disabled_mysql" case utils.MetaMongo: ersReloadConfigDIR = "disabled_mongo" diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go index a14ca9f19..daad4b9ee 100644 --- a/ers/filecsv_it_test.go +++ b/ers/filecsv_it_test.go @@ -83,7 +83,7 @@ func TestCsvReadFile(t *testing.T) { switch *dbType { case utils.MetaInternal: csvCfgDIR = "ers_internal" - case utils.MetaSQL: + case utils.MetaMySQL: csvCfgDIR = "ers_mysql" case utils.MetaMongo: csvCfgDIR = "ers_mongo" diff --git a/ers/filefwv_it_test.go b/ers/filefwv_it_test.go index 07b84b9a9..fa7899f2e 100644 --- a/ers/filefwv_it_test.go +++ b/ers/filefwv_it_test.go @@ -59,7 +59,7 @@ func TestFWVReadFile(t *testing.T) { switch *dbType { case utils.MetaInternal: fwvCfgDIR = "ers_internal" - case utils.MetaSQL: + case utils.MetaMySQL: fwvCfgDIR = "ers_mysql" case utils.MetaMongo: fwvCfgDIR = "ers_mongo" diff --git a/ers/filexml_it_test.go b/ers/filexml_it_test.go index 123066b37..af1d0f013 100644 --- a/ers/filexml_it_test.go +++ b/ers/filexml_it_test.go @@ -58,7 +58,7 @@ func TestXMLReadFile(t *testing.T) { switch *dbType { case utils.MetaInternal: xmlCfgDIR = "ers_internal" - case utils.MetaSQL: + case utils.MetaMySQL: xmlCfgDIR = "ers_mysql" case utils.MetaMongo: xmlCfgDIR = "ers_mongo" diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go index 00a24530c..c6a4fdbf3 100644 --- a/ers/flatstore_it_test.go +++ b/ers/flatstore_it_test.go @@ -78,7 +78,7 @@ func TestFlatstoreFile(t *testing.T) { switch *dbType { case utils.MetaInternal: flatstoreCfgDIR = "ers_internal" - case utils.MetaSQL: + case utils.MetaMySQL: flatstoreCfgDIR = "ers_mysql" case utils.MetaMongo: flatstoreCfgDIR = "ers_mongo" diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go index 85dbf0837..6685e148b 100644 --- a/ers/partial_csv_it_test.go +++ b/ers/partial_csv_it_test.go @@ -76,7 +76,7 @@ func TestPartReadFile(t *testing.T) { switch *dbType { case utils.MetaInternal: partCfgDIR = "ers_internal" - case utils.MetaSQL: + case utils.MetaMySQL: partCfgDIR = "ers_mysql" case utils.MetaMongo: partCfgDIR = "ers_mongo" diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index d486b6fea..95b482e7a 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -60,7 +60,7 @@ func TestA1It(t *testing.T) { switch *dbType { case utils.MetaInternal: a1ConfigDir = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: a1ConfigDir = "tutmysql" case utils.MetaMongo: a1ConfigDir = "tutmongo" diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index ac2a0cbeb..3b4d79ce8 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -65,7 +65,7 @@ func TestAccIT(t *testing.T) { switch *dbType { case utils.MetaInternal: accConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: accConfDIR = "tutmysql" case utils.MetaMongo: accConfDIR = "tutmongo" diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index aa6ddff1b..15cf9bc68 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -59,7 +59,7 @@ func TestBrodcastRPC(t *testing.T) { switch *dbType { case utils.MetaInternal: brodcastInternalCfgDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: brodcastInternalCfgDIR = "tutmysql" case utils.MetaMongo: brodcastInternalCfgDIR = "tutmongo" diff --git a/general_tests/cdre_it_test.go b/general_tests/cdre_it_test.go index 9a7f627ec..254843836 100644 --- a/general_tests/cdre_it_test.go +++ b/general_tests/cdre_it_test.go @@ -56,7 +56,7 @@ func TestCDREIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdreConfigDIR = "tutinternal_new" - case utils.MetaSQL: + case utils.MetaMySQL: cdreConfigDIR = "tutmysql" case utils.MetaMongo: cdreConfigDIR = "tutmongonew" diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go index 3ebc71434..979fb9bec 100644 --- a/general_tests/cdrs_internal_it_test.go +++ b/general_tests/cdrs_internal_it_test.go @@ -54,7 +54,7 @@ func TestCdrsIntIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsIntCfgDIR = "internal_ttl_internal" - case utils.MetaSQL: + case utils.MetaMySQL: t.SkipNow() case utils.MetaMongo: t.SkipNow() diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index 53d32630d..e4472543a 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -83,7 +83,7 @@ func TestCDRsIT(t *testing.T) { switch *dbType { case utils.MetaInternal: cdrsConfDIR = "cdrsv2internal" - case utils.MetaSQL: + case utils.MetaMySQL: cdrsConfDIR = "cdrsv2mysql" case utils.MetaMongo: cdrsConfDIR = "cdrsv2mongo" diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index a1bf711b2..51911fe53 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -71,7 +71,7 @@ func TestCDRsOnExp(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: cdrsMasterCfgDIR = "cdrsonexpmaster_mysql" cdrsSlaveCfgDIR = "cdrsonexpslave_mysql" case utils.MetaMongo: diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index ae5503661..5ac24409f 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -66,7 +66,7 @@ func TestCDRsITPE(t *testing.T) { switch *dbType { case utils.MetaInternal: pecdrsConfDIR = "cdrsv1processevent" - case utils.MetaSQL: + case utils.MetaMySQL: pecdrsConfDIR = "cdrsv1processeventmysql" case utils.MetaMongo: pecdrsConfDIR = "cdrsv1processeventmongo" diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 469973317..3c917f725 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -64,7 +64,7 @@ func TestDataIT(t *testing.T) { switch *dbType { case utils.MetaInternal: dataConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: dataConfDIR = "tutmysql" case utils.MetaMongo: dataConfDIR = "tutmongo" diff --git a/general_tests/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go index 113480e9f..375123c86 100644 --- a/general_tests/destination_combined_it_test.go +++ b/general_tests/destination_combined_it_test.go @@ -49,7 +49,7 @@ func TestDestinationCombines(t *testing.T) { switch *dbType { case utils.MetaInternal: tutorialConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tutorialConfDIR = "tutmysql" case utils.MetaMongo: tutorialConfDIR = "tutmongo" diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index fdb2875e8..cc0332e59 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -62,7 +62,7 @@ func TestFltrIT(t *testing.T) { switch *dbType { case utils.MetaInternal: fltrConfDIR = "filters_internal" - case utils.MetaSQL: + case utils.MetaMySQL: fltrConfDIR = "filters_mysql" case utils.MetaMongo: fltrConfDIR = "filters_mongo" diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index b34bfbb4e..9573d2dbd 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -55,7 +55,7 @@ func TestRsV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: rlsV1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: rlsV1ConfDIR = "tutmysql" case utils.MetaMongo: rlsV1ConfDIR = "tutmongo" diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index c07cd8e58..ed076a15a 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -73,7 +73,7 @@ func TestRPCMethods(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: rpcConfDIR = "rpccaching_mysql" case utils.MetaMongo: rpcConfDIR = "rpccaching_mongo" diff --git a/general_tests/rpcclient_it_test.go b/general_tests/rpcclient_it_test.go index beeadceec..af25cf1c1 100644 --- a/general_tests/rpcclient_it_test.go +++ b/general_tests/rpcclient_it_test.go @@ -77,7 +77,7 @@ func TestRPCITLcl(t *testing.T) { case utils.MetaInternal: rpcITCfgDIR1 = "multiral1_internal" rpcITCfgDIR2 = "multiral2_internal" - case utils.MetaSQL: + case utils.MetaMySQL: rpcITCfgDIR1 = "multiral1_mysql" rpcITCfgDIR2 = "multiral2_mysql" case utils.MetaMongo: diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index e670840ef..c6f70bf07 100755 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -67,7 +67,7 @@ func TestRedisSentinel(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: case utils.MetaMongo: t.SkipNow() case utils.MetaPostgres: diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index abf5f1115..8cc7ad839 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -55,7 +55,7 @@ func TestSes2It(t *testing.T) { switch *dbType { case utils.MetaInternal: ses2CfgDir = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: ses2CfgDir = "tutmysql" case utils.MetaMongo: ses2CfgDir = "tutmongo" diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 81c1fc72c..db3bea75f 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -66,7 +66,7 @@ func TestSes3ItSessions(t *testing.T) { switch *dbType { case utils.MetaInternal: ses3CfgDir = "sessions_internal" - case utils.MetaSQL: + case utils.MetaMySQL: ses3CfgDir = "sessions_mysql" case utils.MetaMongo: ses3CfgDir = "sessions_mongo" diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index a7cac7137..25aca1944 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -57,7 +57,7 @@ func TestSesIt(t *testing.T) { switch *dbType { case utils.MetaInternal: sesCfgDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: sesCfgDIR = "tutmysql_internal" case utils.MetaMongo: sesCfgDIR = "tutmongo" diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 886737d41..61d36aa5f 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -58,7 +58,7 @@ func TestSessionSRpl(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: smgRplcMasterCfgDIR = "smgreplcmaster_mysql" smgRplcSlaveCfgDIR = "smgreplcslave_mysql" case utils.MetaMongo: diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index a5747797c..8e6511e82 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -60,7 +60,7 @@ func TestSrIt(t *testing.T) { switch *dbType { case utils.MetaInternal: srCfgDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: srCfgDIR = "tutmysql_internal" case utils.MetaMongo: srCfgDIR = "tutmongo" diff --git a/general_tests/supplier_it_test.go b/general_tests/supplier_it_test.go index 2bfc5a89d..fe95b39b3 100644 --- a/general_tests/supplier_it_test.go +++ b/general_tests/supplier_it_test.go @@ -65,7 +65,7 @@ func TestSuplSV1IT(t *testing.T) { switch *dbType { case utils.MetaInternal: splSv1ConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: splSv1ConfDIR = "tutmysql" case utils.MetaMongo: splSv1ConfDIR = "tutmongo" diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index 8174ebf82..124dc0151 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -66,7 +66,7 @@ func TestTp(t *testing.T) { switch *dbType { case utils.MetaInternal: tpCfgDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tpCfgDIR = "tutmysql" case utils.MetaMongo: tpCfgDIR = "tutmongo" diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 15b9a5e31..eb69eabe2 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -56,7 +56,7 @@ func TestTutSMG(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: tutSMGCfgDIR = "smgeneric_mysql" case utils.MetaMongo: t.SkipNow() diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go index 73dd7ce68..e7750e857 100644 --- a/general_tests/tutorial2_it_test.go +++ b/general_tests/tutorial2_it_test.go @@ -57,7 +57,7 @@ func TestTutorial2(t *testing.T) { switch *dbType { case utils.MetaInternal: tutCfgDir = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tutCfgDir = "tutmysql2" case utils.MetaMongo: tutCfgDir = "tutmongo2" diff --git a/general_tests/tutorial_it_test.go b/general_tests/tutorial_it_test.go index 4311ebb22..731aa950d 100644 --- a/general_tests/tutorial_it_test.go +++ b/general_tests/tutorial_it_test.go @@ -67,7 +67,7 @@ func TestTutorial(t *testing.T) { switch *dbType { case utils.MetaInternal: tutorialConfDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: tutorialConfDIR = "tutmysql" case utils.MetaMongo: tutorialConfDIR = "tutmongo" diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go index 31f61087e..b28d0bf38 100644 --- a/loaders/loader_it_test.go +++ b/loaders/loader_it_test.go @@ -60,7 +60,7 @@ func TestLoaderIT(t *testing.T) { switch *dbType { case utils.MetaInternal: loaderCfgDIR = "tutinternal" - case utils.MetaSQL: + case utils.MetaMySQL: loaderCfgDIR = "tutmysql" case utils.MetaMongo: loaderCfgDIR = "tutmongo" diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 7c226a914..84e7aea50 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -56,7 +56,7 @@ func TestSessionsBiRPC(t *testing.T) { switch *dbType { case utils.MetaInternal: sessionsBiRPCCfgDIR = "smg_automatic_debits_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sessionsBiRPCCfgDIR = "smg_automatic_debits_mysql" case utils.MetaMongo: sessionsBiRPCCfgDIR = "smg_automatic_debits_mongo" diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index b52fd7748..4c97f07a9 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -58,7 +58,7 @@ func TestSessionsData(t *testing.T) { switch *dbType { case utils.MetaInternal: dataCfgDIR = "smg_internal" - case utils.MetaSQL: + case utils.MetaMySQL: dataCfgDIR = "smg_mysql" case utils.MetaMongo: dataCfgDIR = "smg_mongo" diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index cc651beef..03e9a9b2f 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -56,7 +56,7 @@ func TestSessionsIt(t *testing.T) { switch *dbType { case utils.MetaInternal: sItCfgDIR = "smg_internal" - case utils.MetaSQL: + case utils.MetaMySQL: sItCfgDIR = "smg_mysql" case utils.MetaMongo: sItCfgDIR = "smg_mongo" diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 1e0916739..886f42167 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -56,7 +56,7 @@ func TestSessionSRpl(t *testing.T) { switch *dbType { case utils.MetaInternal: t.SkipNow() - case utils.MetaSQL: + case utils.MetaMySQL: smgRplcMasterCfgDIR = "smgreplcmaster_mysql" smgRplcSlaveCfgDIR = "smgreplcslave_mysql" case utils.MetaMongo: diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 9dcb6182e..ddf7b4569 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -61,7 +61,7 @@ func TestSessionsVoice(t *testing.T) { switch *dbType { case utils.MetaInternal: voiceCfgDIR = "smg_internal" - case utils.MetaSQL: + case utils.MetaMySQL: voiceCfgDIR = "smg_mysql" case utils.MetaMongo: voiceCfgDIR = "smg_mongo" diff --git a/utils/consts.go b/utils/consts.go index c8adaf17b..fa9a1085d 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -284,6 +284,7 @@ const ( MetaSQSjsonMap = "*sqs_json_map" MetaKafkajsonMap = "*kafka_json_map" MetaSQL = "*sql" + MetaMySQL = "*mysql" MetaS3jsonMap = "*s3_json_map" CONFIG_PATH = "/etc/cgrates/" DISCONNECT_CAUSE = "DisconnectCause"