From c7b7740c27d14f11321393d9d53cf2f2fd0197bb Mon Sep 17 00:00:00 2001 From: TeoV Date: Tue, 25 Feb 2020 17:42:22 +0200 Subject: [PATCH] Add support for Mongo for different Marshaler --- cmd/cgr-loader/cgr-loader.go | 2 +- cmd/cgr-migrator/cgr-migrator.go | 14 ++++++++------ engine/actions2_it_test.go | 1 + engine/datamanager_it_test.go | 1 + engine/filterindexer_it_test.go | 1 + engine/libtest.go | 2 +- engine/loader_it_test.go | 7 ++++--- engine/onstor_it_test.go | 1 + engine/storage_cdrs_it_test.go | 6 +++--- engine/storage_mongo_datadb.go | 9 +++++++-- engine/storage_utils.go | 6 +++--- engine/stordb_it_test.go | 1 + engine/versions_it_test.go | 2 +- migrator/accounts2_it_test.go | 4 ++-- migrator/cdrs_it_test.go | 4 ++-- migrator/migrator_utils.go | 4 ++-- migrator/session_costs_it_test.go | 4 ++-- migrator/tp_account_actions_it_test.go | 4 ++-- 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/versions_it_test.go | 2 +- services/stordb.go | 6 ++++-- 36 files changed, 80 insertions(+), 65 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 719ab0812..8ee845a66 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -264,7 +264,7 @@ func main() { if storDb, err = engine.NewStorDBConn(ldrCfg.StorDbCfg().Type, ldrCfg.StorDbCfg().Host, ldrCfg.StorDbCfg().Port, ldrCfg.StorDbCfg().Name, ldrCfg.StorDbCfg().User, - ldrCfg.StorDbCfg().Password, ldrCfg.StorDbCfg().SSLMode, + ldrCfg.StorDbCfg().Password, ldrCfg.GeneralCfg().DBDataEncoding, ldrCfg.StorDbCfg().SSLMode, ldrCfg.StorDbCfg().MaxOpenConns, ldrCfg.StorDbCfg().MaxIdleConns, ldrCfg.StorDbCfg().ConnMaxLifetime, ldrCfg.StorDbCfg().StringIndexedFields, ldrCfg.StorDbCfg().PrefixIndexedFields, ldrCfg.StorDbCfg().Items); err != nil { diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index fc8da64ad..2254eb881 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -316,9 +316,10 @@ func main() { if storDBIn, err = migrator.NewMigratorStorDB(mgrCfg.StorDbCfg().Type, mgrCfg.StorDbCfg().Host, mgrCfg.StorDbCfg().Port, mgrCfg.StorDbCfg().Name, mgrCfg.StorDbCfg().User, - mgrCfg.StorDbCfg().Password, mgrCfg.StorDbCfg().SSLMode, - mgrCfg.StorDbCfg().MaxOpenConns, mgrCfg.StorDbCfg().MaxIdleConns, - mgrCfg.StorDbCfg().ConnMaxLifetime, mgrCfg.StorDbCfg().StringIndexedFields, + mgrCfg.StorDbCfg().Password, mgrCfg.GeneralCfg().DBDataEncoding, + mgrCfg.StorDbCfg().SSLMode, mgrCfg.StorDbCfg().MaxOpenConns, + mgrCfg.StorDbCfg().MaxIdleConns, mgrCfg.StorDbCfg().ConnMaxLifetime, + mgrCfg.StorDbCfg().StringIndexedFields, mgrCfg.StorDbCfg().PrefixIndexedFields, mgrCfg.StorDbCfg().Items); err != nil { log.Fatal(err) } @@ -328,9 +329,10 @@ func main() { } else if storDBOut, err = migrator.NewMigratorStorDB(mgrCfg.MigratorCgrCfg().OutStorDBType, mgrCfg.MigratorCgrCfg().OutStorDBHost, mgrCfg.MigratorCgrCfg().OutStorDBPort, mgrCfg.MigratorCgrCfg().OutStorDBName, mgrCfg.MigratorCgrCfg().OutStorDBUser, - mgrCfg.MigratorCgrCfg().OutStorDBPassword, mgrCfg.StorDbCfg().SSLMode, - mgrCfg.StorDbCfg().MaxOpenConns, mgrCfg.StorDbCfg().MaxIdleConns, - mgrCfg.StorDbCfg().ConnMaxLifetime, mgrCfg.StorDbCfg().StringIndexedFields, + mgrCfg.MigratorCgrCfg().OutStorDBPassword, mgrCfg.GeneralCfg().DBDataEncoding, + mgrCfg.StorDbCfg().SSLMode, mgrCfg.StorDbCfg().MaxOpenConns, + mgrCfg.StorDbCfg().MaxIdleConns, mgrCfg.StorDbCfg().ConnMaxLifetime, + mgrCfg.StorDbCfg().StringIndexedFields, mgrCfg.StorDbCfg().PrefixIndexedFields, mgrCfg.StorDbCfg().Items); err != nil { log.Fatal(err) } diff --git a/engine/actions2_it_test.go b/engine/actions2_it_test.go index ea6465799..900a897d8 100644 --- a/engine/actions2_it_test.go +++ b/engine/actions2_it_test.go @@ -98,6 +98,7 @@ func testActionsInitCdrsStore(t *testing.T) { if actsCdrStore, err = NewMongoStorage(actsCfg.StorDbCfg().Host, actsCfg.StorDbCfg().Port, actsCfg.StorDbCfg().Name, actsCfg.StorDbCfg().User, actsCfg.StorDbCfg().Password, + actsCfg.GeneralCfg().DBDataEncoding, utils.StorDB, nil, false); err != nil { t.Fatal("Could not connect to mongo", err.Error()) } diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go index b30243d44..6e6af0de3 100644 --- a/engine/datamanager_it_test.go +++ b/engine/datamanager_it_test.go @@ -66,6 +66,7 @@ func TestDMitinitDB(t *testing.T) { dataDB, err = NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, + mgoITCfg.GeneralCfg().DBDataEncoding, utils.StorDB, nil, false) if err != nil { t.Fatal("Could not connect to Mongo", err.Error()) diff --git a/engine/filterindexer_it_test.go b/engine/filterindexer_it_test.go index 425c7e086..c74dadf26 100644 --- a/engine/filterindexer_it_test.go +++ b/engine/filterindexer_it_test.go @@ -88,6 +88,7 @@ func TestFilterIndexerIT(t *testing.T) { mongoDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, + mgoITCfg.GeneralCfg().DBDataEncoding, utils.StorDB, nil, false) if err != nil { t.Fatal(err) diff --git a/engine/libtest.go b/engine/libtest.go index 0be567351..56e0e136d 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -307,7 +307,7 @@ func InitStorDb(cfg *config.CGRConfig) error { storDb, err := NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.StorDbCfg().SSLMode, cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields, cfg.StorDbCfg().Items) diff --git a/engine/loader_it_test.go b/engine/loader_it_test.go index f5ee3f363..f6c2d0f79 100644 --- a/engine/loader_it_test.go +++ b/engine/loader_it_test.go @@ -102,9 +102,10 @@ func testLoaderITInitStoreDB(t *testing.T) { // NewStorDBConn db, err := NewStorDBConn(lCfg.StorDbCfg().Type, lCfg.StorDbCfg().Host, lCfg.StorDbCfg().Port, lCfg.StorDbCfg().Name, - lCfg.StorDbCfg().User, lCfg.StorDbCfg().Password, lCfg.StorDbCfg().SSLMode, - lCfg.StorDbCfg().MaxOpenConns, lCfg.StorDbCfg().MaxIdleConns, lCfg.StorDbCfg().ConnMaxLifetime, - lCfg.StorDbCfg().StringIndexedFields, lCfg.StorDbCfg().PrefixIndexedFields, lCfg.StorDbCfg().Items) + lCfg.StorDbCfg().User, lCfg.StorDbCfg().Password, lCfg.GeneralCfg().DBDataEncoding, + lCfg.StorDbCfg().SSLMode, lCfg.StorDbCfg().MaxOpenConns, lCfg.StorDbCfg().MaxIdleConns, + lCfg.StorDbCfg().ConnMaxLifetime, lCfg.StorDbCfg().StringIndexedFields, + lCfg.StorDbCfg().PrefixIndexedFields, lCfg.StorDbCfg().Items) if err != nil { t.Error("Error on opening database connection: ", err) } diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go index 4b31adf9e..ee6c28f05 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -109,6 +109,7 @@ func TestOnStorIT(t *testing.T) { if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, + mgoITCfg.GeneralCfg().DBDataEncoding, utils.StorDB, nil, false); err != nil { t.Fatal(err) } diff --git a/engine/storage_cdrs_it_test.go b/engine/storage_cdrs_it_test.go index 8e9adb220..427498312 100644 --- a/engine/storage_cdrs_it_test.go +++ b/engine/storage_cdrs_it_test.go @@ -69,7 +69,7 @@ func testSetCDR(cfg *config.CGRConfig) error { cdrStorage, err := NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.StorDbCfg().SSLMode, cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields, cfg.StorDbCfg().Items) @@ -176,7 +176,7 @@ func testSMCosts(cfg *config.CGRConfig) error { cdrStorage, err := NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.StorDbCfg().SSLMode, cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields, cfg.StorDbCfg().Items) @@ -239,7 +239,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { cdrStorage, err := NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.StorDbCfg().SSLMode, cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields, cfg.StorDbCfg().Items) diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index adae32129..658432ccd 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -125,7 +125,7 @@ func TimeDecodeValue1(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val ref } // NewMongoStorage givese new mongo driver -func NewMongoStorage(host, port, db, user, pass, storageType string, cdrsIndexes []string, +func NewMongoStorage(host, port, db, user, pass, mrshlerStr, storageType string, cdrsIndexes []string, isDataDB bool) (ms *MongoStorage, err error) { url := host if port != "" { @@ -162,13 +162,18 @@ func NewMongoStorage(host, port, db, user, pass, storageType string, cdrsIndexes if err != nil { return nil, err } + mrshler, err := NewMarshaler(mrshlerStr) + if err != nil { + return nil, err + } + ms = &MongoStorage{ client: client, ctx: ctx, ctxTTL: ttl, db: dbName, storageType: storageType, - ms: NewCodecMsgpackMarshaler(), + ms: mrshler, cdrsIndexes: cdrsIndexes, isDataDB: isDataDB, } diff --git a/engine/storage_utils.go b/engine/storage_utils.go index a03ada36b..96fa282b1 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -48,7 +48,7 @@ func NewDataDBConn(dbType, host, port, name, user, } d, err = NewRedisStorage(host, dbNo, pass, marshaler, utils.REDIS_MAX_CONNS, sentinelName) case utils.MONGO: - d, err = NewMongoStorage(host, port, name, user, pass, utils.DataDB, nil, true) + d, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.DataDB, nil, true) case utils.INTERNAL: d = NewInternalDB(nil, nil, true, itemsCacheCfg) default: @@ -58,13 +58,13 @@ func NewDataDBConn(dbType, host, port, name, user, } // NewStorDBConn returns a StorDB(implements Storage interface) based on dbType -func NewStorDBConn(dbType, host, port, name, user, pass, sslmode string, +func NewStorDBConn(dbType, host, port, name, user, pass, marshaler, sslmode string, maxConn, maxIdleConn, connMaxLifetime int, stringIndexedFields, prefixIndexedFields []string, itemsCacheCfg map[string]*config.ItemOpt) (db StorDB, err error) { switch dbType { case utils.MONGO: - db, err = NewMongoStorage(host, port, name, user, pass, utils.StorDB, stringIndexedFields, false) + db, err = NewMongoStorage(host, port, name, user, pass, marshaler, utils.StorDB, stringIndexedFields, false) case utils.POSTGRES: db, err = NewPostgresStorage(host, port, name, user, pass, sslmode, maxConn, maxIdleConn, connMaxLifetime) case utils.MYSQL: diff --git a/engine/stordb_it_test.go b/engine/stordb_it_test.go index c1c9dfd39..75ad07d6f 100644 --- a/engine/stordb_it_test.go +++ b/engine/stordb_it_test.go @@ -86,6 +86,7 @@ func TestStorDBit(t *testing.T) { if storDB, err = NewMongoStorage(cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, cfg.StorDbCfg().Password, + cfg.GeneralCfg().DBDataEncoding, utils.StorDB, cfg.StorDbCfg().StringIndexedFields, false); err != nil { t.Fatal(err) } diff --git a/engine/versions_it_test.go b/engine/versions_it_test.go index e6a0de3f7..5f1ac1834 100644 --- a/engine/versions_it_test.go +++ b/engine/versions_it_test.go @@ -81,7 +81,7 @@ func testInitDataDB(t *testing.T) { storageDb, err = NewStorDBConn(cfg.StorDbCfg().Type, cfg.StorDbCfg().Host, cfg.StorDbCfg().Port, cfg.StorDbCfg().Name, cfg.StorDbCfg().User, - cfg.StorDbCfg().Password, cfg.StorDbCfg().SSLMode, + cfg.StorDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.StorDbCfg().SSLMode, cfg.StorDbCfg().MaxOpenConns, cfg.StorDbCfg().MaxIdleConns, cfg.StorDbCfg().ConnMaxLifetime, cfg.StorDbCfg().StringIndexedFields, cfg.StorDbCfg().PrefixIndexedFields, cfg.StorDbCfg().Items) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index a5b9e9d59..24d6c7cb2 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -84,7 +84,7 @@ 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().SSLMode, + acc2CfgIn.StorDbCfg().Password, acc2CfgIn.GeneralCfg().DBDataEncoding, acc2CfgIn.StorDbCfg().SSLMode, acc2CfgIn.StorDbCfg().MaxOpenConns, acc2CfgIn.StorDbCfg().MaxIdleConns, acc2CfgIn.StorDbCfg().ConnMaxLifetime, acc2CfgIn.StorDbCfg().StringIndexedFields, acc2CfgIn.StorDbCfg().PrefixIndexedFields, acc2CfgIn.StorDbCfg().Items) @@ -94,7 +94,7 @@ 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, acc2CfgIn.StorDbCfg().SSLMode, + acc2CfgOut.StorDbCfg().Password, acc2CfgIn.GeneralCfg().DBDataEncoding, acc2CfgIn.StorDbCfg().SSLMode, acc2CfgOut.StorDbCfg().MaxOpenConns, acc2CfgOut.StorDbCfg().MaxIdleConns, acc2CfgOut.StorDbCfg().ConnMaxLifetime, acc2CfgOut.StorDbCfg().StringIndexedFields, acc2CfgOut.StorDbCfg().PrefixIndexedFields, acc2CfgOut.StorDbCfg().Items) diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 40c86f77a..8815721b1 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -75,7 +75,7 @@ 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, cdrCfgIn.StorDbCfg().SSLMode, + cdrCfgIn.StorDbCfg().Password, cdrCfgIn.GeneralCfg().DBDataEncoding, cdrCfgIn.StorDbCfg().SSLMode, cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, cdrCfgIn.StorDbCfg().PrefixIndexedFields, cdrCfgIn.StorDbCfg().Items) @@ -85,7 +85,7 @@ func testCdrITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(cdrCfgIn.StorDbCfg().Type, cdrCfgIn.StorDbCfg().Host, cdrCfgIn.StorDbCfg().Port, cdrCfgIn.StorDbCfg().Name, cdrCfgIn.StorDbCfg().User, - cdrCfgIn.StorDbCfg().Password, cdrCfgIn.StorDbCfg().SSLMode, + cdrCfgIn.StorDbCfg().Password, cdrCfgIn.GeneralCfg().DBDataEncoding, cdrCfgIn.StorDbCfg().SSLMode, cdrCfgIn.StorDbCfg().MaxOpenConns, cdrCfgIn.StorDbCfg().MaxIdleConns, cdrCfgIn.StorDbCfg().ConnMaxLifetime, cdrCfgIn.StorDbCfg().StringIndexedFields, cdrCfgIn.StorDbCfg().PrefixIndexedFields, cdrCfgIn.StorDbCfg().Items) diff --git a/migrator/migrator_utils.go b/migrator/migrator_utils.go index 9b5ff0a15..7453920b8 100644 --- a/migrator/migrator_utils.go +++ b/migrator/migrator_utils.go @@ -54,12 +54,12 @@ func NewMigratorDataDB(db_type, host, port, name, user, pass, return d, nil } -func NewMigratorStorDB(db_type, host, port, name, user, pass, sslmode string, +func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler, sslmode string, maxConn, maxIdleConn, connMaxLifetime int, stringIndexedFields, prefixIndexedFields []string, itemsCacheCfg map[string]*config.ItemOpt) (db MigratorStorDB, err error) { var d MigratorStorDB storDb, err := engine.NewStorDBConn(db_type, host, port, name, user, - pass, sslmode, maxConn, maxIdleConn, connMaxLifetime, + pass, marshaler, sslmode, maxConn, maxIdleConn, connMaxLifetime, stringIndexedFields, prefixIndexedFields, itemsCacheCfg) if err != nil { return nil, err diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index 6a0fb66af..fee91904e 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -85,7 +85,7 @@ 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, sCostCfgIn.StorDbCfg().SSLMode, + sCostCfgIn.StorDbCfg().Password, sCostCfgIn.GeneralCfg().DBDataEncoding, sCostCfgIn.StorDbCfg().SSLMode, sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, sCostCfgIn.StorDbCfg().PrefixIndexedFields, sCostCfgIn.StorDbCfg().Items) @@ -95,7 +95,7 @@ func testSessionCostITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(sCostCfgOut.StorDbCfg().Type, sCostCfgOut.StorDbCfg().Host, sCostCfgOut.StorDbCfg().Port, sCostCfgOut.StorDbCfg().Name, sCostCfgOut.StorDbCfg().User, - sCostCfgOut.StorDbCfg().Password, sCostCfgIn.StorDbCfg().SSLMode, + sCostCfgOut.StorDbCfg().Password, sCostCfgOut.GeneralCfg().DBDataEncoding, sCostCfgIn.StorDbCfg().SSLMode, sCostCfgIn.StorDbCfg().MaxOpenConns, sCostCfgIn.StorDbCfg().MaxIdleConns, sCostCfgIn.StorDbCfg().ConnMaxLifetime, sCostCfgIn.StorDbCfg().StringIndexedFields, sCostCfgIn.StorDbCfg().PrefixIndexedFields, sCostCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_account_actions_it_test.go b/migrator/tp_account_actions_it_test.go index e149fcfd9..363ef5dfa 100644 --- a/migrator/tp_account_actions_it_test.go +++ b/migrator/tp_account_actions_it_test.go @@ -70,7 +70,7 @@ 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, tpAccActCfgIn.StorDbCfg().SSLMode, + tpAccActCfgIn.StorDbCfg().Password, tpAccActCfgIn.GeneralCfg().DBDataEncoding, tpAccActCfgIn.StorDbCfg().SSLMode, tpAccActCfgIn.StorDbCfg().MaxOpenConns, tpAccActCfgIn.StorDbCfg().MaxIdleConns, tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, tpAccActCfgIn.StorDbCfg().StringIndexedFields, tpAccActCfgIn.StorDbCfg().PrefixIndexedFields, tpAccActCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpAccActITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpAccActCfgOut.StorDbCfg().Type, tpAccActCfgOut.StorDbCfg().Host, tpAccActCfgOut.StorDbCfg().Port, tpAccActCfgOut.StorDbCfg().Name, tpAccActCfgOut.StorDbCfg().User, - tpAccActCfgOut.StorDbCfg().Password, tpAccActCfgIn.StorDbCfg().SSLMode, + tpAccActCfgOut.StorDbCfg().Password, tpAccActCfgOut.GeneralCfg().DBDataEncoding, tpAccActCfgIn.StorDbCfg().SSLMode, tpAccActCfgIn.StorDbCfg().MaxOpenConns, tpAccActCfgIn.StorDbCfg().MaxIdleConns, tpAccActCfgIn.StorDbCfg().ConnMaxLifetime, tpAccActCfgIn.StorDbCfg().StringIndexedFields, tpAccActCfgIn.StorDbCfg().PrefixIndexedFields, tpAccActCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_action_plans_it_test.go b/migrator/tp_action_plans_it_test.go index 17e27e931..215f9eaf3 100644 --- a/migrator/tp_action_plans_it_test.go +++ b/migrator/tp_action_plans_it_test.go @@ -70,7 +70,7 @@ 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, tpActPlnCfgIn.StorDbCfg().SSLMode, + tpActPlnCfgIn.StorDbCfg().Password, tpActPlnCfgIn.GeneralCfg().DBDataEncoding, tpActPlnCfgIn.StorDbCfg().SSLMode, tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpActPlnCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpActPlnITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpActPlnCfgOut.StorDbCfg().Type, tpActPlnCfgOut.StorDbCfg().Host, tpActPlnCfgOut.StorDbCfg().Port, tpActPlnCfgOut.StorDbCfg().Name, tpActPlnCfgOut.StorDbCfg().User, - tpActPlnCfgOut.StorDbCfg().Password, tpActPlnCfgIn.StorDbCfg().SSLMode, + tpActPlnCfgOut.StorDbCfg().Password, tpActPlnCfgOut.GeneralCfg().DBDataEncoding, tpActPlnCfgIn.StorDbCfg().SSLMode, tpActPlnCfgIn.StorDbCfg().MaxOpenConns, tpActPlnCfgIn.StorDbCfg().MaxIdleConns, tpActPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpActPlnCfgIn.StorDbCfg().StringIndexedFields, tpActPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpActPlnCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_action_triggers_it_test.go b/migrator/tp_action_triggers_it_test.go index 0dd4c6cbf..8bd815106 100644 --- a/migrator/tp_action_triggers_it_test.go +++ b/migrator/tp_action_triggers_it_test.go @@ -70,7 +70,7 @@ 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, tpActTrgCfgIn.StorDbCfg().SSLMode, + tpActTrgCfgIn.StorDbCfg().Password, tpActTrgCfgIn.GeneralCfg().DBDataEncoding, tpActTrgCfgIn.StorDbCfg().SSLMode, tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields, tpActTrgCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpActTrgITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpActTrgCfgOut.StorDbCfg().Type, tpActTrgCfgOut.StorDbCfg().Host, tpActTrgCfgOut.StorDbCfg().Port, tpActTrgCfgOut.StorDbCfg().Name, tpActTrgCfgOut.StorDbCfg().User, - tpActTrgCfgOut.StorDbCfg().Password, tpActTrgCfgIn.StorDbCfg().SSLMode, + tpActTrgCfgOut.StorDbCfg().Password, tpActTrgCfgOut.GeneralCfg().DBDataEncoding, tpActTrgCfgIn.StorDbCfg().SSLMode, tpActTrgCfgIn.StorDbCfg().MaxOpenConns, tpActTrgCfgIn.StorDbCfg().MaxIdleConns, tpActTrgCfgIn.StorDbCfg().ConnMaxLifetime, tpActTrgCfgIn.StorDbCfg().StringIndexedFields, tpActTrgCfgIn.StorDbCfg().PrefixIndexedFields, tpActTrgCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_actions_it_test.go b/migrator/tp_actions_it_test.go index 8a85e9e0a..178fcc127 100644 --- a/migrator/tp_actions_it_test.go +++ b/migrator/tp_actions_it_test.go @@ -70,7 +70,7 @@ 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, tpActCfgIn.StorDbCfg().SSLMode, + tpActCfgIn.StorDbCfg().Password, tpActCfgIn.GeneralCfg().DBDataEncoding, tpActCfgIn.StorDbCfg().SSLMode, tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, tpActCfgIn.StorDbCfg().PrefixIndexedFields, tpActCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpActITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpActCfgOut.StorDbCfg().Type, tpActCfgOut.StorDbCfg().Host, tpActCfgOut.StorDbCfg().Port, tpActCfgOut.StorDbCfg().Name, tpActCfgOut.StorDbCfg().User, - tpActCfgOut.StorDbCfg().Password, tpActCfgIn.StorDbCfg().SSLMode, + tpActCfgOut.StorDbCfg().Password, tpActCfgOut.GeneralCfg().DBDataEncoding, tpActCfgIn.StorDbCfg().SSLMode, tpActCfgIn.StorDbCfg().MaxOpenConns, tpActCfgIn.StorDbCfg().MaxIdleConns, tpActCfgIn.StorDbCfg().ConnMaxLifetime, tpActCfgIn.StorDbCfg().StringIndexedFields, tpActCfgIn.StorDbCfg().PrefixIndexedFields, tpActCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_destination_rates_it_test.go b/migrator/tp_destination_rates_it_test.go index 3cc57b706..17f834640 100644 --- a/migrator/tp_destination_rates_it_test.go +++ b/migrator/tp_destination_rates_it_test.go @@ -70,7 +70,7 @@ 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, tpDstRtCfgIn.StorDbCfg().SSLMode, + tpDstRtCfgIn.StorDbCfg().Password, tpDstRtCfgIn.GeneralCfg().DBDataEncoding, tpDstRtCfgIn.StorDbCfg().SSLMode, tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields, tpDstRtCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpDstRtITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpDstRtCfgOut.StorDbCfg().Type, tpDstRtCfgOut.StorDbCfg().Host, tpDstRtCfgOut.StorDbCfg().Port, tpDstRtCfgOut.StorDbCfg().Name, tpDstRtCfgOut.StorDbCfg().User, - tpDstRtCfgOut.StorDbCfg().Password, tpDstRtCfgIn.StorDbCfg().SSLMode, + tpDstRtCfgOut.StorDbCfg().Password, tpDstRtCfgOut.GeneralCfg().DBDataEncoding, tpDstRtCfgIn.StorDbCfg().SSLMode, tpDstRtCfgIn.StorDbCfg().MaxOpenConns, tpDstRtCfgIn.StorDbCfg().MaxIdleConns, tpDstRtCfgIn.StorDbCfg().ConnMaxLifetime, tpDstRtCfgIn.StorDbCfg().StringIndexedFields, tpDstRtCfgIn.StorDbCfg().PrefixIndexedFields, tpDstRtCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_destinations_it_test.go b/migrator/tp_destinations_it_test.go index b96119261..813c900c0 100644 --- a/migrator/tp_destinations_it_test.go +++ b/migrator/tp_destinations_it_test.go @@ -70,7 +70,7 @@ 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, tpDstCfgIn.StorDbCfg().SSLMode, + tpDstCfgIn.StorDbCfg().Password, tpDstCfgIn.GeneralCfg().DBDataEncoding, tpDstCfgIn.StorDbCfg().SSLMode, tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, tpDstCfgIn.StorDbCfg().PrefixIndexedFields, tpDstCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpDstITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpDstCfgOut.StorDbCfg().Type, tpDstCfgOut.StorDbCfg().Host, tpDstCfgOut.StorDbCfg().Port, tpDstCfgOut.StorDbCfg().Name, tpDstCfgOut.StorDbCfg().User, - tpDstCfgOut.StorDbCfg().Password, tpDstCfgIn.StorDbCfg().SSLMode, + tpDstCfgOut.StorDbCfg().Password, tpDstCfgOut.GeneralCfg().DBDataEncoding, tpDstCfgIn.StorDbCfg().SSLMode, tpDstCfgIn.StorDbCfg().MaxOpenConns, tpDstCfgIn.StorDbCfg().MaxIdleConns, tpDstCfgIn.StorDbCfg().ConnMaxLifetime, tpDstCfgIn.StorDbCfg().StringIndexedFields, tpDstCfgIn.StorDbCfg().PrefixIndexedFields, tpDstCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_dispatchers_it_test.go b/migrator/tp_dispatchers_it_test.go index bf868518f..34ca646f2 100644 --- a/migrator/tp_dispatchers_it_test.go +++ b/migrator/tp_dispatchers_it_test.go @@ -70,7 +70,7 @@ 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, tpDispCfgIn.StorDbCfg().SSLMode, + tpDispCfgIn.StorDbCfg().Password, tpDispCfgIn.GeneralCfg().DBDataEncoding, tpDispCfgIn.StorDbCfg().SSLMode, tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, tpDispCfgIn.StorDbCfg().PrefixIndexedFields, tpDispCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpDispITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpDispCfgOut.StorDbCfg().Type, tpDispCfgOut.StorDbCfg().Host, tpDispCfgOut.StorDbCfg().Port, tpDispCfgOut.StorDbCfg().Name, tpDispCfgOut.StorDbCfg().User, - tpDispCfgOut.StorDbCfg().Password, tpDispCfgIn.StorDbCfg().SSLMode, + tpDispCfgOut.StorDbCfg().Password, tpDispCfgOut.GeneralCfg().DBDataEncoding, tpDispCfgIn.StorDbCfg().SSLMode, tpDispCfgIn.StorDbCfg().MaxOpenConns, tpDispCfgIn.StorDbCfg().MaxIdleConns, tpDispCfgIn.StorDbCfg().ConnMaxLifetime, tpDispCfgIn.StorDbCfg().StringIndexedFields, tpDispCfgIn.StorDbCfg().PrefixIndexedFields, tpDispCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_filters_it_test.go b/migrator/tp_filters_it_test.go index d7b2d0b0a..eb005b644 100755 --- a/migrator/tp_filters_it_test.go +++ b/migrator/tp_filters_it_test.go @@ -70,7 +70,7 @@ 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, tpFltrCfgOut.StorDbCfg().SSLMode, + tpFltrCfgIn.StorDbCfg().Password, tpFltrCfgIn.GeneralCfg().DBDataEncoding, tpFltrCfgOut.StorDbCfg().SSLMode, tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, tpFltrCfgOut.StorDbCfg().PrefixIndexedFields, tpFltrCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpFltrITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpFltrCfgOut.StorDbCfg().Type, tpFltrCfgOut.StorDbCfg().Host, tpFltrCfgOut.StorDbCfg().Port, tpFltrCfgOut.StorDbCfg().Name, tpFltrCfgOut.StorDbCfg().User, - tpFltrCfgOut.StorDbCfg().Password, tpFltrCfgOut.StorDbCfg().SSLMode, + tpFltrCfgOut.StorDbCfg().Password, tpFltrCfgOut.GeneralCfg().DBDataEncoding, tpFltrCfgOut.StorDbCfg().SSLMode, tpFltrCfgOut.StorDbCfg().MaxOpenConns, tpFltrCfgOut.StorDbCfg().MaxIdleConns, tpFltrCfgOut.StorDbCfg().ConnMaxLifetime, tpFltrCfgOut.StorDbCfg().StringIndexedFields, tpFltrCfgOut.StorDbCfg().PrefixIndexedFields, tpFltrCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_rates_it_test.go b/migrator/tp_rates_it_test.go index e9bbc551e..31a305288 100644 --- a/migrator/tp_rates_it_test.go +++ b/migrator/tp_rates_it_test.go @@ -70,7 +70,7 @@ 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, tpRatesCfgIn.StorDbCfg().SSLMode, + tpRatesCfgIn.StorDbCfg().Password, tpRatesCfgIn.GeneralCfg().DBDataEncoding, tpRatesCfgIn.StorDbCfg().SSLMode, tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, tpRatesCfgIn.StorDbCfg().PrefixIndexedFields, tpRatesCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpRatesITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpRatesCfgOut.StorDbCfg().Type, tpRatesCfgOut.StorDbCfg().Host, tpRatesCfgOut.StorDbCfg().Port, tpRatesCfgOut.StorDbCfg().Name, tpRatesCfgOut.StorDbCfg().User, - tpRatesCfgOut.StorDbCfg().Password, tpRatesCfgIn.StorDbCfg().SSLMode, + tpRatesCfgOut.StorDbCfg().Password, tpRatesCfgOut.GeneralCfg().DBDataEncoding, tpRatesCfgIn.StorDbCfg().SSLMode, tpRatesCfgIn.StorDbCfg().MaxOpenConns, tpRatesCfgIn.StorDbCfg().MaxIdleConns, tpRatesCfgIn.StorDbCfg().ConnMaxLifetime, tpRatesCfgIn.StorDbCfg().StringIndexedFields, tpRatesCfgIn.StorDbCfg().PrefixIndexedFields, tpRatesCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_rating_plans_it_test.go b/migrator/tp_rating_plans_it_test.go index 0f2289796..34e4b4780 100644 --- a/migrator/tp_rating_plans_it_test.go +++ b/migrator/tp_rating_plans_it_test.go @@ -70,7 +70,7 @@ 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, tpRatPlnCfgIn.StorDbCfg().SSLMode, + tpRatPlnCfgIn.StorDbCfg().Password, tpRatPlnCfgIn.GeneralCfg().DBDataEncoding, tpRatPlnCfgIn.StorDbCfg().SSLMode, tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPlnCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpRatPlnITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpRatPlnCfgOut.StorDbCfg().Type, tpRatPlnCfgOut.StorDbCfg().Host, tpRatPlnCfgOut.StorDbCfg().Port, tpRatPlnCfgOut.StorDbCfg().Name, tpRatPlnCfgOut.StorDbCfg().User, - tpRatPlnCfgOut.StorDbCfg().Password, tpRatPlnCfgIn.StorDbCfg().SSLMode, + tpRatPlnCfgOut.StorDbCfg().Password, tpRatPlnCfgOut.GeneralCfg().DBDataEncoding, tpRatPlnCfgIn.StorDbCfg().SSLMode, tpRatPlnCfgIn.StorDbCfg().MaxOpenConns, tpRatPlnCfgIn.StorDbCfg().MaxIdleConns, tpRatPlnCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPlnCfgIn.StorDbCfg().StringIndexedFields, tpRatPlnCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPlnCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_rating_profiles_it_test.go b/migrator/tp_rating_profiles_it_test.go index f724ddc3b..dd47bcd7c 100644 --- a/migrator/tp_rating_profiles_it_test.go +++ b/migrator/tp_rating_profiles_it_test.go @@ -70,7 +70,7 @@ 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, tpRatPrfCfgIn.StorDbCfg().SSLMode, + tpRatPrfCfgIn.StorDbCfg().Password, tpRatPrfCfgIn.GeneralCfg().DBDataEncoding, tpRatPrfCfgIn.StorDbCfg().SSLMode, tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPrfCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpRatPrfITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpRatPrfCfgOut.StorDbCfg().Type, tpRatPrfCfgOut.StorDbCfg().Host, tpRatPrfCfgOut.StorDbCfg().Port, tpRatPrfCfgOut.StorDbCfg().Name, tpRatPrfCfgOut.StorDbCfg().User, - tpRatPrfCfgOut.StorDbCfg().Password, tpRatPrfCfgIn.StorDbCfg().SSLMode, + tpRatPrfCfgOut.StorDbCfg().Password, tpRatPrfCfgOut.GeneralCfg().DBDataEncoding, tpRatPrfCfgIn.StorDbCfg().SSLMode, tpRatPrfCfgIn.StorDbCfg().MaxOpenConns, tpRatPrfCfgIn.StorDbCfg().MaxIdleConns, tpRatPrfCfgIn.StorDbCfg().ConnMaxLifetime, tpRatPrfCfgIn.StorDbCfg().StringIndexedFields, tpRatPrfCfgIn.StorDbCfg().PrefixIndexedFields, tpRatPrfCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_resources_it_test.go b/migrator/tp_resources_it_test.go index d68bd5699..8491d4316 100644 --- a/migrator/tp_resources_it_test.go +++ b/migrator/tp_resources_it_test.go @@ -71,7 +71,7 @@ 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, tpResCfgIn.StorDbCfg().SSLMode, + tpResCfgIn.StorDbCfg().Password, tpResCfgIn.GeneralCfg().DBDataEncoding, tpResCfgIn.StorDbCfg().SSLMode, tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, tpResCfgIn.StorDbCfg().PrefixIndexedFields, tpResCfgIn.StorDbCfg().Items) @@ -81,7 +81,7 @@ func testTpResITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpResCfgOut.StorDbCfg().Type, tpResCfgOut.StorDbCfg().Host, tpResCfgOut.StorDbCfg().Port, tpResCfgOut.StorDbCfg().Name, tpResCfgOut.StorDbCfg().User, - tpResCfgOut.StorDbCfg().Password, tpResCfgIn.StorDbCfg().SSLMode, + tpResCfgOut.StorDbCfg().Password, tpResCfgOut.GeneralCfg().DBDataEncoding, tpResCfgIn.StorDbCfg().SSLMode, tpResCfgIn.StorDbCfg().MaxOpenConns, tpResCfgIn.StorDbCfg().MaxIdleConns, tpResCfgIn.StorDbCfg().ConnMaxLifetime, tpResCfgIn.StorDbCfg().StringIndexedFields, tpResCfgIn.StorDbCfg().PrefixIndexedFields, tpResCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_shared_groups_it_test.go b/migrator/tp_shared_groups_it_test.go index 90283894a..f8f6273db 100644 --- a/migrator/tp_shared_groups_it_test.go +++ b/migrator/tp_shared_groups_it_test.go @@ -70,7 +70,7 @@ 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, tpShrGrCfgIn.StorDbCfg().SSLMode, + tpShrGrCfgIn.StorDbCfg().Password, tpShrGrCfgIn.GeneralCfg().DBDataEncoding, tpShrGrCfgIn.StorDbCfg().SSLMode, tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields, tpShrGrCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpShrGrITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpShrGrCfgOut.StorDbCfg().Type, tpShrGrCfgOut.StorDbCfg().Host, tpShrGrCfgOut.StorDbCfg().Port, tpShrGrCfgOut.StorDbCfg().Name, tpShrGrCfgOut.StorDbCfg().User, - tpShrGrCfgOut.StorDbCfg().Password, tpShrGrCfgIn.StorDbCfg().SSLMode, + tpShrGrCfgOut.StorDbCfg().Password, tpShrGrCfgOut.GeneralCfg().DBDataEncoding, tpShrGrCfgIn.StorDbCfg().SSLMode, tpShrGrCfgIn.StorDbCfg().MaxOpenConns, tpShrGrCfgIn.StorDbCfg().MaxIdleConns, tpShrGrCfgIn.StorDbCfg().ConnMaxLifetime, tpShrGrCfgIn.StorDbCfg().StringIndexedFields, tpShrGrCfgIn.StorDbCfg().PrefixIndexedFields, tpShrGrCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_stats_it_test.go b/migrator/tp_stats_it_test.go index 5b55f6d36..dd14d419d 100644 --- a/migrator/tp_stats_it_test.go +++ b/migrator/tp_stats_it_test.go @@ -70,7 +70,7 @@ 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, tpStatsCfgIn.StorDbCfg().SSLMode, + tpStatsCfgIn.StorDbCfg().Password, tpStatsCfgIn.GeneralCfg().DBDataEncoding, tpStatsCfgIn.StorDbCfg().SSLMode, tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, tpStatsCfgIn.StorDbCfg().PrefixIndexedFields, tpStatsCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpStatsITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpStatsCfgOut.StorDbCfg().Type, tpStatsCfgOut.StorDbCfg().Host, tpStatsCfgOut.StorDbCfg().Port, tpStatsCfgOut.StorDbCfg().Name, tpStatsCfgOut.StorDbCfg().User, - tpStatsCfgOut.StorDbCfg().Password, tpStatsCfgIn.StorDbCfg().SSLMode, + tpStatsCfgOut.StorDbCfg().Password, tpStatsCfgOut.GeneralCfg().DBDataEncoding, tpStatsCfgIn.StorDbCfg().SSLMode, tpStatsCfgIn.StorDbCfg().MaxOpenConns, tpStatsCfgIn.StorDbCfg().MaxIdleConns, tpStatsCfgIn.StorDbCfg().ConnMaxLifetime, tpStatsCfgIn.StorDbCfg().StringIndexedFields, tpStatsCfgIn.StorDbCfg().PrefixIndexedFields, tpStatsCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_suppliers_it_test.go b/migrator/tp_suppliers_it_test.go index ebea3036b..fb69ebb91 100644 --- a/migrator/tp_suppliers_it_test.go +++ b/migrator/tp_suppliers_it_test.go @@ -71,7 +71,7 @@ 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, tpSplCfgIn.StorDbCfg().SSLMode, + tpSplCfgIn.StorDbCfg().Password, tpSplCfgIn.GeneralCfg().DBDataEncoding, tpSplCfgIn.StorDbCfg().SSLMode, tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, tpSplCfgIn.StorDbCfg().PrefixIndexedFields, tpSplCfgIn.StorDbCfg().Items) @@ -81,7 +81,7 @@ func testTpSplITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpSplCfgOut.StorDbCfg().Type, tpSplCfgOut.StorDbCfg().Host, tpSplCfgOut.StorDbCfg().Port, tpSplCfgOut.StorDbCfg().Name, tpSplCfgOut.StorDbCfg().User, - tpSplCfgOut.StorDbCfg().Password, tpSplCfgIn.StorDbCfg().SSLMode, + tpSplCfgOut.StorDbCfg().Password, tpSplCfgOut.GeneralCfg().DBDataEncoding, tpSplCfgIn.StorDbCfg().SSLMode, tpSplCfgIn.StorDbCfg().MaxOpenConns, tpSplCfgIn.StorDbCfg().MaxIdleConns, tpSplCfgIn.StorDbCfg().ConnMaxLifetime, tpSplCfgIn.StorDbCfg().StringIndexedFields, tpSplCfgIn.StorDbCfg().PrefixIndexedFields, tpSplCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_thresholds_it_test.go b/migrator/tp_thresholds_it_test.go index cdb119b36..906061dee 100644 --- a/migrator/tp_thresholds_it_test.go +++ b/migrator/tp_thresholds_it_test.go @@ -71,7 +71,7 @@ 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, tpTresCfgIn.StorDbCfg().SSLMode, + tpTresCfgIn.StorDbCfg().Password, tpTresCfgIn.GeneralCfg().DBDataEncoding, tpTresCfgIn.StorDbCfg().SSLMode, tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, tpTresCfgIn.StorDbCfg().PrefixIndexedFields, tpTresCfgIn.StorDbCfg().Items) @@ -81,7 +81,7 @@ func testTpTresITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpTresCfgOut.StorDbCfg().Type, tpTresCfgOut.StorDbCfg().Host, tpTresCfgOut.StorDbCfg().Port, tpTresCfgOut.StorDbCfg().Name, tpTresCfgOut.StorDbCfg().User, - tpTresCfgOut.StorDbCfg().Password, tpTresCfgIn.StorDbCfg().SSLMode, + tpTresCfgOut.StorDbCfg().Password, tpTresCfgOut.GeneralCfg().DBDataEncoding, tpTresCfgIn.StorDbCfg().SSLMode, tpTresCfgIn.StorDbCfg().MaxOpenConns, tpTresCfgIn.StorDbCfg().MaxIdleConns, tpTresCfgIn.StorDbCfg().ConnMaxLifetime, tpTresCfgIn.StorDbCfg().StringIndexedFields, tpTresCfgIn.StorDbCfg().PrefixIndexedFields, tpTresCfgOut.StorDbCfg().Items) diff --git a/migrator/tp_timings_it_test.go b/migrator/tp_timings_it_test.go index 698a33cd6..737be1166 100644 --- a/migrator/tp_timings_it_test.go +++ b/migrator/tp_timings_it_test.go @@ -70,7 +70,7 @@ 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, tpTimCfgIn.StorDbCfg().SSLMode, + tpTimCfgIn.StorDbCfg().Password, tpTimCfgIn.GeneralCfg().DBDataEncoding, tpTimCfgIn.StorDbCfg().SSLMode, tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, tpTimCfgIn.StorDbCfg().PrefixIndexedFields, tpTimCfgIn.StorDbCfg().Items) @@ -80,7 +80,7 @@ func testTpTimITConnect(t *testing.T) { storDBOut, err := NewMigratorStorDB(tpTimCfgOut.StorDbCfg().Type, tpTimCfgOut.StorDbCfg().Host, tpTimCfgOut.StorDbCfg().Port, tpTimCfgOut.StorDbCfg().Name, tpTimCfgOut.StorDbCfg().User, - tpTimCfgOut.StorDbCfg().Password, tpTimCfgIn.StorDbCfg().SSLMode, + tpTimCfgOut.StorDbCfg().Password, tpTimCfgOut.GeneralCfg().DBDataEncoding, tpTimCfgIn.StorDbCfg().SSLMode, tpTimCfgIn.StorDbCfg().MaxOpenConns, tpTimCfgIn.StorDbCfg().MaxIdleConns, tpTimCfgIn.StorDbCfg().ConnMaxLifetime, tpTimCfgIn.StorDbCfg().StringIndexedFields, tpTimCfgIn.StorDbCfg().PrefixIndexedFields, tpTimCfgOut.StorDbCfg().Items) diff --git a/migrator/versions_it_test.go b/migrator/versions_it_test.go index 070a44238..2cd27b201 100644 --- a/migrator/versions_it_test.go +++ b/migrator/versions_it_test.go @@ -85,7 +85,7 @@ 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().SSLMode, + vrsCfg.StorDbCfg().Password, vrsCfg.GeneralCfg().DBDataEncoding, vrsCfg.StorDbCfg().SSLMode, vrsCfg.StorDbCfg().MaxOpenConns, vrsCfg.StorDbCfg().MaxIdleConns, vrsCfg.StorDbCfg().ConnMaxLifetime, vrsCfg.StorDbCfg().StringIndexedFields, vrsCfg.StorDbCfg().PrefixIndexedFields, vrsCfg.StorDbCfg().Items) diff --git a/services/stordb.go b/services/stordb.go index 6c47f1e75..4975692ff 100644 --- a/services/stordb.go +++ b/services/stordb.go @@ -59,7 +59,8 @@ func (db *StorDBService) Start() (err error) { db.oldDBCfg = db.cfg.StorDbCfg().Clone() d, err := engine.NewStorDBConn(db.cfg.StorDbCfg().Type, db.cfg.StorDbCfg().Host, db.cfg.StorDbCfg().Port, db.cfg.StorDbCfg().Name, db.cfg.StorDbCfg().User, - db.cfg.StorDbCfg().Password, db.cfg.StorDbCfg().SSLMode, db.cfg.StorDbCfg().MaxOpenConns, + db.cfg.StorDbCfg().Password, db.cfg.GeneralCfg().DBDataEncoding, + db.cfg.StorDbCfg().SSLMode, db.cfg.StorDbCfg().MaxOpenConns, db.cfg.StorDbCfg().MaxIdleConns, db.cfg.StorDbCfg().ConnMaxLifetime, db.cfg.StorDbCfg().StringIndexedFields, db.cfg.StorDbCfg().PrefixIndexedFields, db.cfg.StorDbCfg().Items) @@ -90,7 +91,8 @@ func (db *StorDBService) Reload() (err error) { var d engine.StorDB if d, err = engine.NewStorDBConn(db.cfg.StorDbCfg().Type, db.cfg.StorDbCfg().Host, db.cfg.StorDbCfg().Port, db.cfg.StorDbCfg().Name, db.cfg.StorDbCfg().User, - db.cfg.StorDbCfg().Password, db.cfg.StorDbCfg().SSLMode, db.cfg.StorDbCfg().MaxOpenConns, + db.cfg.StorDbCfg().Password, db.cfg.GeneralCfg().DBDataEncoding, + db.cfg.StorDbCfg().SSLMode, db.cfg.StorDbCfg().MaxOpenConns, db.cfg.StorDbCfg().MaxIdleConns, db.cfg.StorDbCfg().ConnMaxLifetime, db.cfg.StorDbCfg().StringIndexedFields, db.cfg.StorDbCfg().PrefixIndexedFields, db.cfg.StorDbCfg().Items); err != nil {