From 3a1d781f78b757b2f89dc752b1e2d72ee336d2d1 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 24 Oct 2019 12:53:19 +0300 Subject: [PATCH] Updated integration tests --- data/conf/cgrates/cgrates.json | 9 +++++++-- engine/storage_cdrs_it_test.go | 21 ++++++++++++--------- migrator/accounts2_it_test.go | 15 ++++++--------- migrator/cdrs_it_test.go | 20 ++++++++------------ migrator/session_costs_it_test.go | 20 ++++++++------------ migrator/tp_account_actions_it_test.go | 22 ++++++++++------------ migrator/tp_action_plans_it_test.go | 20 ++++++++------------ migrator/tp_action_triggers_it_test.go | 20 ++++++++------------ migrator/tp_actions_it_test.go | 20 ++++++++------------ migrator/tp_destination_rates_it_test.go | 20 ++++++++------------ migrator/tp_destinations_it_test.go | 20 ++++++++------------ migrator/tp_dispatchers_it_test.go | 20 ++++++++------------ migrator/tp_filters_it_test.go | 20 ++++++++------------ migrator/tp_rates_it_test.go | 20 ++++++++------------ migrator/tp_rating_plans_it_test.go | 20 ++++++++------------ migrator/tp_rating_profiles_it_test.go | 20 ++++++++------------ migrator/tp_resources_it_test.go | 20 ++++++++------------ migrator/tp_shared_groups_it_test.go | 20 ++++++++------------ migrator/tp_stats_it_test.go | 20 ++++++++------------ migrator/tp_suppliers_it_test.go | 20 ++++++++------------ migrator/tp_thresholds_it_test.go | 20 ++++++++------------ migrator/tp_timings_it_test.go | 20 ++++++++------------ migrator/versions_it_test.go | 7 +++---- 23 files changed, 182 insertions(+), 252 deletions(-) diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index 77ad138b0..6cfbf251c 100644 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -54,8 +54,10 @@ // "max_open_conns": 100, // maximum database connections opened, not applying for mongo // "max_idle_conns": 10, // maximum database connections idle, not applying for mongo // "conn_max_lifetime": 0, // maximum amount of time in seconds a connection may be reused (0 for unlimited), not applying for mongo -// "cdrs_indexes": [], // indexes on cdrs table to speed up queries, used only in case of mongo +// "string_indexed_fields": [], // indexes on cdrs table to speed up queries, used in case of *mongo and *internal +// "prefix_indexed_fields":[], // prefix indexes on cdrs table to speed up queries, used in case of *internal // "query_timeout":"10s", +// "sslmode":"disable", // sslmode in case of *postgres // }, @@ -154,6 +156,7 @@ // "*data": "107374182400", // "*sms": "10000" // }, +// "max_increments": 1000000, // "balance_rating_subject":{ // default rating subject in case that balance rating subject is empty // "*any": "*zero1ns", // "*voice": "*zero1s", @@ -800,7 +803,9 @@ // "caches_conns":[ // connections to CacheS for reloads // {"address": "*internal"}, // ], -// "scheduler_conns": [], // connections to SchedulerS for reloads +// "scheduler_conns": [ // connections to SchedulerS for reloads +// {"address": "*internal"} +// ], // "attributes_conns": [], // connections to AttributeS for CDRExporter // }, diff --git a/engine/storage_cdrs_it_test.go b/engine/storage_cdrs_it_test.go index 74a91054c..a8f99782f 100644 --- a/engine/storage_cdrs_it_test.go +++ b/engine/storage_cdrs_it_test.go @@ -103,9 +103,10 @@ func testSetCDR(cfg *config.CGRConfig) error { cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().MaxOpenConns, - cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, - cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields) + cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, + cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, + cfg.StorDbCfg().PrefixIndexedFields) if err != nil { return err } @@ -209,9 +210,10 @@ func testSMCosts(cfg *config.CGRConfig) error { cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().MaxOpenConns, - cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, - cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields) + cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, + cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, + cfg.StorDbCfg().PrefixIndexedFields) if err != nil { return fmt.Errorf("testSMCosts #2 err: %v", err) } @@ -271,9 +273,10 @@ func testGetCDRs(cfg *config.CGRConfig) error { cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().MaxOpenConns, - cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, - cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields) + cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, + cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, + cfg.StorDbCfg().PrefixIndexedFields) if err != nil { return fmt.Errorf("testGetCDRs #2: %v", err) } diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 30232a702..95537700e 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -84,11 +84,9 @@ func testAcc2ITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(acc2CfgIn.StorDbCfg().Type, acc2CfgIn.StorDbCfg().Host, acc2CfgIn.StorDbCfg().Port, acc2CfgIn.StorDbCfg().Name, acc2CfgIn.StorDbCfg().User, - acc2CfgIn.StorDbCfg().Password, - acc2CfgIn.StorDbCfg().MaxOpenConns, - acc2CfgIn.StorDbCfg().MaxIdleConns, - acc2CfgIn.StorDbCfg().ConnMaxLifetime, - acc2CfgIn.StorDbCfg().StringIndexedFields, + acc2CfgIn.StorDbCfg().Password, acc2CfgIn.StorDbCfg().SSLMode, + acc2CfgIn.StorDbCfg().MaxOpenConns, acc2CfgIn.StorDbCfg().MaxIdleConns, + acc2CfgIn.StorDbCfg().ConnMaxLifetime, acc2CfgIn.StorDbCfg().StringIndexedFields, acc2CfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) @@ -96,10 +94,9 @@ func testAcc2ITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(acc2CfgOut.StorDbCfg().Type, acc2CfgOut.StorDbCfg().Host, acc2CfgOut.StorDbCfg().Port, acc2CfgOut.StorDbCfg().Name, acc2CfgOut.StorDbCfg().User, - acc2CfgOut.StorDbCfg().Password, acc2CfgOut.StorDbCfg().MaxOpenConns, - acc2CfgOut.StorDbCfg().MaxIdleConns, - acc2CfgOut.StorDbCfg().ConnMaxLifetime, - acc2CfgOut.StorDbCfg().StringIndexedFields, + acc2CfgOut.StorDbCfg().Password, acc2CfgIn.StorDbCfg().SSLMode, + acc2CfgOut.StorDbCfg().MaxOpenConns, acc2CfgOut.StorDbCfg().MaxIdleConns, + acc2CfgOut.StorDbCfg().ConnMaxLifetime, acc2CfgOut.StorDbCfg().StringIndexedFields, acc2CfgOut.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 4f03e28f4..41e43a02c 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -75,24 +75,20 @@ func testCdrITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(cdrCfgIn.StorDbCfg().Type, cdrCfgIn.StorDbCfg().Host, cdrCfgIn.StorDbCfg().Port, cdrCfgIn.StorDbCfg().Name, cdrCfgIn.StorDbCfg().User, - cdrCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + cdrCfgIn.StorDbCfg().Password, cdrCfgIn.StorDbCfg().SSLMode, + cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, + cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, + cdrCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) } storDBOut, err := NewMigratorStorDB(cdrCfgIn.StorDbCfg().Type, cdrCfgIn.StorDbCfg().Host, cdrCfgIn.StorDbCfg().Port, cdrCfgIn.StorDbCfg().Name, cdrCfgIn.StorDbCfg().User, - cdrCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + cdrCfgIn.StorDbCfg().Password, cdrCfgIn.StorDbCfg().SSLMode, + cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, + cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, + cdrCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) } diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index 6027fa26c..ff9084e98 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -85,24 +85,20 @@ func testSessionCostITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(sCostCfgIn.StorDbCfg().Type, sCostCfgIn.StorDbCfg().Host, sCostCfgIn.StorDbCfg().Port, sCostCfgIn.StorDbCfg().Name, sCostCfgIn.StorDbCfg().User, - sCostCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + sCostCfgIn.StorDbCfg().Password, sCostCfgIn.StorDbCfg().SSLMode, + sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, + sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, + sCostCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) } storDBOut, err := NewMigratorStorDB(sCostCfgOut.StorDbCfg().Type, sCostCfgOut.StorDbCfg().Host, sCostCfgOut.StorDbCfg().Port, sCostCfgOut.StorDbCfg().Name, sCostCfgOut.StorDbCfg().User, - sCostCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + sCostCfgOut.StorDbCfg().Password, sCostCfgIn.StorDbCfg().SSLMode, + sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, + sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, + sCostCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err) } diff --git a/migrator/tp_account_actions_it_test.go b/migrator/tp_account_actions_it_test.go index 986399ae2..cba96b3ae 100644 --- a/migrator/tp_account_actions_it_test.go +++ b/migrator/tp_account_actions_it_test.go @@ -70,24 +70,22 @@ func testTpAccActITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpAccActCfgIn.StorDbCfg().Type, tpAccActCfgIn.StorDbCfg().Host, tpAccActCfgIn.StorDbCfg().Port, tpAccActCfgIn.StorDbCfg().Name, tpAccActCfgIn.StorDbCfg().User, - tpAccActCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpAccActCfgIn.StorDbCfg().Password, tpAccActCfgIn.StorDbCfg().SSLMode, + tpAccActCfgIn.StorDbCfg().MaxOpenConns, + tpAccActCfgIn.StorDbCfg().MaxIdleConns, + tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, + tpAccActCfgIn.StorDbCfg().StringIndexedFields, + tpAccActCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpAccActCfgOut.StorDbCfg().Type, tpAccActCfgOut.StorDbCfg().Host, tpAccActCfgOut.StorDbCfg().Port, tpAccActCfgOut.StorDbCfg().Name, tpAccActCfgOut.StorDbCfg().User, - tpAccActCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpAccActCfgOut.StorDbCfg().Password, tpAccActCfgIn.StorDbCfg().SSLMode, + tpAccActCfgIn.StorDbCfg().MaxOpenConns, tpAccActCfgIn.StorDbCfg().MaxIdleConns, + tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, tpAccActCfgIn.StorDbCfg().StringIndexedFields, + tpAccActCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_action_plans_it_test.go b/migrator/tp_action_plans_it_test.go index 11822cf18..faa5dc5f4 100644 --- a/migrator/tp_action_plans_it_test.go +++ b/migrator/tp_action_plans_it_test.go @@ -70,24 +70,20 @@ func testTpActPlnITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpActPlnCfgIn.StorDbCfg().Type, tpActPlnCfgIn.StorDbCfg().Host, tpActPlnCfgIn.StorDbCfg().Port, tpActPlnCfgIn.StorDbCfg().Name, tpActPlnCfgIn.StorDbCfg().User, - tpActPlnCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActPlnCfgIn.StorDbCfg().Password, tpActPlnCfgIn.StorDbCfg().SSLMode, + tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, + tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, + tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpActPlnCfgOut.StorDbCfg().Type, tpActPlnCfgOut.StorDbCfg().Host, tpActPlnCfgOut.StorDbCfg().Port, tpActPlnCfgOut.StorDbCfg().Name, tpActPlnCfgOut.StorDbCfg().User, - tpActPlnCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActPlnCfgOut.StorDbCfg().Password, tpActPlnCfgIn.StorDbCfg().SSLMode, + tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, + tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, + tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_action_triggers_it_test.go b/migrator/tp_action_triggers_it_test.go index 5bb0abeb6..ba634159f 100644 --- a/migrator/tp_action_triggers_it_test.go +++ b/migrator/tp_action_triggers_it_test.go @@ -70,24 +70,20 @@ func testTpActTrgITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpActTrgCfgIn.StorDbCfg().Type, tpActTrgCfgIn.StorDbCfg().Host, tpActTrgCfgIn.StorDbCfg().Port, tpActTrgCfgIn.StorDbCfg().Name, tpActTrgCfgIn.StorDbCfg().User, - tpActTrgCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActTrgCfgIn.StorDbCfg().Password, tpActTrgCfgIn.StorDbCfg().SSLMode, + tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, + tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, + tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpActTrgCfgOut.StorDbCfg().Type, tpActTrgCfgOut.StorDbCfg().Host, tpActTrgCfgOut.StorDbCfg().Port, tpActTrgCfgOut.StorDbCfg().Name, tpActTrgCfgOut.StorDbCfg().User, - tpActTrgCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActTrgCfgOut.StorDbCfg().Password, tpActTrgCfgIn.StorDbCfg().SSLMode, + tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, + tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, + tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_actions_it_test.go b/migrator/tp_actions_it_test.go index af98f28e0..1936d23dc 100644 --- a/migrator/tp_actions_it_test.go +++ b/migrator/tp_actions_it_test.go @@ -70,24 +70,20 @@ func testTpActITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpActCfgIn.StorDbCfg().Type, tpActCfgIn.StorDbCfg().Host, tpActCfgIn.StorDbCfg().Port, tpActCfgIn.StorDbCfg().Name, tpActCfgIn.StorDbCfg().User, - tpActCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActCfgIn.StorDbCfg().Password, tpActCfgIn.StorDbCfg().SSLMode, + tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, + tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, + tpActCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpActCfgOut.StorDbCfg().Type, tpActCfgOut.StorDbCfg().Host, tpActCfgOut.StorDbCfg().Port, tpActCfgOut.StorDbCfg().Name, tpActCfgOut.StorDbCfg().User, - tpActCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpActCfgOut.StorDbCfg().Password, tpActCfgIn.StorDbCfg().SSLMode, + tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, + tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, + tpActCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_destination_rates_it_test.go b/migrator/tp_destination_rates_it_test.go index 7523ce090..bd43fc5db 100644 --- a/migrator/tp_destination_rates_it_test.go +++ b/migrator/tp_destination_rates_it_test.go @@ -70,24 +70,20 @@ func testTpDstRtITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpDstRtCfgIn.StorDbCfg().Type, tpDstRtCfgIn.StorDbCfg().Host, tpDstRtCfgIn.StorDbCfg().Port, tpDstRtCfgIn.StorDbCfg().Name, tpDstRtCfgIn.StorDbCfg().User, - tpDstRtCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDstRtCfgIn.StorDbCfg().Password, tpDstRtCfgIn.StorDbCfg().SSLMode, + tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, + tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, + tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpDstRtCfgOut.StorDbCfg().Type, tpDstRtCfgOut.StorDbCfg().Host, tpDstRtCfgOut.StorDbCfg().Port, tpDstRtCfgOut.StorDbCfg().Name, tpDstRtCfgOut.StorDbCfg().User, - tpDstRtCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDstRtCfgOut.StorDbCfg().Password, tpDstRtCfgIn.StorDbCfg().SSLMode, + tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, + tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, + tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_destinations_it_test.go b/migrator/tp_destinations_it_test.go index d3c7973c3..7cec2aa68 100644 --- a/migrator/tp_destinations_it_test.go +++ b/migrator/tp_destinations_it_test.go @@ -70,24 +70,20 @@ func testTpDstITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpDstCfgIn.StorDbCfg().Type, tpDstCfgIn.StorDbCfg().Host, tpDstCfgIn.StorDbCfg().Port, tpDstCfgIn.StorDbCfg().Name, tpDstCfgIn.StorDbCfg().User, - tpDstCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDstCfgIn.StorDbCfg().Password, tpDstCfgIn.StorDbCfg().SSLMode, + tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, + tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, + tpDstCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpDstCfgOut.StorDbCfg().Type, tpDstCfgOut.StorDbCfg().Host, tpDstCfgOut.StorDbCfg().Port, tpDstCfgOut.StorDbCfg().Name, tpDstCfgOut.StorDbCfg().User, - tpDstCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDstCfgOut.StorDbCfg().Password, tpDstCfgIn.StorDbCfg().SSLMode, + tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, + tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, + tpDstCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_dispatchers_it_test.go b/migrator/tp_dispatchers_it_test.go index 44ec6a1ad..e4ec738cd 100644 --- a/migrator/tp_dispatchers_it_test.go +++ b/migrator/tp_dispatchers_it_test.go @@ -70,24 +70,20 @@ func testTpDispITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpDispCfgIn.StorDbCfg().Type, tpDispCfgIn.StorDbCfg().Host, tpDispCfgIn.StorDbCfg().Port, tpDispCfgIn.StorDbCfg().Name, tpDispCfgIn.StorDbCfg().User, - tpDispCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDispCfgIn.StorDbCfg().Password, tpDispCfgIn.StorDbCfg().SSLMode, + tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, + tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, + tpDispCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpDispCfgOut.StorDbCfg().Type, tpDispCfgOut.StorDbCfg().Host, tpDispCfgOut.StorDbCfg().Port, tpDispCfgOut.StorDbCfg().Name, tpDispCfgOut.StorDbCfg().User, - tpDispCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpDispCfgOut.StorDbCfg().Password, tpDispCfgIn.StorDbCfg().SSLMode, + tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, + tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, + tpDispCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_filters_it_test.go b/migrator/tp_filters_it_test.go index a34127534..136e8033d 100755 --- a/migrator/tp_filters_it_test.go +++ b/migrator/tp_filters_it_test.go @@ -70,24 +70,20 @@ func testTpFltrITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpFltrCfgIn.StorDbCfg().Type, tpFltrCfgIn.StorDbCfg().Host, tpFltrCfgIn.StorDbCfg().Port, tpFltrCfgIn.StorDbCfg().Name, tpFltrCfgIn.StorDbCfg().User, - tpFltrCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpFltrCfgIn.StorDbCfg().Password, tpFltrCfgOut.StorDbCfg().SSLMode, + tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, + tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, + tpFltrCfgOut.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpFltrCfgOut.StorDbCfg().Type, tpFltrCfgOut.StorDbCfg().Host, tpFltrCfgOut.StorDbCfg().Port, tpFltrCfgOut.StorDbCfg().Name, tpFltrCfgOut.StorDbCfg().User, - tpFltrCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpFltrCfgOut.StorDbCfg().Password, tpFltrCfgOut.StorDbCfg().SSLMode, + tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, + tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, + tpFltrCfgOut.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_rates_it_test.go b/migrator/tp_rates_it_test.go index d0cc6ce2f..e09ca2d46 100644 --- a/migrator/tp_rates_it_test.go +++ b/migrator/tp_rates_it_test.go @@ -70,24 +70,20 @@ func testTpRatesITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpRatesCfgIn.StorDbCfg().Type, tpRatesCfgIn.StorDbCfg().Host, tpRatesCfgIn.StorDbCfg().Port, tpRatesCfgIn.StorDbCfg().Name, tpRatesCfgIn.StorDbCfg().User, - tpRatesCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatesCfgIn.StorDbCfg().Password, tpRatesCfgIn.StorDbCfg().SSLMode, + tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, + tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, + tpRatesCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpRatesCfgOut.StorDbCfg().Type, tpRatesCfgOut.StorDbCfg().Host, tpRatesCfgOut.StorDbCfg().Port, tpRatesCfgOut.StorDbCfg().Name, tpRatesCfgOut.StorDbCfg().User, - tpRatesCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatesCfgOut.StorDbCfg().Password, tpRatesCfgIn.StorDbCfg().SSLMode, + tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, + tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, + tpRatesCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_rating_plans_it_test.go b/migrator/tp_rating_plans_it_test.go index 13c5d07d0..5d1f56ba3 100644 --- a/migrator/tp_rating_plans_it_test.go +++ b/migrator/tp_rating_plans_it_test.go @@ -70,24 +70,20 @@ func testTpRatPlnITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpRatPlnCfgIn.StorDbCfg().Type, tpRatPlnCfgIn.StorDbCfg().Host, tpRatPlnCfgIn.StorDbCfg().Port, tpRatPlnCfgIn.StorDbCfg().Name, tpRatPlnCfgIn.StorDbCfg().User, - tpRatPlnCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatPlnCfgIn.StorDbCfg().Password, tpRatPlnCfgIn.StorDbCfg().SSLMode, + tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, + tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, + tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpRatPlnCfgOut.StorDbCfg().Type, tpRatPlnCfgOut.StorDbCfg().Host, tpRatPlnCfgOut.StorDbCfg().Port, tpRatPlnCfgOut.StorDbCfg().Name, tpRatPlnCfgOut.StorDbCfg().User, - tpRatPlnCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatPlnCfgOut.StorDbCfg().Password, tpRatPlnCfgIn.StorDbCfg().SSLMode, + tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, + tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, + tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_rating_profiles_it_test.go b/migrator/tp_rating_profiles_it_test.go index 73d7c9e62..903664068 100644 --- a/migrator/tp_rating_profiles_it_test.go +++ b/migrator/tp_rating_profiles_it_test.go @@ -70,24 +70,20 @@ func testTpRatPrfITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpRatPrfCfgIn.StorDbCfg().Type, tpRatPrfCfgIn.StorDbCfg().Host, tpRatPrfCfgIn.StorDbCfg().Port, tpRatPrfCfgIn.StorDbCfg().Name, tpRatPrfCfgIn.StorDbCfg().User, - tpRatPrfCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatPrfCfgIn.StorDbCfg().Password, tpRatPrfCfgIn.StorDbCfg().SSLMode, + tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, + tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, + tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpRatPrfCfgOut.StorDbCfg().Type, tpRatPrfCfgOut.StorDbCfg().Host, tpRatPrfCfgOut.StorDbCfg().Port, tpRatPrfCfgOut.StorDbCfg().Name, tpRatPrfCfgOut.StorDbCfg().User, - tpRatPrfCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpRatPrfCfgOut.StorDbCfg().Password, tpRatPrfCfgIn.StorDbCfg().SSLMode, + tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, + tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, + tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_resources_it_test.go b/migrator/tp_resources_it_test.go index 1c106b65a..0a7ee4980 100644 --- a/migrator/tp_resources_it_test.go +++ b/migrator/tp_resources_it_test.go @@ -71,24 +71,20 @@ func testTpResITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpResCfgIn.StorDbCfg().Type, tpResCfgIn.StorDbCfg().Host, tpResCfgIn.StorDbCfg().Port, tpResCfgIn.StorDbCfg().Name, tpResCfgIn.StorDbCfg().User, - tpResCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpResCfgIn.StorDbCfg().Password, tpResCfgIn.StorDbCfg().SSLMode, + tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, + tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, + tpResCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpResCfgOut.StorDbCfg().Type, tpResCfgOut.StorDbCfg().Host, tpResCfgOut.StorDbCfg().Port, tpResCfgOut.StorDbCfg().Name, tpResCfgOut.StorDbCfg().User, - tpResCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpResCfgOut.StorDbCfg().Password, tpResCfgIn.StorDbCfg().SSLMode, + tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, + tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, + tpResCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_shared_groups_it_test.go b/migrator/tp_shared_groups_it_test.go index 2de60c397..357f14d10 100644 --- a/migrator/tp_shared_groups_it_test.go +++ b/migrator/tp_shared_groups_it_test.go @@ -70,24 +70,20 @@ func testTpShrGrITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpShrGrCfgIn.StorDbCfg().Type, tpShrGrCfgIn.StorDbCfg().Host, tpShrGrCfgIn.StorDbCfg().Port, tpShrGrCfgIn.StorDbCfg().Name, tpShrGrCfgIn.StorDbCfg().User, - tpShrGrCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpShrGrCfgIn.StorDbCfg().Password, tpShrGrCfgIn.StorDbCfg().SSLMode, + tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, + tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, + tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpShrGrCfgOut.StorDbCfg().Type, tpShrGrCfgOut.StorDbCfg().Host, tpShrGrCfgOut.StorDbCfg().Port, tpShrGrCfgOut.StorDbCfg().Name, tpShrGrCfgOut.StorDbCfg().User, - tpShrGrCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpShrGrCfgOut.StorDbCfg().Password, tpShrGrCfgIn.StorDbCfg().SSLMode, + tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, + tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, + tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_stats_it_test.go b/migrator/tp_stats_it_test.go index 2d88b0fd4..127ada362 100644 --- a/migrator/tp_stats_it_test.go +++ b/migrator/tp_stats_it_test.go @@ -70,24 +70,20 @@ func testTpStatsITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpStatsCfgIn.StorDbCfg().Type, tpStatsCfgIn.StorDbCfg().Host, tpStatsCfgIn.StorDbCfg().Port, tpStatsCfgIn.StorDbCfg().Name, tpStatsCfgIn.StorDbCfg().User, - tpStatsCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpStatsCfgIn.StorDbCfg().Password, tpStatsCfgIn.StorDbCfg().SSLMode, + tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, + tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, + tpStatsCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpStatsCfgOut.StorDbCfg().Type, tpStatsCfgOut.StorDbCfg().Host, tpStatsCfgOut.StorDbCfg().Port, tpStatsCfgOut.StorDbCfg().Name, tpStatsCfgOut.StorDbCfg().User, - tpStatsCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpStatsCfgOut.StorDbCfg().Password, tpStatsCfgIn.StorDbCfg().SSLMode, + tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, + tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, + tpStatsCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_suppliers_it_test.go b/migrator/tp_suppliers_it_test.go index 06a9dabda..9db408b66 100644 --- a/migrator/tp_suppliers_it_test.go +++ b/migrator/tp_suppliers_it_test.go @@ -71,24 +71,20 @@ func testTpSplITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpSplCfgIn.StorDbCfg().Type, tpSplCfgIn.StorDbCfg().Host, tpSplCfgIn.StorDbCfg().Port, tpSplCfgIn.StorDbCfg().Name, tpSplCfgIn.StorDbCfg().User, - tpSplCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpSplCfgIn.StorDbCfg().Password, tpSplCfgIn.StorDbCfg().SSLMode, + tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, + tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, + tpSplCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpSplCfgOut.StorDbCfg().Type, tpSplCfgOut.StorDbCfg().Host, tpSplCfgOut.StorDbCfg().Port, tpSplCfgOut.StorDbCfg().Name, tpSplCfgOut.StorDbCfg().User, - tpSplCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpSplCfgOut.StorDbCfg().Password, tpSplCfgIn.StorDbCfg().SSLMode, + tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, + tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, + tpSplCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_thresholds_it_test.go b/migrator/tp_thresholds_it_test.go index 08cafa2f0..24785c4ab 100644 --- a/migrator/tp_thresholds_it_test.go +++ b/migrator/tp_thresholds_it_test.go @@ -71,24 +71,20 @@ func testTpTresITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpTresCfgIn.StorDbCfg().Type, tpTresCfgIn.StorDbCfg().Host, tpTresCfgIn.StorDbCfg().Port, tpTresCfgIn.StorDbCfg().Name, tpTresCfgIn.StorDbCfg().User, - tpTresCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpTresCfgIn.StorDbCfg().Password, tpTresCfgIn.StorDbCfg().SSLMode, + tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, + tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, + tpTresCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpTresCfgOut.StorDbCfg().Type, tpTresCfgOut.StorDbCfg().Host, tpTresCfgOut.StorDbCfg().Port, tpTresCfgOut.StorDbCfg().Name, tpTresCfgOut.StorDbCfg().User, - tpTresCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpTresCfgOut.StorDbCfg().Password, tpTresCfgIn.StorDbCfg().SSLMode, + tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, + tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, + tpTresCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_timings_it_test.go b/migrator/tp_timings_it_test.go index d3139d9c3..d396294ed 100644 --- a/migrator/tp_timings_it_test.go +++ b/migrator/tp_timings_it_test.go @@ -70,24 +70,20 @@ func testTpTimITConnect(t *testing.T) { storDBIn, err := NewMigratorStorDB(tpTimCfgIn.StorDbCfg().Type, tpTimCfgIn.StorDbCfg().Host, tpTimCfgIn.StorDbCfg().Port, tpTimCfgIn.StorDbCfg().Name, tpTimCfgIn.StorDbCfg().User, - tpTimCfgIn.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpTimCfgIn.StorDbCfg().Password, tpTimCfgIn.StorDbCfg().SSLMode, + tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, + tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, + tpTimCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } storDBOut, err := NewMigratorStorDB(tpTimCfgOut.StorDbCfg().Type, tpTimCfgOut.StorDbCfg().Host, tpTimCfgOut.StorDbCfg().Port, tpTimCfgOut.StorDbCfg().Name, tpTimCfgOut.StorDbCfg().User, - tpTimCfgOut.StorDbCfg().Password, - config.CgrConfig().StorDbCfg().MaxOpenConns, - config.CgrConfig().StorDbCfg().MaxIdleConns, - config.CgrConfig().StorDbCfg().ConnMaxLifetime, - config.CgrConfig().StorDbCfg().StringIndexedFields, - config.CgrConfig().StorDbCfg().PrefixIndexedFields) + tpTimCfgOut.StorDbCfg().Password, tpTimCfgIn.StorDbCfg().SSLMode, + tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, + tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, + tpTimCfgIn.StorDbCfg().PrefixIndexedFields) if err != nil { log.Fatal(err) } diff --git a/migrator/versions_it_test.go b/migrator/versions_it_test.go index 56026bf6c..930eeb07f 100644 --- a/migrator/versions_it_test.go +++ b/migrator/versions_it_test.go @@ -85,10 +85,9 @@ func testVrsITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(vrsCfg.StorDbCfg().Type, vrsCfg.StorDbCfg().Host, vrsCfg.StorDbCfg().Port, vrsCfg.StorDbCfg().Name, vrsCfg.StorDbCfg().User, - vrsCfg.StorDbCfg().Password, vrsCfg.StorDbCfg().MaxOpenConns, - vrsCfg.StorDbCfg().MaxIdleConns, - vrsCfg.StorDbCfg().ConnMaxLifetime, - vrsCfg.StorDbCfg().StringIndexedFields, + vrsCfg.StorDbCfg().Password, vrsCfg.StorDbCfg().SSLMode, + vrsCfg.StorDbCfg().MaxOpenConns, vrsCfg.StorDbCfg().MaxIdleConns, + vrsCfg.StorDbCfg().ConnMaxLifetime, vrsCfg.StorDbCfg().StringIndexedFields, vrsCfg.StorDbCfg().PrefixIndexedFields) if err != nil { t.Error(err)