From cc0da23eadf5a285fe3347d5f4d67d2672866a26 Mon Sep 17 00:00:00 2001 From: TeoV Date: Wed, 15 Jan 2020 10:57:07 +0200 Subject: [PATCH] Update integration test for migrator --- migrator/accounts2_it_test.go | 8 ++++---- migrator/accounts_it_test.go | 4 ++-- migrator/action_it_test.go | 4 ++-- migrator/action_plan_it_test.go | 4 ++-- migrator/action_trigger_it_test.go | 4 ++-- migrator/alias_it_test.go | 4 ++-- migrator/attributes_it_test.go | 4 ++-- migrator/cdrs_it_test.go | 4 ++-- migrator/chargers_it_test.go | 4 ++-- migrator/derived_chargers_it_test.go | 4 ++-- migrator/dispatchers_it_test.go | 4 ++-- migrator/filters_it_test.go | 4 ++-- migrator/load_ids_it_test.go | 4 ++-- migrator/rating_plan_it_test.go | 4 ++-- migrator/rating_profile_it_test.go | 4 ++-- migrator/resource_it_test.go | 4 ++-- migrator/session_costs_it_test.go | 4 ++-- migrator/sharedgroup_it_test.go | 4 ++-- migrator/stats_it_test.go | 4 ++-- migrator/suppliers_it_test.go | 4 ++-- migrator/thresholds_it_test.go | 4 ++-- migrator/tp_account_actions_it_test.go | 10 ++++------ migrator/tp_action_plans_it_test.go | 4 ++-- migrator/tp_action_triggers_it_test.go | 4 ++-- migrator/tp_actions_it_test.go | 4 ++-- migrator/tp_destination_rates_it_test.go | 4 ++-- migrator/tp_destinations_it_test.go | 4 ++-- migrator/tp_dispatchers_it_test.go | 4 ++-- migrator/tp_filters_it_test.go | 4 ++-- migrator/tp_rates_it_test.go | 4 ++-- migrator/tp_rating_plans_it_test.go | 4 ++-- migrator/tp_rating_profiles_it_test.go | 4 ++-- migrator/tp_resources_it_test.go | 4 ++-- migrator/tp_shared_groups_it_test.go | 4 ++-- migrator/tp_stats_it_test.go | 4 ++-- migrator/tp_suppliers_it_test.go | 4 ++-- migrator/tp_thresholds_it_test.go | 4 ++-- migrator/tp_timings_it_test.go | 4 ++-- migrator/user_it_test.go | 4 ++-- migrator/versions_it_test.go | 4 ++-- 40 files changed, 84 insertions(+), 86 deletions(-) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 5e3d08e93..a5b9e9d59 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -68,7 +68,7 @@ func testAcc2ITConnect(t *testing.T) { acc2CfgIn.DataDbCfg().DataDbHost, acc2CfgIn.DataDbCfg().DataDbPort, acc2CfgIn.DataDbCfg().DataDbName, acc2CfgIn.DataDbCfg().DataDbUser, acc2CfgIn.DataDbCfg().DataDbPass, acc2CfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", acc2CfgIn.DataDbCfg().Items) if err != nil { t.Error(err) } @@ -76,7 +76,7 @@ func testAcc2ITConnect(t *testing.T) { acc2CfgOut.DataDbCfg().DataDbHost, acc2CfgOut.DataDbCfg().DataDbPort, acc2CfgOut.DataDbCfg().DataDbName, acc2CfgOut.DataDbCfg().DataDbUser, acc2CfgOut.DataDbCfg().DataDbPass, acc2CfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", acc2CfgOut.DataDbCfg().Items) if err != nil { t.Error(err) } @@ -87,7 +87,7 @@ func testAcc2ITConnect(t *testing.T) { acc2CfgIn.StorDbCfg().Password, acc2CfgIn.StorDbCfg().SSLMode, acc2CfgIn.StorDbCfg().MaxOpenConns, acc2CfgIn.StorDbCfg().MaxIdleConns, acc2CfgIn.StorDbCfg().ConnMaxLifetime, acc2CfgIn.StorDbCfg().StringIndexedFields, - acc2CfgIn.StorDbCfg().PrefixIndexedFields) + acc2CfgIn.StorDbCfg().PrefixIndexedFields, acc2CfgIn.StorDbCfg().Items) if err != nil { t.Error(err) } @@ -97,7 +97,7 @@ func testAcc2ITConnect(t *testing.T) { acc2CfgOut.StorDbCfg().Password, acc2CfgIn.StorDbCfg().SSLMode, acc2CfgOut.StorDbCfg().MaxOpenConns, acc2CfgOut.StorDbCfg().MaxIdleConns, acc2CfgOut.StorDbCfg().ConnMaxLifetime, acc2CfgOut.StorDbCfg().StringIndexedFields, - acc2CfgOut.StorDbCfg().PrefixIndexedFields) + acc2CfgOut.StorDbCfg().PrefixIndexedFields, acc2CfgOut.StorDbCfg().Items) if err != nil { t.Error(err) } diff --git a/migrator/accounts_it_test.go b/migrator/accounts_it_test.go index aeef9136b..18e25395c 100755 --- a/migrator/accounts_it_test.go +++ b/migrator/accounts_it_test.go @@ -166,7 +166,7 @@ func testAccITConnect(t *testing.T) { accCfgIn.DataDbCfg().DataDbHost, accCfgIn.DataDbCfg().DataDbPort, accCfgIn.DataDbCfg().DataDbName, accCfgIn.DataDbCfg().DataDbUser, accCfgIn.DataDbCfg().DataDbPass, accCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", accCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -174,7 +174,7 @@ func testAccITConnect(t *testing.T) { accCfgOut.DataDbCfg().DataDbHost, accCfgOut.DataDbCfg().DataDbPort, accCfgOut.DataDbCfg().DataDbName, accCfgOut.DataDbCfg().DataDbUser, accCfgOut.DataDbCfg().DataDbPass, accCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", accCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/action_it_test.go b/migrator/action_it_test.go index 3d2f88783..b33b2eef5 100644 --- a/migrator/action_it_test.go +++ b/migrator/action_it_test.go @@ -163,7 +163,7 @@ func testActITConnect(t *testing.T) { actCfgIn.DataDbCfg().DataDbHost, actCfgIn.DataDbCfg().DataDbPort, actCfgIn.DataDbCfg().DataDbName, actCfgIn.DataDbCfg().DataDbUser, actCfgIn.DataDbCfg().DataDbPass, actCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", actCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -171,7 +171,7 @@ func testActITConnect(t *testing.T) { actCfgOut.DataDbCfg().DataDbHost, actCfgOut.DataDbCfg().DataDbPort, actCfgOut.DataDbCfg().DataDbName, actCfgOut.DataDbCfg().DataDbUser, actCfgOut.DataDbCfg().DataDbPass, actCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", accCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/action_plan_it_test.go b/migrator/action_plan_it_test.go index 6c8f5eb7a..46ee0bd6e 100644 --- a/migrator/action_plan_it_test.go +++ b/migrator/action_plan_it_test.go @@ -163,7 +163,7 @@ func testActPlnITConnect(t *testing.T) { actPlnCfgIn.DataDbCfg().DataDbHost, actPlnCfgIn.DataDbCfg().DataDbPort, actPlnCfgIn.DataDbCfg().DataDbName, actPlnCfgIn.DataDbCfg().DataDbUser, actPlnCfgIn.DataDbCfg().DataDbPass, actPlnCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", actPlnCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -171,7 +171,7 @@ func testActPlnITConnect(t *testing.T) { actPlnCfgOut.DataDbCfg().DataDbHost, actPlnCfgOut.DataDbCfg().DataDbPort, actPlnCfgOut.DataDbCfg().DataDbName, actPlnCfgOut.DataDbCfg().DataDbUser, actPlnCfgOut.DataDbCfg().DataDbPass, actPlnCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", actPlnCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/action_trigger_it_test.go b/migrator/action_trigger_it_test.go index 389b628d0..5b9126c41 100644 --- a/migrator/action_trigger_it_test.go +++ b/migrator/action_trigger_it_test.go @@ -146,7 +146,7 @@ func testActTrgITConnect(t *testing.T) { actTrgCfgIn.DataDbCfg().DataDbHost, actTrgCfgIn.DataDbCfg().DataDbPort, actTrgCfgIn.DataDbCfg().DataDbName, actTrgCfgIn.DataDbCfg().DataDbUser, actTrgCfgIn.DataDbCfg().DataDbPass, actTrgCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", actTrgCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -154,7 +154,7 @@ func testActTrgITConnect(t *testing.T) { actTrgCfgOut.DataDbCfg().DataDbHost, actTrgCfgOut.DataDbCfg().DataDbPort, actTrgCfgOut.DataDbCfg().DataDbName, actTrgCfgOut.DataDbCfg().DataDbUser, actTrgCfgOut.DataDbCfg().DataDbPass, actTrgCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", actTrgCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go index 819cdae0c..4074ee493 100644 --- a/migrator/alias_it_test.go +++ b/migrator/alias_it_test.go @@ -79,7 +79,7 @@ func testAlsITConnect(t *testing.T) { alsCfgIn.DataDbCfg().DataDbHost, alsCfgIn.DataDbCfg().DataDbPort, alsCfgIn.DataDbCfg().DataDbName, alsCfgIn.DataDbCfg().DataDbUser, alsCfgIn.DataDbCfg().DataDbPass, alsCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", alsCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -87,7 +87,7 @@ func testAlsITConnect(t *testing.T) { alsCfgOut.DataDbCfg().DataDbHost, alsCfgOut.DataDbCfg().DataDbPort, alsCfgOut.DataDbCfg().DataDbName, alsCfgOut.DataDbCfg().DataDbUser, alsCfgOut.DataDbCfg().DataDbPass, alsCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", alsCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/attributes_it_test.go b/migrator/attributes_it_test.go index 03ec6e49a..8f812ab9f 100755 --- a/migrator/attributes_it_test.go +++ b/migrator/attributes_it_test.go @@ -189,7 +189,7 @@ func testAttrITConnect(t *testing.T) { attrCfgIn.DataDbCfg().DataDbHost, attrCfgIn.DataDbCfg().DataDbPort, attrCfgIn.DataDbCfg().DataDbName, attrCfgIn.DataDbCfg().DataDbUser, attrCfgIn.DataDbCfg().DataDbPass, attrCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", attrCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -197,7 +197,7 @@ func testAttrITConnect(t *testing.T) { attrCfgOut.DataDbCfg().DataDbHost, attrCfgOut.DataDbCfg().DataDbPort, attrCfgOut.DataDbCfg().DataDbName, attrCfgOut.DataDbCfg().DataDbUser, attrCfgOut.DataDbCfg().DataDbPass, attrCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", attrCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 2cdd87864..a6d6f86eb 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -78,7 +78,7 @@ func testCdrITConnect(t *testing.T) { cdrCfgIn.StorDbCfg().Password, cdrCfgIn.StorDbCfg().SSLMode, cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, - cdrCfgIn.StorDbCfg().PrefixIndexedFields) + cdrCfgIn.StorDbCfg().PrefixIndexedFields, cdrCfgIn.StorDbCfg().Items) if err != nil { t.Error(err) } @@ -88,7 +88,7 @@ func testCdrITConnect(t *testing.T) { cdrCfgIn.StorDbCfg().Password, cdrCfgIn.StorDbCfg().SSLMode, cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, - cdrCfgIn.StorDbCfg().PrefixIndexedFields) + cdrCfgIn.StorDbCfg().PrefixIndexedFields, cdrCfgIn.StorDbCfg().Items) if err != nil { t.Error(err) } diff --git a/migrator/chargers_it_test.go b/migrator/chargers_it_test.go index b83e5b518..4f8bbfbe6 100755 --- a/migrator/chargers_it_test.go +++ b/migrator/chargers_it_test.go @@ -128,7 +128,7 @@ func testChrgITConnect(t *testing.T) { chrgCfgIn.DataDbCfg().DataDbHost, chrgCfgIn.DataDbCfg().DataDbPort, chrgCfgIn.DataDbCfg().DataDbName, chrgCfgIn.DataDbCfg().DataDbUser, chrgCfgIn.DataDbCfg().DataDbPass, chrgCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", chrgCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -136,7 +136,7 @@ func testChrgITConnect(t *testing.T) { chrgCfgOut.DataDbCfg().DataDbHost, chrgCfgOut.DataDbCfg().DataDbPort, chrgCfgOut.DataDbCfg().DataDbName, chrgCfgOut.DataDbCfg().DataDbUser, chrgCfgOut.DataDbCfg().DataDbPass, chrgCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", chrgCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index c8f1e030d..cd1f68120 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -80,7 +80,7 @@ func testDCITConnect(t *testing.T) { dcCfgIn.DataDbCfg().DataDbHost, dcCfgIn.DataDbCfg().DataDbPort, dcCfgIn.DataDbCfg().DataDbName, dcCfgIn.DataDbCfg().DataDbUser, dcCfgIn.DataDbCfg().DataDbPass, dcCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", dcCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -88,7 +88,7 @@ func testDCITConnect(t *testing.T) { dcCfgOut.DataDbCfg().DataDbHost, dcCfgOut.DataDbCfg().DataDbPort, dcCfgOut.DataDbCfg().DataDbName, dcCfgOut.DataDbCfg().DataDbUser, dcCfgOut.DataDbCfg().DataDbPass, dcCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", dcCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/dispatchers_it_test.go b/migrator/dispatchers_it_test.go index eff55d8ce..f8c1abf77 100644 --- a/migrator/dispatchers_it_test.go +++ b/migrator/dispatchers_it_test.go @@ -128,7 +128,7 @@ func testDspITConnect(t *testing.T) { dspCfgIn.DataDbCfg().DataDbHost, dspCfgIn.DataDbCfg().DataDbPort, dspCfgIn.DataDbCfg().DataDbName, dspCfgIn.DataDbCfg().DataDbUser, dspCfgIn.DataDbCfg().DataDbPass, dspCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", dspCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -136,7 +136,7 @@ func testDspITConnect(t *testing.T) { dspCfgOut.DataDbCfg().DataDbHost, dspCfgOut.DataDbCfg().DataDbPort, dspCfgOut.DataDbCfg().DataDbName, dspCfgOut.DataDbCfg().DataDbUser, dspCfgOut.DataDbCfg().DataDbPass, dspCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", dspCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index 1371517ec..33e46b2a1 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -99,7 +99,7 @@ func testFltrITConnect(t *testing.T) { fltrCfgIn.DataDbCfg().DataDbHost, fltrCfgIn.DataDbCfg().DataDbPort, fltrCfgIn.DataDbCfg().DataDbName, fltrCfgIn.DataDbCfg().DataDbUser, fltrCfgIn.DataDbCfg().DataDbPass, fltrCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", fltrCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -107,7 +107,7 @@ func testFltrITConnect(t *testing.T) { fltrCfgOut.DataDbCfg().DataDbHost, fltrCfgOut.DataDbCfg().DataDbPort, fltrCfgOut.DataDbCfg().DataDbName, fltrCfgOut.DataDbCfg().DataDbUser, fltrCfgOut.DataDbCfg().DataDbPass, fltrCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", fltrCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/load_ids_it_test.go b/migrator/load_ids_it_test.go index fbdd13958..4ef9cba36 100644 --- a/migrator/load_ids_it_test.go +++ b/migrator/load_ids_it_test.go @@ -78,7 +78,7 @@ func testLoadIdsITConnect(t *testing.T) { loadCfgIn.DataDbCfg().DataDbHost, loadCfgIn.DataDbCfg().DataDbPort, loadCfgIn.DataDbCfg().DataDbName, loadCfgIn.DataDbCfg().DataDbUser, loadCfgIn.DataDbCfg().DataDbPass, loadCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", loadCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -86,7 +86,7 @@ func testLoadIdsITConnect(t *testing.T) { loadCfgOut.DataDbCfg().DataDbHost, loadCfgOut.DataDbCfg().DataDbPort, loadCfgOut.DataDbCfg().DataDbName, loadCfgOut.DataDbCfg().DataDbUser, loadCfgOut.DataDbCfg().DataDbPass, loadCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", loadCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/rating_plan_it_test.go b/migrator/rating_plan_it_test.go index 4d51d8a2d..56c10cae4 100644 --- a/migrator/rating_plan_it_test.go +++ b/migrator/rating_plan_it_test.go @@ -127,7 +127,7 @@ func testRtPlITConnect(t *testing.T) { rtplCfgIn.DataDbCfg().DataDbHost, rtplCfgIn.DataDbCfg().DataDbPort, rtplCfgIn.DataDbCfg().DataDbName, rtplCfgIn.DataDbCfg().DataDbUser, rtplCfgIn.DataDbCfg().DataDbPass, rtplCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", rtplCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -135,7 +135,7 @@ func testRtPlITConnect(t *testing.T) { rtplCfgOut.DataDbCfg().DataDbHost, rtplCfgOut.DataDbCfg().DataDbPort, rtplCfgOut.DataDbCfg().DataDbName, rtplCfgOut.DataDbCfg().DataDbUser, rtplCfgOut.DataDbCfg().DataDbPass, rtplCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", rtplCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/rating_profile_it_test.go b/migrator/rating_profile_it_test.go index 9663e4d68..dd44774de 100644 --- a/migrator/rating_profile_it_test.go +++ b/migrator/rating_profile_it_test.go @@ -128,7 +128,7 @@ func testRtPrfITConnect(t *testing.T) { rtprflCfgIn.DataDbCfg().DataDbHost, rtprflCfgIn.DataDbCfg().DataDbPort, rtprflCfgIn.DataDbCfg().DataDbName, rtprflCfgIn.DataDbCfg().DataDbUser, rtprflCfgIn.DataDbCfg().DataDbPass, rtprflCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", rtprflCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -136,7 +136,7 @@ func testRtPrfITConnect(t *testing.T) { rtprflCfgOut.DataDbCfg().DataDbHost, rtprflCfgOut.DataDbCfg().DataDbPort, rtprflCfgOut.DataDbCfg().DataDbName, rtprflCfgOut.DataDbCfg().DataDbUser, rtprflCfgOut.DataDbCfg().DataDbPass, rtprflCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", rtplCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/resource_it_test.go b/migrator/resource_it_test.go index 0b2c2a8d8..284454473 100644 --- a/migrator/resource_it_test.go +++ b/migrator/resource_it_test.go @@ -128,7 +128,7 @@ func testResITConnect(t *testing.T) { resCfgIn.DataDbCfg().DataDbHost, resCfgIn.DataDbCfg().DataDbPort, resCfgIn.DataDbCfg().DataDbName, resCfgIn.DataDbCfg().DataDbUser, resCfgIn.DataDbCfg().DataDbPass, resCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", resCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -136,7 +136,7 @@ func testResITConnect(t *testing.T) { resCfgOut.DataDbCfg().DataDbHost, resCfgOut.DataDbCfg().DataDbPort, resCfgOut.DataDbCfg().DataDbName, resCfgOut.DataDbCfg().DataDbUser, resCfgOut.DataDbCfg().DataDbPass, resCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", resCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index a1e677d32..4b54845f3 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -88,7 +88,7 @@ func testSessionCostITConnect(t *testing.T) { sCostCfgIn.StorDbCfg().Password, sCostCfgIn.StorDbCfg().SSLMode, sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, - sCostCfgIn.StorDbCfg().PrefixIndexedFields) + sCostCfgIn.StorDbCfg().PrefixIndexedFields, sCostCfgIn.StorDbCfg().Items) if err != nil { t.Error(err) } @@ -98,7 +98,7 @@ func testSessionCostITConnect(t *testing.T) { sCostCfgOut.StorDbCfg().Password, sCostCfgIn.StorDbCfg().SSLMode, sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, - sCostCfgIn.StorDbCfg().PrefixIndexedFields) + sCostCfgIn.StorDbCfg().PrefixIndexedFields, sCostCfgOut.StorDbCfg().Items) if err != nil { t.Error(err) } diff --git a/migrator/sharedgroup_it_test.go b/migrator/sharedgroup_it_test.go index 6449e794f..2d11d00ee 100644 --- a/migrator/sharedgroup_it_test.go +++ b/migrator/sharedgroup_it_test.go @@ -144,7 +144,7 @@ func testShrGrpITConnect(t *testing.T) { shrGrpCfgIn.DataDbCfg().DataDbHost, shrGrpCfgIn.DataDbCfg().DataDbPort, shrGrpCfgIn.DataDbCfg().DataDbName, shrGrpCfgIn.DataDbCfg().DataDbUser, shrGrpCfgIn.DataDbCfg().DataDbPass, shrGrpCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", shrGrpCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -152,7 +152,7 @@ func testShrGrpITConnect(t *testing.T) { shrGrpCfgOut.DataDbCfg().DataDbHost, shrGrpCfgOut.DataDbCfg().DataDbPort, shrGrpCfgOut.DataDbCfg().DataDbName, shrGrpCfgOut.DataDbCfg().DataDbUser, shrGrpCfgOut.DataDbCfg().DataDbPass, shrGrpCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", shrGrpCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index ac6c64859..6dc40dbfa 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -107,7 +107,7 @@ func testStsITConnect(t *testing.T) { stsCfgIn.DataDbCfg().DataDbHost, stsCfgIn.DataDbCfg().DataDbPort, stsCfgIn.DataDbCfg().DataDbName, stsCfgIn.DataDbCfg().DataDbUser, stsCfgIn.DataDbCfg().DataDbPass, stsCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", stsCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -115,7 +115,7 @@ func testStsITConnect(t *testing.T) { stsCfgOut.DataDbCfg().DataDbHost, stsCfgOut.DataDbCfg().DataDbPort, stsCfgOut.DataDbCfg().DataDbName, stsCfgOut.DataDbCfg().DataDbUser, stsCfgOut.DataDbCfg().DataDbPass, stsCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", stsCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/suppliers_it_test.go b/migrator/suppliers_it_test.go index 2e59c1a57..bcc8b6b30 100644 --- a/migrator/suppliers_it_test.go +++ b/migrator/suppliers_it_test.go @@ -127,7 +127,7 @@ func testSupITConnect(t *testing.T) { supCfgIn.DataDbCfg().DataDbHost, supCfgIn.DataDbCfg().DataDbPort, supCfgIn.DataDbCfg().DataDbName, supCfgIn.DataDbCfg().DataDbUser, supCfgIn.DataDbCfg().DataDbPass, supCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", supCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -135,7 +135,7 @@ func testSupITConnect(t *testing.T) { supCfgOut.DataDbCfg().DataDbHost, supCfgOut.DataDbCfg().DataDbPort, supCfgOut.DataDbCfg().DataDbName, supCfgOut.DataDbCfg().DataDbUser, supCfgOut.DataDbCfg().DataDbPass, supCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", supCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/thresholds_it_test.go b/migrator/thresholds_it_test.go index d2c9a9704..d1959ba17 100644 --- a/migrator/thresholds_it_test.go +++ b/migrator/thresholds_it_test.go @@ -145,7 +145,7 @@ func testTrsITConnect(t *testing.T) { trsCfgIn.DataDbCfg().DataDbHost, trsCfgIn.DataDbCfg().DataDbPort, trsCfgIn.DataDbCfg().DataDbName, trsCfgIn.DataDbCfg().DataDbUser, trsCfgIn.DataDbCfg().DataDbPass, trsCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", trsCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -153,7 +153,7 @@ func testTrsITConnect(t *testing.T) { trsCfgOut.DataDbCfg().DataDbHost, trsCfgOut.DataDbCfg().DataDbPort, trsCfgOut.DataDbCfg().DataDbName, trsCfgOut.DataDbCfg().DataDbUser, trsCfgOut.DataDbCfg().DataDbPass, trsCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", trsCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_account_actions_it_test.go b/migrator/tp_account_actions_it_test.go index cba96b3ae..e149fcfd9 100644 --- a/migrator/tp_account_actions_it_test.go +++ b/migrator/tp_account_actions_it_test.go @@ -71,11 +71,9 @@ func testTpAccActITConnect(t *testing.T) { tpAccActCfgIn.StorDbCfg().Host, tpAccActCfgIn.StorDbCfg().Port, tpAccActCfgIn.StorDbCfg().Name, tpAccActCfgIn.StorDbCfg().User, tpAccActCfgIn.StorDbCfg().Password, tpAccActCfgIn.StorDbCfg().SSLMode, - tpAccActCfgIn.StorDbCfg().MaxOpenConns, - tpAccActCfgIn.StorDbCfg().MaxIdleConns, - tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, - tpAccActCfgIn.StorDbCfg().StringIndexedFields, - tpAccActCfgIn.StorDbCfg().PrefixIndexedFields) + tpAccActCfgIn.StorDbCfg().MaxOpenConns, tpAccActCfgIn.StorDbCfg().MaxIdleConns, + tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, tpAccActCfgIn.StorDbCfg().StringIndexedFields, + tpAccActCfgIn.StorDbCfg().PrefixIndexedFields, tpAccActCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -85,7 +83,7 @@ func testTpAccActITConnect(t *testing.T) { tpAccActCfgOut.StorDbCfg().Password, tpAccActCfgIn.StorDbCfg().SSLMode, tpAccActCfgIn.StorDbCfg().MaxOpenConns, tpAccActCfgIn.StorDbCfg().MaxIdleConns, tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, tpAccActCfgIn.StorDbCfg().StringIndexedFields, - tpAccActCfgIn.StorDbCfg().PrefixIndexedFields) + tpAccActCfgIn.StorDbCfg().PrefixIndexedFields, tpAccActCfgOut.StorDbCfg().Items) 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 faa5dc5f4..17e27e931 100644 --- a/migrator/tp_action_plans_it_test.go +++ b/migrator/tp_action_plans_it_test.go @@ -73,7 +73,7 @@ func testTpActPlnITConnect(t *testing.T) { tpActPlnCfgIn.StorDbCfg().Password, tpActPlnCfgIn.StorDbCfg().SSLMode, tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, - tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields) + tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpActPlnCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpActPlnITConnect(t *testing.T) { tpActPlnCfgOut.StorDbCfg().Password, tpActPlnCfgIn.StorDbCfg().SSLMode, tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, - tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields) + tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpActPlnCfgOut.StorDbCfg().Items) 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 ba634159f..0dd4c6cbf 100644 --- a/migrator/tp_action_triggers_it_test.go +++ b/migrator/tp_action_triggers_it_test.go @@ -73,7 +73,7 @@ func testTpActTrgITConnect(t *testing.T) { tpActTrgCfgIn.StorDbCfg().Password, tpActTrgCfgIn.StorDbCfg().SSLMode, tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, - tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields) + tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields, tpActTrgCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpActTrgITConnect(t *testing.T) { tpActTrgCfgOut.StorDbCfg().Password, tpActTrgCfgIn.StorDbCfg().SSLMode, tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, - tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields) + tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields, tpActTrgCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_actions_it_test.go b/migrator/tp_actions_it_test.go index 1936d23dc..8a85e9e0a 100644 --- a/migrator/tp_actions_it_test.go +++ b/migrator/tp_actions_it_test.go @@ -73,7 +73,7 @@ func testTpActITConnect(t *testing.T) { tpActCfgIn.StorDbCfg().Password, tpActCfgIn.StorDbCfg().SSLMode, tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, - tpActCfgIn.StorDbCfg().PrefixIndexedFields) + tpActCfgIn.StorDbCfg().PrefixIndexedFields, tpActCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpActITConnect(t *testing.T) { tpActCfgOut.StorDbCfg().Password, tpActCfgIn.StorDbCfg().SSLMode, tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, - tpActCfgIn.StorDbCfg().PrefixIndexedFields) + tpActCfgIn.StorDbCfg().PrefixIndexedFields, tpActCfgOut.StorDbCfg().Items) 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 bd43fc5db..3cc57b706 100644 --- a/migrator/tp_destination_rates_it_test.go +++ b/migrator/tp_destination_rates_it_test.go @@ -73,7 +73,7 @@ func testTpDstRtITConnect(t *testing.T) { tpDstRtCfgIn.StorDbCfg().Password, tpDstRtCfgIn.StorDbCfg().SSLMode, tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, - tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields) + tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields, tpDstRtCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpDstRtITConnect(t *testing.T) { tpDstRtCfgOut.StorDbCfg().Password, tpDstRtCfgIn.StorDbCfg().SSLMode, tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, - tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields) + tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields, tpDstRtCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_destinations_it_test.go b/migrator/tp_destinations_it_test.go index 7cec2aa68..b96119261 100644 --- a/migrator/tp_destinations_it_test.go +++ b/migrator/tp_destinations_it_test.go @@ -73,7 +73,7 @@ func testTpDstITConnect(t *testing.T) { tpDstCfgIn.StorDbCfg().Password, tpDstCfgIn.StorDbCfg().SSLMode, tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, - tpDstCfgIn.StorDbCfg().PrefixIndexedFields) + tpDstCfgIn.StorDbCfg().PrefixIndexedFields, tpDstCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpDstITConnect(t *testing.T) { tpDstCfgOut.StorDbCfg().Password, tpDstCfgIn.StorDbCfg().SSLMode, tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, - tpDstCfgIn.StorDbCfg().PrefixIndexedFields) + tpDstCfgIn.StorDbCfg().PrefixIndexedFields, tpDstCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_dispatchers_it_test.go b/migrator/tp_dispatchers_it_test.go index e4ec738cd..bf868518f 100644 --- a/migrator/tp_dispatchers_it_test.go +++ b/migrator/tp_dispatchers_it_test.go @@ -73,7 +73,7 @@ func testTpDispITConnect(t *testing.T) { tpDispCfgIn.StorDbCfg().Password, tpDispCfgIn.StorDbCfg().SSLMode, tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, - tpDispCfgIn.StorDbCfg().PrefixIndexedFields) + tpDispCfgIn.StorDbCfg().PrefixIndexedFields, tpDispCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpDispITConnect(t *testing.T) { tpDispCfgOut.StorDbCfg().Password, tpDispCfgIn.StorDbCfg().SSLMode, tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, - tpDispCfgIn.StorDbCfg().PrefixIndexedFields) + tpDispCfgIn.StorDbCfg().PrefixIndexedFields, tpDispCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_filters_it_test.go b/migrator/tp_filters_it_test.go index 136e8033d..cea1259a2 100755 --- a/migrator/tp_filters_it_test.go +++ b/migrator/tp_filters_it_test.go @@ -73,7 +73,7 @@ func testTpFltrITConnect(t *testing.T) { tpFltrCfgIn.StorDbCfg().Password, tpFltrCfgOut.StorDbCfg().SSLMode, tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, - tpFltrCfgOut.StorDbCfg().PrefixIndexedFields) + tpFltrCfgOut.StorDbCfg().PrefixIndexedFields, tpFltrCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpFltrITConnect(t *testing.T) { tpFltrCfgOut.StorDbCfg().Password, tpFltrCfgOut.StorDbCfg().SSLMode, tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, - tpFltrCfgOut.StorDbCfg().PrefixIndexedFields) + tpFltrCfgOut.StorDbCfg().PrefixIndexedFields, tpFltrCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_rates_it_test.go b/migrator/tp_rates_it_test.go index e09ca2d46..e9bbc551e 100644 --- a/migrator/tp_rates_it_test.go +++ b/migrator/tp_rates_it_test.go @@ -73,7 +73,7 @@ func testTpRatesITConnect(t *testing.T) { tpRatesCfgIn.StorDbCfg().Password, tpRatesCfgIn.StorDbCfg().SSLMode, tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, - tpRatesCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatesCfgIn.StorDbCfg().PrefixIndexedFields, tpRatesCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpRatesITConnect(t *testing.T) { tpRatesCfgOut.StorDbCfg().Password, tpRatesCfgIn.StorDbCfg().SSLMode, tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, - tpRatesCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatesCfgIn.StorDbCfg().PrefixIndexedFields, tpRatesCfgOut.StorDbCfg().Items) 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 5d1f56ba3..0f2289796 100644 --- a/migrator/tp_rating_plans_it_test.go +++ b/migrator/tp_rating_plans_it_test.go @@ -73,7 +73,7 @@ func testTpRatPlnITConnect(t *testing.T) { tpRatPlnCfgIn.StorDbCfg().Password, tpRatPlnCfgIn.StorDbCfg().SSLMode, tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, - tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPlnCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpRatPlnITConnect(t *testing.T) { tpRatPlnCfgOut.StorDbCfg().Password, tpRatPlnCfgIn.StorDbCfg().SSLMode, tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, - tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPlnCfgOut.StorDbCfg().Items) 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 903664068..f724ddc3b 100644 --- a/migrator/tp_rating_profiles_it_test.go +++ b/migrator/tp_rating_profiles_it_test.go @@ -73,7 +73,7 @@ func testTpRatPrfITConnect(t *testing.T) { tpRatPrfCfgIn.StorDbCfg().Password, tpRatPrfCfgIn.StorDbCfg().SSLMode, tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, - tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPrfCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpRatPrfITConnect(t *testing.T) { tpRatPrfCfgOut.StorDbCfg().Password, tpRatPrfCfgIn.StorDbCfg().SSLMode, tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, - tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields) + tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPrfCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_resources_it_test.go b/migrator/tp_resources_it_test.go index 0a7ee4980..d68bd5699 100644 --- a/migrator/tp_resources_it_test.go +++ b/migrator/tp_resources_it_test.go @@ -74,7 +74,7 @@ func testTpResITConnect(t *testing.T) { tpResCfgIn.StorDbCfg().Password, tpResCfgIn.StorDbCfg().SSLMode, tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, - tpResCfgIn.StorDbCfg().PrefixIndexedFields) + tpResCfgIn.StorDbCfg().PrefixIndexedFields, tpResCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -84,7 +84,7 @@ func testTpResITConnect(t *testing.T) { tpResCfgOut.StorDbCfg().Password, tpResCfgIn.StorDbCfg().SSLMode, tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, - tpResCfgIn.StorDbCfg().PrefixIndexedFields) + tpResCfgIn.StorDbCfg().PrefixIndexedFields, tpResCfgOut.StorDbCfg().Items) 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 357f14d10..90283894a 100644 --- a/migrator/tp_shared_groups_it_test.go +++ b/migrator/tp_shared_groups_it_test.go @@ -73,7 +73,7 @@ func testTpShrGrITConnect(t *testing.T) { tpShrGrCfgIn.StorDbCfg().Password, tpShrGrCfgIn.StorDbCfg().SSLMode, tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, - tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields) + tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields, tpShrGrCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpShrGrITConnect(t *testing.T) { tpShrGrCfgOut.StorDbCfg().Password, tpShrGrCfgIn.StorDbCfg().SSLMode, tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, - tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields) + tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields, tpShrGrCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_stats_it_test.go b/migrator/tp_stats_it_test.go index 127ada362..5b55f6d36 100644 --- a/migrator/tp_stats_it_test.go +++ b/migrator/tp_stats_it_test.go @@ -73,7 +73,7 @@ func testTpStatsITConnect(t *testing.T) { tpStatsCfgIn.StorDbCfg().Password, tpStatsCfgIn.StorDbCfg().SSLMode, tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, - tpStatsCfgIn.StorDbCfg().PrefixIndexedFields) + tpStatsCfgIn.StorDbCfg().PrefixIndexedFields, tpStatsCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpStatsITConnect(t *testing.T) { tpStatsCfgOut.StorDbCfg().Password, tpStatsCfgIn.StorDbCfg().SSLMode, tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, - tpStatsCfgIn.StorDbCfg().PrefixIndexedFields) + tpStatsCfgIn.StorDbCfg().PrefixIndexedFields, tpStatsCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_suppliers_it_test.go b/migrator/tp_suppliers_it_test.go index 9db408b66..ebea3036b 100644 --- a/migrator/tp_suppliers_it_test.go +++ b/migrator/tp_suppliers_it_test.go @@ -74,7 +74,7 @@ func testTpSplITConnect(t *testing.T) { tpSplCfgIn.StorDbCfg().Password, tpSplCfgIn.StorDbCfg().SSLMode, tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, - tpSplCfgIn.StorDbCfg().PrefixIndexedFields) + tpSplCfgIn.StorDbCfg().PrefixIndexedFields, tpSplCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -84,7 +84,7 @@ func testTpSplITConnect(t *testing.T) { tpSplCfgOut.StorDbCfg().Password, tpSplCfgIn.StorDbCfg().SSLMode, tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, - tpSplCfgIn.StorDbCfg().PrefixIndexedFields) + tpSplCfgIn.StorDbCfg().PrefixIndexedFields, tpSplCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_thresholds_it_test.go b/migrator/tp_thresholds_it_test.go index 24785c4ab..cdb119b36 100644 --- a/migrator/tp_thresholds_it_test.go +++ b/migrator/tp_thresholds_it_test.go @@ -74,7 +74,7 @@ func testTpTresITConnect(t *testing.T) { tpTresCfgIn.StorDbCfg().Password, tpTresCfgIn.StorDbCfg().SSLMode, tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, - tpTresCfgIn.StorDbCfg().PrefixIndexedFields) + tpTresCfgIn.StorDbCfg().PrefixIndexedFields, tpTresCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -84,7 +84,7 @@ func testTpTresITConnect(t *testing.T) { tpTresCfgOut.StorDbCfg().Password, tpTresCfgIn.StorDbCfg().SSLMode, tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, - tpTresCfgIn.StorDbCfg().PrefixIndexedFields) + tpTresCfgIn.StorDbCfg().PrefixIndexedFields, tpTresCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/tp_timings_it_test.go b/migrator/tp_timings_it_test.go index d396294ed..698a33cd6 100644 --- a/migrator/tp_timings_it_test.go +++ b/migrator/tp_timings_it_test.go @@ -73,7 +73,7 @@ func testTpTimITConnect(t *testing.T) { tpTimCfgIn.StorDbCfg().Password, tpTimCfgIn.StorDbCfg().SSLMode, tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, - tpTimCfgIn.StorDbCfg().PrefixIndexedFields) + tpTimCfgIn.StorDbCfg().PrefixIndexedFields, tpTimCfgIn.StorDbCfg().Items) if err != nil { log.Fatal(err) } @@ -83,7 +83,7 @@ func testTpTimITConnect(t *testing.T) { tpTimCfgOut.StorDbCfg().Password, tpTimCfgIn.StorDbCfg().SSLMode, tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, - tpTimCfgIn.StorDbCfg().PrefixIndexedFields) + tpTimCfgIn.StorDbCfg().PrefixIndexedFields, tpTimCfgOut.StorDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/user_it_test.go b/migrator/user_it_test.go index 0420bee83..f5164e3be 100644 --- a/migrator/user_it_test.go +++ b/migrator/user_it_test.go @@ -80,7 +80,7 @@ func testUsrITConnect(t *testing.T) { usrCfgIn.DataDbCfg().DataDbHost, usrCfgIn.DataDbCfg().DataDbPort, usrCfgIn.DataDbCfg().DataDbName, usrCfgIn.DataDbCfg().DataDbUser, usrCfgIn.DataDbCfg().DataDbPass, usrCfgIn.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", usrCfgIn.DataDbCfg().Items) if err != nil { log.Fatal(err) } @@ -88,7 +88,7 @@ func testUsrITConnect(t *testing.T) { usrCfgOut.DataDbCfg().DataDbHost, usrCfgOut.DataDbCfg().DataDbPort, usrCfgOut.DataDbCfg().DataDbName, usrCfgOut.DataDbCfg().DataDbUser, usrCfgOut.DataDbCfg().DataDbPass, usrCfgOut.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", usrCfgOut.DataDbCfg().Items) if err != nil { log.Fatal(err) } diff --git a/migrator/versions_it_test.go b/migrator/versions_it_test.go index 930eeb07f..070a44238 100644 --- a/migrator/versions_it_test.go +++ b/migrator/versions_it_test.go @@ -77,7 +77,7 @@ func testVrsITConnect(t *testing.T) { vrsCfg.DataDbCfg().DataDbHost, vrsCfg.DataDbCfg().DataDbPort, vrsCfg.DataDbCfg().DataDbName, vrsCfg.DataDbCfg().DataDbUser, vrsCfg.DataDbCfg().DataDbPass, vrsCfg.GeneralCfg().DBDataEncoding, - config.CgrConfig().CacheCfg(), "") + config.CgrConfig().CacheCfg(), "", vrsCfg.DataDbCfg().Items) if err != nil { t.Fatal(err) } @@ -88,7 +88,7 @@ func testVrsITConnect(t *testing.T) { vrsCfg.StorDbCfg().Password, vrsCfg.StorDbCfg().SSLMode, vrsCfg.StorDbCfg().MaxOpenConns, vrsCfg.StorDbCfg().MaxIdleConns, vrsCfg.StorDbCfg().ConnMaxLifetime, vrsCfg.StorDbCfg().StringIndexedFields, - vrsCfg.StorDbCfg().PrefixIndexedFields) + vrsCfg.StorDbCfg().PrefixIndexedFields, vrsCfg.StorDbCfg().Items) if err != nil { t.Error(err) }