diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 0fd981cd7..e1ee328ea 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -263,7 +263,7 @@ func (apierSv1 *APIerSv1) LoadDestination(attrs *AttrLoadDestination, reply *str dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -295,7 +295,7 @@ func (apierSv1 *APIerSv1) LoadRatingPlan(attrs *AttrLoadRatingPlan, reply *strin dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -319,7 +319,7 @@ func (apierSv1 *APIerSv1) LoadRatingProfile(attrs *utils.TPRatingProfile, reply dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -349,7 +349,7 @@ func (apierSv1 *APIerSv1) LoadSharedGroup(attrs *AttrLoadSharedGroup, reply *str dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -376,7 +376,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromStorDb(attrs *AttrLoadTpFromStorDb, dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -1016,7 +1016,7 @@ func (apierSv1 *APIerSv1) LoadAccountActions(attrs *utils.TPAccountActions, repl dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -1055,7 +1055,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFo engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -1121,7 +1121,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromFolder(attrs *utils.AttrLoadTpFromFolder, loader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -1175,7 +1175,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromStorDB(attrs *AttrLoadTpFromStorDb, reply dbReader, err := engine.NewTpReader(apierSv1.DataManager.DataDB(), apierSv1.StorDb, attrs.TPid, apierSv1.Config.GeneralCfg().DefaultTimezone, apierSv1.Config.ApierCfg().CachesConns, apierSv1.Config.ApierCfg().SchedulerConns, - apierSv1.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apierSv1.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 1893cc3ce..46e7caa89 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -57,7 +57,7 @@ func (apiv2 *APIerSv2) LoadRatingProfile(attrs *AttrLoadRatingProfile, reply *st dbReader, err := engine.NewTpReader(apiv2.DataManager.DataDB(), apiv2.StorDb, attrs.TPid, apiv2.Config.GeneralCfg().DefaultTimezone, apiv2.Config.ApierCfg().CachesConns, apiv2.Config.ApierCfg().SchedulerConns, - apiv2.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apiv2.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -87,7 +87,7 @@ func (apiv2 *APIerSv2) LoadAccountActions(attrs *AttrLoadAccountActions, reply * dbReader, err := engine.NewTpReader(apiv2.DataManager.DataDB(), apiv2.StorDb, attrs.TPid, apiv2.Config.GeneralCfg().DefaultTimezone, apiv2.Config.ApierCfg().CachesConns, apiv2.Config.ApierCfg().SchedulerConns, - apiv2.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apiv2.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } @@ -121,7 +121,7 @@ func (apiv2 *APIerSv2) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFolde loader, err := engine.NewTpReader(apiv2.DataManager.DataDB(), engine.NewFileCSVStorage(utils.CSVSep, attrs.FolderPath), "", apiv2.Config.GeneralCfg().DefaultTimezone, apiv2.Config.ApierCfg().CachesConns, apiv2.Config.ApierCfg().SchedulerConns, - apiv2.Config.DataDbCfg().DataDbType == utils.INTERNAL) + apiv2.Config.DataDbCfg().Type == utils.INTERNAL) if err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index 4ad5e0cec..23166654d 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -103,10 +103,10 @@ func testAPIerSv2itResetStorDb(t *testing.T) { } func testAPIerSv2itConnectDataDB(t *testing.T) { - rdsITdb, err := engine.NewDataDBConn(apierCfg.DataDbCfg().DataDbType, - apierCfg.DataDbCfg().DataDbHost, apierCfg.DataDbCfg().DataDbPort, - apierCfg.DataDbCfg().DataDbName, apierCfg.DataDbCfg().DataDbUser, - apierCfg.DataDbCfg().DataDbPass, apierCfg.GeneralCfg().DBDataEncoding, + rdsITdb, err := engine.NewDataDBConn(apierCfg.DataDbCfg().Type, + apierCfg.DataDbCfg().Host, apierCfg.DataDbCfg().Port, + apierCfg.DataDbCfg().Name, apierCfg.DataDbCfg().User, + apierCfg.DataDbCfg().Password, apierCfg.GeneralCfg().DBDataEncoding, apierCfg.DataDbCfg().Opts) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) diff --git a/cmd/cgr-console/cgr-console.go b/cmd/cgr-console/cgr-console.go index 4287728c9..39bb367f2 100644 --- a/cmd/cgr-console/cgr-console.go +++ b/cmd/cgr-console/cgr-console.go @@ -158,7 +158,7 @@ func main() { if strings.HasPrefix(line, name) { // get last word lastSpace := strings.LastIndex(line, utils.SepCgr) - lastSpace += 1 + lastSpace++ for _, arg := range cmd.ClientArgs() { if strings.HasPrefix(arg, line[lastSpace:]) { comp = append(comp, line[:lastSpace]+arg) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 84db64f90..a297f7ba4 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -40,17 +40,17 @@ var ( dfltCfg = config.CgrConfig() cfgPath = cgrLoaderFlags.String(utils.CfgPathCgr, utils.EmptyString, "Configuration directory path.") - dataDBType = cgrLoaderFlags.String(utils.DataDBTypeCgr, dfltCfg.DataDbCfg().DataDbType, + dataDBType = cgrLoaderFlags.String(utils.DataDBTypeCgr, dfltCfg.DataDbCfg().Type, "The type of the DataDB database <*redis|*mongo>") - dataDBHost = cgrLoaderFlags.String(utils.DataDBHostCgr, dfltCfg.DataDbCfg().DataDbHost, + dataDBHost = cgrLoaderFlags.String(utils.DataDBHostCgr, dfltCfg.DataDbCfg().Host, "The DataDb host to connect to.") - dataDBPort = cgrLoaderFlags.String(utils.DataDBPortCgr, dfltCfg.DataDbCfg().DataDbPort, + dataDBPort = cgrLoaderFlags.String(utils.DataDBPortCgr, dfltCfg.DataDbCfg().Port, "The DataDb port to bind to.") - dataDBName = cgrLoaderFlags.String(utils.DataDBNameCgr, dfltCfg.DataDbCfg().DataDbName, + dataDBName = cgrLoaderFlags.String(utils.DataDBNameCgr, dfltCfg.DataDbCfg().Name, "The name/number of the DataDb to connect to.") - dataDBUser = cgrLoaderFlags.String(utils.DataDBUserCgr, dfltCfg.DataDbCfg().DataDbUser, + dataDBUser = cgrLoaderFlags.String(utils.DataDBUserCgr, dfltCfg.DataDbCfg().User, "The DataDb user to sign in as.") - dataDBPasswd = cgrLoaderFlags.String(utils.DataDBPasswdCgr, dfltCfg.DataDbCfg().DataDbPass, + dataDBPasswd = cgrLoaderFlags.String(utils.DataDBPasswdCgr, dfltCfg.DataDbCfg().Password, "The DataDb user's password.") dbDataEncoding = cgrLoaderFlags.String(utils.DBDataEncodingCfg, dfltCfg.GeneralCfg().DBDataEncoding, "The encoding used to store object data in strings") @@ -123,28 +123,28 @@ func loadConfig() (ldrCfg *config.CGRConfig) { config.SetCgrConfig(ldrCfg) } // Data for DataDB - if *dataDBType != dfltCfg.DataDbCfg().DataDbType { - ldrCfg.DataDbCfg().DataDbType = strings.TrimPrefix(*dataDBType, utils.Meta) + if *dataDBType != dfltCfg.DataDbCfg().Type { + ldrCfg.DataDbCfg().Type = strings.TrimPrefix(*dataDBType, utils.Meta) } - if *dataDBHost != dfltCfg.DataDbCfg().DataDbHost { - ldrCfg.DataDbCfg().DataDbHost = *dataDBHost + if *dataDBHost != dfltCfg.DataDbCfg().Host { + ldrCfg.DataDbCfg().Host = *dataDBHost } - if *dataDBPort != dfltCfg.DataDbCfg().DataDbPort { - ldrCfg.DataDbCfg().DataDbPort = *dataDBPort + if *dataDBPort != dfltCfg.DataDbCfg().Port { + ldrCfg.DataDbCfg().Port = *dataDBPort } - if *dataDBName != dfltCfg.DataDbCfg().DataDbName { - ldrCfg.DataDbCfg().DataDbName = *dataDBName + if *dataDBName != dfltCfg.DataDbCfg().Name { + ldrCfg.DataDbCfg().Name = *dataDBName } - if *dataDBUser != dfltCfg.DataDbCfg().DataDbUser { - ldrCfg.DataDbCfg().DataDbUser = *dataDBUser + if *dataDBUser != dfltCfg.DataDbCfg().User { + ldrCfg.DataDbCfg().User = *dataDBUser } - if *dataDBPasswd != dfltCfg.DataDbCfg().DataDbPass { - ldrCfg.DataDbCfg().DataDbPass = *dataDBPasswd + if *dataDBPasswd != dfltCfg.DataDbCfg().Password { + ldrCfg.DataDbCfg().Password = *dataDBPasswd } if *dbRedisSentinel != utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.RedisSentinelNameCfg]) { @@ -327,10 +327,10 @@ func main() { engine.NewConnManager(ldrCfg, nil) if !*toStorDB { - if dataDB, err = engine.NewDataDBConn(ldrCfg.DataDbCfg().DataDbType, - ldrCfg.DataDbCfg().DataDbHost, ldrCfg.DataDbCfg().DataDbPort, - ldrCfg.DataDbCfg().DataDbName, ldrCfg.DataDbCfg().DataDbUser, - ldrCfg.DataDbCfg().DataDbPass, ldrCfg.GeneralCfg().DBDataEncoding, + if dataDB, err = engine.NewDataDBConn(ldrCfg.DataDbCfg().Type, + ldrCfg.DataDbCfg().Host, ldrCfg.DataDbCfg().Port, + ldrCfg.DataDbCfg().Name, ldrCfg.DataDbCfg().User, + ldrCfg.DataDbCfg().Password, ldrCfg.GeneralCfg().DBDataEncoding, ldrCfg.DataDbCfg().Opts); err != nil { log.Fatalf("Coud not open dataDB connection: %s", err.Error()) } diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index 44c85f61c..da18932fd 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -51,12 +51,12 @@ func TestLoadConfig(t *testing.T) { *dataDBPasswd = "toor" *dbRedisSentinel = "sentinel1" expDBcfg := &config.DataDbCfg{ - DataDbType: utils.Redis, - DataDbHost: "localhost", - DataDbPort: "2012", - DataDbName: "100", - DataDbUser: "cgrates2", - DataDbPass: "toor", + Type: utils.Redis, + Host: "localhost", + Port: "2012", + Name: "100", + User: "cgrates2", + Password: "toor", Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel1", utils.QueryTimeoutCfg: "10s", @@ -273,10 +273,10 @@ func testLoadItStartLoader(t *testing.T) { func testLoadItConnectToDB(t *testing.T) { var err error - if db, err = engine.NewDataDBConn(ldrItCfg.DataDbCfg().DataDbType, - ldrItCfg.DataDbCfg().DataDbHost, ldrItCfg.DataDbCfg().DataDbPort, - ldrItCfg.DataDbCfg().DataDbName, ldrItCfg.DataDbCfg().DataDbUser, - ldrItCfg.DataDbCfg().DataDbPass, ldrItCfg.GeneralCfg().DBDataEncoding, + if db, err = engine.NewDataDBConn(ldrItCfg.DataDbCfg().Type, + ldrItCfg.DataDbCfg().Host, ldrItCfg.DataDbCfg().Port, + ldrItCfg.DataDbCfg().Name, ldrItCfg.DataDbCfg().User, + ldrItCfg.DataDbCfg().Password, ldrItCfg.GeneralCfg().DBDataEncoding, ldrItCfg.DataDbCfg().Opts); err != nil { t.Fatal(err) } diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index cd1d6512a..8d784431f 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -49,17 +49,17 @@ var ( "<*set_versions|*cost_details|*accounts|*actions|*action_triggers|*action_plans|*shared_groups|*filters|*stordb|*datadb>") version = cgrMigratorFlags.Bool(utils.ElsVersionLow, false, "prints the application version") - inDataDBType = cgrMigratorFlags.String(utils.DataDBTypeCgr, dfltCfg.DataDbCfg().DataDbType, + inDataDBType = cgrMigratorFlags.String(utils.DataDBTypeCgr, dfltCfg.DataDbCfg().Type, "the type of the DataDB Database <*redis|*mongo>") - inDataDBHost = cgrMigratorFlags.String(utils.DataDBHostCgr, dfltCfg.DataDbCfg().DataDbHost, + inDataDBHost = cgrMigratorFlags.String(utils.DataDBHostCgr, dfltCfg.DataDbCfg().Host, "the DataDB host") - inDataDBPort = cgrMigratorFlags.String(utils.DataDBPortCgr, dfltCfg.DataDbCfg().DataDbPort, + inDataDBPort = cgrMigratorFlags.String(utils.DataDBPortCgr, dfltCfg.DataDbCfg().Port, "the DataDB port") - inDataDBName = cgrMigratorFlags.String(utils.DataDBNameCgr, dfltCfg.DataDbCfg().DataDbName, + inDataDBName = cgrMigratorFlags.String(utils.DataDBNameCgr, dfltCfg.DataDbCfg().Name, "the name/number of the DataDB") - inDataDBUser = cgrMigratorFlags.String(utils.DataDBUserCgr, dfltCfg.DataDbCfg().DataDbUser, + inDataDBUser = cgrMigratorFlags.String(utils.DataDBUserCgr, dfltCfg.DataDbCfg().User, "the DataDB user") - inDataDBPass = cgrMigratorFlags.String(utils.DataDBPasswdCgr, dfltCfg.DataDbCfg().DataDbPass, + inDataDBPass = cgrMigratorFlags.String(utils.DataDBPasswdCgr, dfltCfg.DataDbCfg().Password, "the DataDB password") inDBDataEncoding = cgrMigratorFlags.String(utils.DBDataEncodingCfg, dfltCfg.GeneralCfg().DBDataEncoding, "the encoding used to store object Data in strings") @@ -148,23 +148,23 @@ func main() { } // inDataDB - if *inDataDBType != dfltCfg.DataDbCfg().DataDbType { - mgrCfg.DataDbCfg().DataDbType = strings.TrimPrefix(*inDataDBType, utils.MaskChar) + if *inDataDBType != dfltCfg.DataDbCfg().Type { + mgrCfg.DataDbCfg().Type = strings.TrimPrefix(*inDataDBType, utils.MaskChar) } - if *inDataDBHost != dfltCfg.DataDbCfg().DataDbHost { - mgrCfg.DataDbCfg().DataDbHost = *inDataDBHost + if *inDataDBHost != dfltCfg.DataDbCfg().Host { + mgrCfg.DataDbCfg().Host = *inDataDBHost } - if *inDataDBPort != dfltCfg.DataDbCfg().DataDbPort { - mgrCfg.DataDbCfg().DataDbPort = *inDataDBPort + if *inDataDBPort != dfltCfg.DataDbCfg().Port { + mgrCfg.DataDbCfg().Port = *inDataDBPort } - if *inDataDBName != dfltCfg.DataDbCfg().DataDbName { - mgrCfg.DataDbCfg().DataDbName = *inDataDBName + if *inDataDBName != dfltCfg.DataDbCfg().Name { + mgrCfg.DataDbCfg().Name = *inDataDBName } - if *inDataDBUser != dfltCfg.DataDbCfg().DataDbUser { - mgrCfg.DataDbCfg().DataDbUser = *inDataDBUser + if *inDataDBUser != dfltCfg.DataDbCfg().User { + mgrCfg.DataDbCfg().User = *inDataDBUser } - if *inDataDBPass != dfltCfg.DataDbCfg().DataDbPass { - mgrCfg.DataDbCfg().DataDbPass = *inDataDBPass + if *inDataDBPass != dfltCfg.DataDbCfg().Password { + mgrCfg.DataDbCfg().Password = *inDataDBPass } if *inDBDataEncoding != dfltCfg.GeneralCfg().DBDataEncoding { mgrCfg.GeneralCfg().DBDataEncoding = *inDBDataEncoding @@ -203,7 +203,7 @@ func main() { // outDataDB if *outDataDBType == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBType == mgrCfg.MigratorCgrCfg().OutDataDBType { - mgrCfg.MigratorCgrCfg().OutDataDBType = mgrCfg.DataDbCfg().DataDbType + mgrCfg.MigratorCgrCfg().OutDataDBType = mgrCfg.DataDbCfg().Type } } else { mgrCfg.MigratorCgrCfg().OutDataDBType = strings.TrimPrefix(*outDataDBType, utils.MaskChar) @@ -211,35 +211,35 @@ func main() { if *outDataDBHost == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBHost == mgrCfg.MigratorCgrCfg().OutDataDBHost { - mgrCfg.MigratorCgrCfg().OutDataDBHost = mgrCfg.DataDbCfg().DataDbHost + mgrCfg.MigratorCgrCfg().OutDataDBHost = mgrCfg.DataDbCfg().Host } } else { mgrCfg.MigratorCgrCfg().OutDataDBHost = *outDataDBHost } if *outDataDBPort == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBPort == mgrCfg.MigratorCgrCfg().OutDataDBPort { - mgrCfg.MigratorCgrCfg().OutDataDBPort = mgrCfg.DataDbCfg().DataDbPort + mgrCfg.MigratorCgrCfg().OutDataDBPort = mgrCfg.DataDbCfg().Port } } else { mgrCfg.MigratorCgrCfg().OutDataDBPort = *outDataDBPort } if *outDataDBName == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBName == mgrCfg.MigratorCgrCfg().OutDataDBName { - mgrCfg.MigratorCgrCfg().OutDataDBName = mgrCfg.DataDbCfg().DataDbName + mgrCfg.MigratorCgrCfg().OutDataDBName = mgrCfg.DataDbCfg().Name } } else { mgrCfg.MigratorCgrCfg().OutDataDBName = *outDataDBName } if *outDataDBUser == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBUser == mgrCfg.MigratorCgrCfg().OutDataDBUser { - mgrCfg.MigratorCgrCfg().OutDataDBUser = mgrCfg.DataDbCfg().DataDbUser + mgrCfg.MigratorCgrCfg().OutDataDBUser = mgrCfg.DataDbCfg().User } } else { mgrCfg.MigratorCgrCfg().OutDataDBUser = *outDataDBUser } if *outDataDBPass == utils.MetaDataDB { if dfltCfg.MigratorCgrCfg().OutDataDBPassword == mgrCfg.MigratorCgrCfg().OutDataDBPassword { - mgrCfg.MigratorCgrCfg().OutDataDBPassword = mgrCfg.DataDbCfg().DataDbPass + mgrCfg.MigratorCgrCfg().OutDataDBPassword = mgrCfg.DataDbCfg().Password } } else { mgrCfg.MigratorCgrCfg().OutDataDBPassword = *outDataDBPass @@ -259,16 +259,16 @@ func main() { mgrCfg.MigratorCgrCfg().OutDataDBOpts[utils.RedisSentinelNameCfg] = *outDataDBRedisSentinel } - sameDataDB = mgrCfg.MigratorCgrCfg().OutDataDBType == mgrCfg.DataDbCfg().DataDbType && - mgrCfg.MigratorCgrCfg().OutDataDBHost == mgrCfg.DataDbCfg().DataDbHost && - mgrCfg.MigratorCgrCfg().OutDataDBPort == mgrCfg.DataDbCfg().DataDbPort && - mgrCfg.MigratorCgrCfg().OutDataDBName == mgrCfg.DataDbCfg().DataDbName && + sameDataDB = mgrCfg.MigratorCgrCfg().OutDataDBType == mgrCfg.DataDbCfg().Type && + mgrCfg.MigratorCgrCfg().OutDataDBHost == mgrCfg.DataDbCfg().Host && + mgrCfg.MigratorCgrCfg().OutDataDBPort == mgrCfg.DataDbCfg().Port && + mgrCfg.MigratorCgrCfg().OutDataDBName == mgrCfg.DataDbCfg().Name && mgrCfg.MigratorCgrCfg().OutDataDBEncoding == mgrCfg.GeneralCfg().DBDataEncoding - if dmIN, err = migrator.NewMigratorDataDB(mgrCfg.DataDbCfg().DataDbType, - mgrCfg.DataDbCfg().DataDbHost, mgrCfg.DataDbCfg().DataDbPort, - mgrCfg.DataDbCfg().DataDbName, mgrCfg.DataDbCfg().DataDbUser, - mgrCfg.DataDbCfg().DataDbPass, mgrCfg.GeneralCfg().DBDataEncoding, + if dmIN, err = migrator.NewMigratorDataDB(mgrCfg.DataDbCfg().Type, + mgrCfg.DataDbCfg().Host, mgrCfg.DataDbCfg().Port, + mgrCfg.DataDbCfg().Name, mgrCfg.DataDbCfg().User, + mgrCfg.DataDbCfg().Password, mgrCfg.GeneralCfg().DBDataEncoding, mgrCfg.CacheCfg(), mgrCfg.DataDbCfg().Opts); err != nil { log.Fatal(err) } diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go index 0a2753e50..d825ba6af 100644 --- a/cmd/cgr-tester/cgr-tester.go +++ b/cmd/cgr-tester/cgr-tester.go @@ -47,12 +47,12 @@ var ( "Configuration directory path.") parallel = cgrTesterFlags.Int("parallel", 0, "run n requests in parallel") - datadbType = cgrTesterFlags.String("datadb_type", cgrConfig.DataDbCfg().DataDbType, "The type of the DataDb database ") - datadbHost = cgrTesterFlags.String("datadb_host", cgrConfig.DataDbCfg().DataDbHost, "The DataDb host to connect to.") - datadbPort = cgrTesterFlags.String("datadb_port", cgrConfig.DataDbCfg().DataDbPort, "The DataDb port to bind to.") - datadbName = cgrTesterFlags.String("datadb_name", cgrConfig.DataDbCfg().DataDbName, "The name/number of the DataDb to connect to.") - datadbUser = cgrTesterFlags.String("datadb_user", cgrConfig.DataDbCfg().DataDbUser, "The DataDb user to sign in as.") - datadbPass = cgrTesterFlags.String("datadb_pass", cgrConfig.DataDbCfg().DataDbPass, "The DataDb user's password.") + datadbType = cgrTesterFlags.String("datadb_type", cgrConfig.DataDbCfg().Type, "The type of the DataDb database ") + datadbHost = cgrTesterFlags.String("datadb_host", cgrConfig.DataDbCfg().Host, "The DataDb host to connect to.") + datadbPort = cgrTesterFlags.String("datadb_port", cgrConfig.DataDbCfg().Port, "The DataDb port to bind to.") + datadbName = cgrTesterFlags.String("datadb_name", cgrConfig.DataDbCfg().Name, "The name/number of the DataDb to connect to.") + datadbUser = cgrTesterFlags.String("datadb_user", cgrConfig.DataDbCfg().User, "The DataDb user to sign in as.") + datadbPass = cgrTesterFlags.String("datadb_pass", cgrConfig.DataDbCfg().Password, "The DataDb user's password.") dbdataEncoding = cgrTesterFlags.String("dbdata_encoding", cgrConfig.GeneralCfg().DBDataEncoding, "The encoding used to store object data in strings.") redisSentinel = cgrTesterFlags.String("redis_sentinel", utils.IfaceAsString(cgrConfig.DataDbCfg().Opts[utils.RedisSentinelNameCfg]), "The name of redis sentinel") dbRedisCluster = cgrTesterFlags.Bool("redis_cluster", false, @@ -80,10 +80,10 @@ var ( ) func durInternalRater(cd *engine.CallDescriptorWithOpts) (time.Duration, error) { - dbConn, err := engine.NewDataDBConn(tstCfg.DataDbCfg().DataDbType, - tstCfg.DataDbCfg().DataDbHost, tstCfg.DataDbCfg().DataDbPort, - tstCfg.DataDbCfg().DataDbName, tstCfg.DataDbCfg().DataDbUser, - tstCfg.DataDbCfg().DataDbPass, tstCfg.GeneralCfg().DBDataEncoding, + dbConn, err := engine.NewDataDBConn(tstCfg.DataDbCfg().Type, + tstCfg.DataDbCfg().Host, tstCfg.DataDbCfg().Port, + tstCfg.DataDbCfg().Name, tstCfg.DataDbCfg().User, + tstCfg.DataDbCfg().Password, tstCfg.GeneralCfg().DBDataEncoding, tstCfg.DataDbCfg().Opts) if err != nil { return nilDuration, fmt.Errorf("Could not connect to data database: %s", err.Error()) @@ -180,23 +180,23 @@ func main() { } } - if *datadbType != cgrConfig.DataDbCfg().DataDbType { - tstCfg.DataDbCfg().DataDbType = *datadbType + if *datadbType != cgrConfig.DataDbCfg().Type { + tstCfg.DataDbCfg().Type = *datadbType } - if *datadbHost != cgrConfig.DataDbCfg().DataDbHost { - tstCfg.DataDbCfg().DataDbHost = *datadbHost + if *datadbHost != cgrConfig.DataDbCfg().Host { + tstCfg.DataDbCfg().Host = *datadbHost } - if *datadbPort != cgrConfig.DataDbCfg().DataDbPort { - tstCfg.DataDbCfg().DataDbPort = *datadbPort + if *datadbPort != cgrConfig.DataDbCfg().Port { + tstCfg.DataDbCfg().Port = *datadbPort } - if *datadbName != cgrConfig.DataDbCfg().DataDbName { - tstCfg.DataDbCfg().DataDbName = *datadbName + if *datadbName != cgrConfig.DataDbCfg().Name { + tstCfg.DataDbCfg().Name = *datadbName } - if *datadbUser != cgrConfig.DataDbCfg().DataDbUser { - tstCfg.DataDbCfg().DataDbUser = *datadbUser + if *datadbUser != cgrConfig.DataDbCfg().User { + tstCfg.DataDbCfg().User = *datadbUser } - if *datadbPass != cgrConfig.DataDbCfg().DataDbPass { - tstCfg.DataDbCfg().DataDbPass = *datadbPass + if *datadbPass != cgrConfig.DataDbCfg().Password { + tstCfg.DataDbCfg().Password = *datadbPass } if *dbdataEncoding != "" { tstCfg.GeneralCfg().DBDataEncoding = *dbdataEncoding diff --git a/config/config_test.go b/config/config_test.go index 9a79a2285..6bb3c51a4 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -107,10 +107,10 @@ func TestCgrCfgDataDBPortWithoutDynamic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.Mongo { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.Mongo) - } else if cgrCfg.DataDbCfg().DataDbPort != "6379" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "6379") + } else if cgrCfg.DataDbCfg().Type != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Type, utils.Mongo) + } else if cgrCfg.DataDbCfg().Port != "6379" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Port, "6379") } jsnCfg = ` { @@ -121,10 +121,10 @@ func TestCgrCfgDataDBPortWithoutDynamic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.INTERNAL { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.INTERNAL) - } else if cgrCfg.DataDbCfg().DataDbPort != "6379" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "6379") + } else if cgrCfg.DataDbCfg().Type != utils.INTERNAL { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Type, utils.INTERNAL) + } else if cgrCfg.DataDbCfg().Port != "6379" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Port, "6379") } } @@ -139,10 +139,10 @@ func TestCgrCfgDataDBPortWithDymanic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.Mongo { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.Mongo) - } else if cgrCfg.DataDbCfg().DataDbPort != "27017" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "27017") + } else if cgrCfg.DataDbCfg().Type != utils.Mongo { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Type, utils.Mongo) + } else if cgrCfg.DataDbCfg().Port != "27017" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Port, "27017") } jsnCfg = ` { @@ -154,10 +154,10 @@ func TestCgrCfgDataDBPortWithDymanic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(jsnCfg); err != nil { t.Error(err) - } else if cgrCfg.DataDbCfg().DataDbType != utils.INTERNAL { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbType, utils.INTERNAL) - } else if cgrCfg.DataDbCfg().DataDbPort != "internal" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().DataDbPort, "internal") + } else if cgrCfg.DataDbCfg().Type != utils.INTERNAL { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Type, utils.INTERNAL) + } else if cgrCfg.DataDbCfg().Port != "internal" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.DataDbCfg().Port, "internal") } } @@ -331,23 +331,23 @@ func TestCgrCfgJSONDefaultsListen(t *testing.T) { } func TestCgrCfgJSONDefaultsjsnDataDb(t *testing.T) { - if cgrCfg.DataDbCfg().DataDbType != "redis" { - t.Errorf("Expecting: redis , received: %+v", cgrCfg.DataDbCfg().DataDbType) + if cgrCfg.DataDbCfg().Type != "redis" { + t.Errorf("Expecting: redis , received: %+v", cgrCfg.DataDbCfg().Type) } - if cgrCfg.DataDbCfg().DataDbHost != "127.0.0.1" { - t.Errorf("Expecting: 127.0.0.1 , received: %+v", cgrCfg.DataDbCfg().DataDbHost) + if cgrCfg.DataDbCfg().Host != "127.0.0.1" { + t.Errorf("Expecting: 127.0.0.1 , received: %+v", cgrCfg.DataDbCfg().Host) } - if cgrCfg.DataDbCfg().DataDbPort != "6379" { - t.Errorf("Expecting: 6379 , received: %+v", cgrCfg.DataDbCfg().DataDbPort) + if cgrCfg.DataDbCfg().Port != "6379" { + t.Errorf("Expecting: 6379 , received: %+v", cgrCfg.DataDbCfg().Port) } - if cgrCfg.DataDbCfg().DataDbName != "10" { - t.Errorf("Expecting: 10 , received: %+v", cgrCfg.DataDbCfg().DataDbName) + if cgrCfg.DataDbCfg().Name != "10" { + t.Errorf("Expecting: 10 , received: %+v", cgrCfg.DataDbCfg().Name) } - if cgrCfg.DataDbCfg().DataDbUser != "cgrates" { - t.Errorf("Expecting: cgrates , received: %+v", cgrCfg.DataDbCfg().DataDbUser) + if cgrCfg.DataDbCfg().User != "cgrates" { + t.Errorf("Expecting: cgrates , received: %+v", cgrCfg.DataDbCfg().User) } - if cgrCfg.DataDbCfg().DataDbPass != "" { - t.Errorf("Expecting: , received: %+v", cgrCfg.DataDbCfg().DataDbPass) + if cgrCfg.DataDbCfg().Password != "" { + t.Errorf("Expecting: , received: %+v", cgrCfg.DataDbCfg().Password) } if len(cgrCfg.DataDbCfg().RmtConns) != 0 { t.Errorf("Expecting: 0, received: %+v", len(cgrCfg.DataDbCfg().RmtConns)) diff --git a/config/configsanity.go b/config/configsanity.go index d8234af5c..e4aa4b47d 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -628,7 +628,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { } } // DataDB sanity checks - if cfg.dataDbCfg.DataDbType == utils.INTERNAL { + if cfg.dataDbCfg.Type == utils.INTERNAL { if cfg.resourceSCfg.Enabled == true && cfg.resourceSCfg.StoreInterval != -1 { return fmt.Errorf("<%s> the StoreInterval field needs to be -1 when DataBD is *internal, received : %d", utils.ResourceS, cfg.resourceSCfg.StoreInterval) } diff --git a/config/configsanity_test.go b/config/configsanity_test.go index 342431734..fac31fda1 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -1234,7 +1234,7 @@ func TestConfigSanityAnalyzer(t *testing.T) { func TestConfigSanityDataDB(t *testing.T) { cfg = NewDefaultCGRConfig() - cfg.dataDbCfg.DataDbType = utils.INTERNAL + cfg.dataDbCfg.Type = utils.INTERNAL cfg.cacheCfg = &CacheCfg{ Partitions: map[string]*CacheParamCfg{ diff --git a/config/datadbcfg.go b/config/datadbcfg.go index 7bbd0c274..685dc05fb 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -28,12 +28,12 @@ import ( // DataDbCfg Database config type DataDbCfg struct { - DataDbType string - DataDbHost string // The host to connect to. Values that start with / are for UNIX domain sockets. - DataDbPort string // The port to bind to. - DataDbName string // The name of the database to connect to. - DataDbUser string // The user to sign in as. - DataDbPass string // The user's password. + Type string + Host string // The host to connect to. Values that start with / are for UNIX domain sockets. + Port string // The port to bind to. + Name string // The name of the database to connect to. + User string // The user to sign in as. + Password string // The user's password. RmtConns []string // Remote DataDB connIDs RplConns []string // Replication connIDs RplFiltered bool @@ -48,26 +48,26 @@ func (dbcfg *DataDbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) { return nil } if jsnDbCfg.Db_type != nil { - dbcfg.DataDbType = strings.TrimPrefix(*jsnDbCfg.Db_type, "*") + dbcfg.Type = strings.TrimPrefix(*jsnDbCfg.Db_type, "*") } if jsnDbCfg.Db_host != nil { - dbcfg.DataDbHost = *jsnDbCfg.Db_host + dbcfg.Host = *jsnDbCfg.Db_host } if jsnDbCfg.Db_port != nil { port := strconv.Itoa(*jsnDbCfg.Db_port) if port == "-1" { port = utils.MetaDynamic } - dbcfg.DataDbPort = dbDefaultsCfg.dbPort(dbcfg.DataDbType, port) + dbcfg.Port = dbDefaultsCfg.dbPort(dbcfg.Type, port) } if jsnDbCfg.Db_name != nil { - dbcfg.DataDbName = *jsnDbCfg.Db_name + dbcfg.Name = *jsnDbCfg.Db_name } if jsnDbCfg.Db_user != nil { - dbcfg.DataDbUser = *jsnDbCfg.Db_user + dbcfg.User = *jsnDbCfg.Db_user } if jsnDbCfg.Db_password != nil { - dbcfg.DataDbPass = *jsnDbCfg.Db_password + dbcfg.Password = *jsnDbCfg.Db_password } if jsnDbCfg.Remote_conns != nil { dbcfg.RmtConns = make([]string, len(*jsnDbCfg.Remote_conns)) @@ -116,12 +116,12 @@ func (dbcfg *DataDbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) { // Clone returns the cloned object func (dbcfg *DataDbCfg) Clone() (cln *DataDbCfg) { cln = &DataDbCfg{ - DataDbType: dbcfg.DataDbType, - DataDbHost: dbcfg.DataDbHost, - DataDbPort: dbcfg.DataDbPort, - DataDbName: dbcfg.DataDbName, - DataDbUser: dbcfg.DataDbUser, - DataDbPass: dbcfg.DataDbPass, + Type: dbcfg.Type, + Host: dbcfg.Host, + Port: dbcfg.Port, + Name: dbcfg.Name, + User: dbcfg.User, + Password: dbcfg.Password, RplFiltered: dbcfg.RplFiltered, RmtConnID: dbcfg.RmtConnID, Items: make(map[string]*ItemOpt), @@ -152,11 +152,11 @@ func (dbcfg *DataDbCfg) Clone() (cln *DataDbCfg) { // AsMapInterface returns the config as a map[string]interface{} func (dbcfg *DataDbCfg) AsMapInterface() (initialMP map[string]interface{}) { initialMP = map[string]interface{}{ - utils.DataDbTypeCfg: utils.Meta + dbcfg.DataDbType, - utils.DataDbHostCfg: dbcfg.DataDbHost, - utils.DataDbNameCfg: dbcfg.DataDbName, - utils.DataDbUserCfg: dbcfg.DataDbUser, - utils.DataDbPassCfg: dbcfg.DataDbPass, + utils.DataDbTypeCfg: utils.Meta + dbcfg.Type, + utils.DataDbHostCfg: dbcfg.Host, + utils.DataDbNameCfg: dbcfg.Name, + utils.DataDbUserCfg: dbcfg.User, + utils.DataDbPassCfg: dbcfg.Password, utils.RemoteConnsCfg: dbcfg.RmtConns, utils.ReplicationConnsCfg: dbcfg.RplConns, utils.FilteredReplicationCfg: dbcfg.RplFiltered, @@ -174,8 +174,8 @@ func (dbcfg *DataDbCfg) AsMapInterface() (initialMP map[string]interface{}) { } initialMP[utils.ItemsCfg] = items } - if dbcfg.DataDbPort != "" { - initialMP[utils.DataDbPortCfg], _ = strconv.Atoi(dbcfg.DataDbPort) + if dbcfg.Port != "" { + initialMP[utils.DataDbPortCfg], _ = strconv.Atoi(dbcfg.Port) } return } diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go index 2c5fefaca..493874bf6 100644 --- a/config/datadbcfg_test.go +++ b/config/datadbcfg_test.go @@ -51,14 +51,14 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) { }, } expected := &DataDbCfg{ - DataDbType: "redis", - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", - RmtConns: []string{"*conn1"}, - RplConns: []string{"*conn1"}, + Type: "redis", + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", + RmtConns: []string{"*conn1"}, + RplConns: []string{"*conn1"}, Items: map[string]*ItemOpt{ utils.MetaAccounts: { Replicate: true, @@ -143,8 +143,8 @@ func TestDataDbCfgloadFromJsonCfgPort(t *testing.T) { } }` expected := DataDbCfg{ - DataDbType: "mongo", - Opts: make(map[string]interface{}), + Type: "mongo", + Opts: make(map[string]interface{}), } if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { t.Error(err) @@ -162,9 +162,9 @@ func TestDataDbCfgloadFromJsonCfgPort(t *testing.T) { } }` expected = DataDbCfg{ - DataDbType: "mongo", - DataDbPort: "27017", - Opts: make(map[string]interface{}), + Type: "mongo", + Port: "27017", + Opts: make(map[string]interface{}), } if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { t.Error(err) @@ -182,9 +182,9 @@ func TestDataDbCfgloadFromJsonCfgPort(t *testing.T) { } }` expected = DataDbCfg{ - DataDbType: "internal", - DataDbPort: "internal", - Opts: make(map[string]interface{}), + Type: "internal", + Port: "internal", + Opts: make(map[string]interface{}), } if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { t.Error(err) @@ -216,13 +216,13 @@ func TestDataDBRemoteReplication(t *testing.T) { dbcfg.Opts = make(map[string]interface{}) expected = DataDbCfg{ - DataDbType: "redis", - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", - RmtConns: []string{"Conn1"}, + Type: "redis", + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", + RmtConns: []string{"Conn1"}, Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel", }, @@ -246,12 +246,12 @@ func TestDataDBRemoteReplication(t *testing.T) { }` expected = DataDbCfg{ - DataDbType: utils.INTERNAL, - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", + Type: utils.INTERNAL, + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel", }, @@ -277,12 +277,12 @@ func TestDataDBRemoteReplication(t *testing.T) { }` expected = DataDbCfg{ - DataDbType: utils.INTERNAL, - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", + Type: utils.INTERNAL, + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel", }, @@ -323,13 +323,13 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) { }` expected = DataDbCfg{ - DataDbType: "redis", - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", - RmtConns: []string{"Conn1"}, + Type: "redis", + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", + RmtConns: []string{"Conn1"}, Items: map[string]*ItemOpt{ utils.MetaAccounts: { Replicate: true, @@ -379,12 +379,12 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) { }` expected = DataDbCfg{ - DataDbType: "redis", - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", + Type: "redis", + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel", }, @@ -437,12 +437,12 @@ func TestDataDbCfgloadFromJsonCfgItems(t *testing.T) { }` expected = DataDbCfg{ - DataDbType: "redis", - DataDbHost: "127.0.0.1", - DataDbPort: "6379", - DataDbName: "10", - DataDbUser: "cgrates", - DataDbPass: "password", + Type: "redis", + Host: "127.0.0.1", + Port: "6379", + Name: "10", + User: "cgrates", + Password: "password", Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "sentinel", }, diff --git a/engine/datamanager.go b/engine/datamanager.go index 6adabc099..89c3c8a13 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -3566,8 +3566,8 @@ func (dm *DataManager) RemoveActionProfile(tenant, id string, // Reconnect reconnects to the DB when the config was changed func (dm *DataManager) Reconnect(marshaller string, newcfg *config.DataDbCfg) (err error) { - d, err := NewDataDBConn(newcfg.DataDbType, newcfg.DataDbHost, newcfg.DataDbPort, newcfg.DataDbName, - newcfg.DataDbUser, newcfg.DataDbPass, marshaller, newcfg.Opts) + d, err := NewDataDBConn(newcfg.Type, newcfg.Host, newcfg.Port, newcfg.Name, + newcfg.User, newcfg.Password, marshaller, newcfg.Opts) if err != nil { return } diff --git a/engine/libtest.go b/engine/libtest.go index 65f3cc185..416500ff7 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -306,10 +306,10 @@ cgrates.org,1001,,,,,VoiceBalance,,;10,*voice,3600000000000,,,,,, ) func InitDataDb(cfg *config.CGRConfig) error { - d, err := NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + d, err := NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { return err diff --git a/engine/z_datamanager_it_test.go b/engine/z_datamanager_it_test.go index a1beabf50..f52a21eb1 100644 --- a/engine/z_datamanager_it_test.go +++ b/engine/z_datamanager_it_test.go @@ -51,8 +51,8 @@ func TestDMitinitDB(t *testing.T) { t.SkipNow() case utils.MetaMySQL: dataDB, err = NewRedisStorage( - fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), - 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + fmt.Sprintf("%s:%s", cfg.DataDbCfg().Host, cfg.DataDbCfg().Port), + 4, cfg.DataDbCfg().User, cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index 3f9069ad4..238f1a2eb 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -97,13 +97,14 @@ func TestFilterIndexerIT(t *testing.T) { case utils.MetaMySQL: cfg := config.NewDefaultCGRConfig() redisDB, err := NewRedisStorage( - fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), - 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + fmt.Sprintf("%s:%s", cfg.DataDbCfg().Host, cfg.DataDbCfg().Port), + 4, cfg.DataDbCfg().User, cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } - cfgDBName = cfg.DataDbCfg().DataDbName + cfgDBName = cfg.DataDbCfg().Name + defer redisDB.Close() dataManager = NewDataManager(redisDB, config.CgrConfig().CacheCfg(), nil) case utils.MetaMongo: cdrsMongoCfgPath := path.Join(*dataDir, "conf", "samples", "tutmongo") @@ -111,15 +112,16 @@ func TestFilterIndexerIT(t *testing.T) { if err != nil { t.Fatal(err) } - mongoDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().Host, - mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, - mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, + mongoDB, err := NewMongoStorage(mgoITCfg.DataDbCfg().Host, + mgoITCfg.DataDbCfg().Port, mgoITCfg.DataDbCfg().Name, + mgoITCfg.DataDbCfg().User, mgoITCfg.DataDbCfg().Password, mgoITCfg.GeneralCfg().DBDataEncoding, utils.StorDB, nil, 10*time.Second) if err != nil { t.Fatal(err) } - cfgDBName = mgoITCfg.StorDbCfg().Name + cfgDBName = mgoITCfg.DataDbCfg().Name + defer mongoDB.Close() dataManager = NewDataManager(mongoDB, config.CgrConfig().CacheCfg(), nil) case utils.MetaPostgres: t.SkipNow() diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index 915f17bfc..d0106cfc4 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -85,15 +85,15 @@ func testLoaderITInitConfig(t *testing.T) { func testLoaderITInitDataDB(t *testing.T) { var err error - dbConn, err := NewDataDBConn(lCfg.DataDbCfg().DataDbType, - lCfg.DataDbCfg().DataDbHost, lCfg.DataDbCfg().DataDbPort, lCfg.DataDbCfg().DataDbName, - lCfg.DataDbCfg().DataDbUser, lCfg.DataDbCfg().DataDbPass, lCfg.GeneralCfg().DBDataEncoding, + dbConn, err := NewDataDBConn(lCfg.DataDbCfg().Type, + lCfg.DataDbCfg().Host, lCfg.DataDbCfg().Port, lCfg.DataDbCfg().Name, + lCfg.DataDbCfg().User, lCfg.DataDbCfg().Password, lCfg.GeneralCfg().DBDataEncoding, lCfg.DataDbCfg().Opts) if err != nil { t.Fatal("Error on dataDb connection: ", err.Error()) } dataDbCsv = NewDataManager(dbConn, lCfg.CacheCfg(), nil) - if lCfg.DataDbCfg().DataDbType == utils.INTERNAL { + if lCfg.DataDbCfg().Type == utils.INTERNAL { chIDs := []string{} for dbKey := range utils.CacheInstanceToPrefix { // clear only the DataDB chIDs = append(chIDs, dbKey) diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index ac5eccf29..dbd24b363 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -93,13 +93,13 @@ func TestOnStorIT(t *testing.T) { case utils.MetaMySQL: cfg := config.NewDefaultCGRConfig() rdsITdb, err = NewRedisStorage( - fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), - 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + fmt.Sprintf("%s:%s", cfg.DataDbCfg().Host, cfg.DataDbCfg().Port), + 4, cfg.DataDbCfg().User, cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, utils.RedisMaxConns, "", false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } - onStorCfg = cfg.DataDbCfg().DataDbName + onStorCfg = cfg.DataDbCfg().Name onStor = NewDataManager(rdsITdb, config.CgrConfig().CacheCfg(), nil) case utils.MetaMongo: cdrsMongoCfgPath := path.Join(*dataDir, "conf", "samples", "cdrsv2mongo") diff --git a/engine/z_versions_it_test.go b/engine/z_versions_it_test.go index bdd2ffd64..82e0cf7ac 100644 --- a/engine/z_versions_it_test.go +++ b/engine/z_versions_it_test.go @@ -68,10 +68,10 @@ func testInitConfig(t *testing.T) { } func testInitDataDB(t *testing.T) { - dbConn, err := NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + dbConn, err := NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 4ea61e91b..5db0d3243 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -65,18 +65,18 @@ func TestAccMigrateWithInternal(t *testing.T) { } func testAcc2ITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(acc2CfgIn.DataDbCfg().DataDbType, - acc2CfgIn.DataDbCfg().DataDbHost, acc2CfgIn.DataDbCfg().DataDbPort, - acc2CfgIn.DataDbCfg().DataDbName, acc2CfgIn.DataDbCfg().DataDbUser, - acc2CfgIn.DataDbCfg().DataDbPass, acc2CfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(acc2CfgIn.DataDbCfg().Type, + acc2CfgIn.DataDbCfg().Host, acc2CfgIn.DataDbCfg().Port, + acc2CfgIn.DataDbCfg().Name, acc2CfgIn.DataDbCfg().User, + acc2CfgIn.DataDbCfg().Password, acc2CfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), acc2CfgIn.DataDbCfg().Opts) if err != nil { t.Error(err) } - dataDBOut, err := NewMigratorDataDB(acc2CfgOut.DataDbCfg().DataDbType, - acc2CfgOut.DataDbCfg().DataDbHost, acc2CfgOut.DataDbCfg().DataDbPort, - acc2CfgOut.DataDbCfg().DataDbName, acc2CfgOut.DataDbCfg().DataDbUser, - acc2CfgOut.DataDbCfg().DataDbPass, acc2CfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(acc2CfgOut.DataDbCfg().Type, + acc2CfgOut.DataDbCfg().Host, acc2CfgOut.DataDbCfg().Port, + acc2CfgOut.DataDbCfg().Name, acc2CfgOut.DataDbCfg().User, + acc2CfgOut.DataDbCfg().Password, acc2CfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), acc2CfgOut.DataDbCfg().Opts) if err != nil { t.Error(err) diff --git a/migrator/accounts_it_test.go b/migrator/accounts_it_test.go index 6dafc31c5..17138026e 100755 --- a/migrator/accounts_it_test.go +++ b/migrator/accounts_it_test.go @@ -163,18 +163,18 @@ func TestAccountITMoveEncoding2(t *testing.T) { } func testAccITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(accCfgIn.DataDbCfg().DataDbType, - accCfgIn.DataDbCfg().DataDbHost, accCfgIn.DataDbCfg().DataDbPort, - accCfgIn.DataDbCfg().DataDbName, accCfgIn.DataDbCfg().DataDbUser, - accCfgIn.DataDbCfg().DataDbPass, accCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(accCfgIn.DataDbCfg().Type, + accCfgIn.DataDbCfg().Host, accCfgIn.DataDbCfg().Port, + accCfgIn.DataDbCfg().Name, accCfgIn.DataDbCfg().User, + accCfgIn.DataDbCfg().Password, accCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), accCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(accCfgOut.DataDbCfg().DataDbType, - accCfgOut.DataDbCfg().DataDbHost, accCfgOut.DataDbCfg().DataDbPort, - accCfgOut.DataDbCfg().DataDbName, accCfgOut.DataDbCfg().DataDbUser, - accCfgOut.DataDbCfg().DataDbPass, accCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(accCfgOut.DataDbCfg().Type, + accCfgOut.DataDbCfg().Host, accCfgOut.DataDbCfg().Port, + accCfgOut.DataDbCfg().Name, accCfgOut.DataDbCfg().User, + accCfgOut.DataDbCfg().Password, accCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), accCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/action_it_test.go b/migrator/action_it_test.go index 2ae3aced2..30818499c 100644 --- a/migrator/action_it_test.go +++ b/migrator/action_it_test.go @@ -161,18 +161,18 @@ func TestActionITMoveEncoding2(t *testing.T) { } func testActITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(actCfgIn.DataDbCfg().DataDbType, - actCfgIn.DataDbCfg().DataDbHost, actCfgIn.DataDbCfg().DataDbPort, - actCfgIn.DataDbCfg().DataDbName, actCfgIn.DataDbCfg().DataDbUser, - actCfgIn.DataDbCfg().DataDbPass, actCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(actCfgIn.DataDbCfg().Type, + actCfgIn.DataDbCfg().Host, actCfgIn.DataDbCfg().Port, + actCfgIn.DataDbCfg().Name, actCfgIn.DataDbCfg().User, + actCfgIn.DataDbCfg().Password, actCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(actCfgOut.DataDbCfg().DataDbType, - actCfgOut.DataDbCfg().DataDbHost, actCfgOut.DataDbCfg().DataDbPort, - actCfgOut.DataDbCfg().DataDbName, actCfgOut.DataDbCfg().DataDbUser, - actCfgOut.DataDbCfg().DataDbPass, actCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(actCfgOut.DataDbCfg().Type, + actCfgOut.DataDbCfg().Host, actCfgOut.DataDbCfg().Port, + actCfgOut.DataDbCfg().Name, actCfgOut.DataDbCfg().User, + actCfgOut.DataDbCfg().Password, actCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/action_plan_it_test.go b/migrator/action_plan_it_test.go index c94ac08d8..ebed0c2bb 100644 --- a/migrator/action_plan_it_test.go +++ b/migrator/action_plan_it_test.go @@ -161,18 +161,18 @@ func TestActionPlanITMoveEncoding2(t *testing.T) { } func testActPlnITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(actPlnCfgIn.DataDbCfg().DataDbType, - actPlnCfgIn.DataDbCfg().DataDbHost, actPlnCfgIn.DataDbCfg().DataDbPort, - actPlnCfgIn.DataDbCfg().DataDbName, actPlnCfgIn.DataDbCfg().DataDbUser, - actPlnCfgIn.DataDbCfg().DataDbPass, actPlnCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(actPlnCfgIn.DataDbCfg().Type, + actPlnCfgIn.DataDbCfg().Host, actPlnCfgIn.DataDbCfg().Port, + actPlnCfgIn.DataDbCfg().Name, actPlnCfgIn.DataDbCfg().User, + actPlnCfgIn.DataDbCfg().Password, actPlnCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actPlnCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(actPlnCfgOut.DataDbCfg().DataDbType, - actPlnCfgOut.DataDbCfg().DataDbHost, actPlnCfgOut.DataDbCfg().DataDbPort, - actPlnCfgOut.DataDbCfg().DataDbName, actPlnCfgOut.DataDbCfg().DataDbUser, - actPlnCfgOut.DataDbCfg().DataDbPass, actPlnCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(actPlnCfgOut.DataDbCfg().Type, + actPlnCfgOut.DataDbCfg().Host, actPlnCfgOut.DataDbCfg().Port, + actPlnCfgOut.DataDbCfg().Name, actPlnCfgOut.DataDbCfg().User, + actPlnCfgOut.DataDbCfg().Password, actPlnCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actPlnCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/action_trigger_it_test.go b/migrator/action_trigger_it_test.go index 99d3c640e..c846b7f04 100644 --- a/migrator/action_trigger_it_test.go +++ b/migrator/action_trigger_it_test.go @@ -143,18 +143,18 @@ func TestActionTriggerITMoveEncoding2(t *testing.T) { } func testActTrgITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(actTrgCfgIn.DataDbCfg().DataDbType, - actTrgCfgIn.DataDbCfg().DataDbHost, actTrgCfgIn.DataDbCfg().DataDbPort, - actTrgCfgIn.DataDbCfg().DataDbName, actTrgCfgIn.DataDbCfg().DataDbUser, - actTrgCfgIn.DataDbCfg().DataDbPass, actTrgCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(actTrgCfgIn.DataDbCfg().Type, + actTrgCfgIn.DataDbCfg().Host, actTrgCfgIn.DataDbCfg().Port, + actTrgCfgIn.DataDbCfg().Name, actTrgCfgIn.DataDbCfg().User, + actTrgCfgIn.DataDbCfg().Password, actTrgCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actTrgCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(actTrgCfgOut.DataDbCfg().DataDbType, - actTrgCfgOut.DataDbCfg().DataDbHost, actTrgCfgOut.DataDbCfg().DataDbPort, - actTrgCfgOut.DataDbCfg().DataDbName, actTrgCfgOut.DataDbCfg().DataDbUser, - actTrgCfgOut.DataDbCfg().DataDbPass, actTrgCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(actTrgCfgOut.DataDbCfg().Type, + actTrgCfgOut.DataDbCfg().Host, actTrgCfgOut.DataDbCfg().Port, + actTrgCfgOut.DataDbCfg().Name, actTrgCfgOut.DataDbCfg().User, + actTrgCfgOut.DataDbCfg().Password, actTrgCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actTrgCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/actionprofiles_it_test.go b/migrator/actionprofiles_it_test.go index d2e7f7694..630a23a4c 100644 --- a/migrator/actionprofiles_it_test.go +++ b/migrator/actionprofiles_it_test.go @@ -125,18 +125,18 @@ func TestActPrfITMoveEncoding2(t *testing.T) { } func testActPrfITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(actPrfCfgIn.DataDbCfg().DataDbType, - actPrfCfgIn.DataDbCfg().DataDbHost, actPrfCfgIn.DataDbCfg().DataDbPort, - actPrfCfgIn.DataDbCfg().DataDbName, actPrfCfgIn.DataDbCfg().DataDbUser, - actPrfCfgIn.DataDbCfg().DataDbPass, actPrfCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(actPrfCfgIn.DataDbCfg().Type, + actPrfCfgIn.DataDbCfg().Host, actPrfCfgIn.DataDbCfg().Port, + actPrfCfgIn.DataDbCfg().Name, actPrfCfgIn.DataDbCfg().User, + actPrfCfgIn.DataDbCfg().Password, actPrfCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actPrfCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(actPrfCfgOut.DataDbCfg().DataDbType, - actPrfCfgOut.DataDbCfg().DataDbHost, actPrfCfgOut.DataDbCfg().DataDbPort, - actPrfCfgOut.DataDbCfg().DataDbName, actPrfCfgOut.DataDbCfg().DataDbUser, - actPrfCfgOut.DataDbCfg().DataDbPass, actPrfCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(actPrfCfgOut.DataDbCfg().Type, + actPrfCfgOut.DataDbCfg().Host, actPrfCfgOut.DataDbCfg().Port, + actPrfCfgOut.DataDbCfg().Name, actPrfCfgOut.DataDbCfg().User, + actPrfCfgOut.DataDbCfg().Password, actPrfCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), actPrfCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go index 6ce6512cd..d73d0493e 100644 --- a/migrator/alias_it_test.go +++ b/migrator/alias_it_test.go @@ -79,18 +79,18 @@ func testStart(testName string, t *testing.T) { } func testAlsITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(alsCfgIn.DataDbCfg().DataDbType, - alsCfgIn.DataDbCfg().DataDbHost, alsCfgIn.DataDbCfg().DataDbPort, - alsCfgIn.DataDbCfg().DataDbName, alsCfgIn.DataDbCfg().DataDbUser, - alsCfgIn.DataDbCfg().DataDbPass, alsCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(alsCfgIn.DataDbCfg().Type, + alsCfgIn.DataDbCfg().Host, alsCfgIn.DataDbCfg().Port, + alsCfgIn.DataDbCfg().Name, alsCfgIn.DataDbCfg().User, + alsCfgIn.DataDbCfg().Password, alsCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), alsCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(alsCfgOut.DataDbCfg().DataDbType, - alsCfgOut.DataDbCfg().DataDbHost, alsCfgOut.DataDbCfg().DataDbPort, - alsCfgOut.DataDbCfg().DataDbName, alsCfgOut.DataDbCfg().DataDbUser, - alsCfgOut.DataDbCfg().DataDbPass, alsCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(alsCfgOut.DataDbCfg().Type, + alsCfgOut.DataDbCfg().Host, alsCfgOut.DataDbCfg().Port, + alsCfgOut.DataDbCfg().Name, alsCfgOut.DataDbCfg().User, + alsCfgOut.DataDbCfg().Password, alsCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), alsCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/attributes_it_test.go b/migrator/attributes_it_test.go index 93787ab9d..974f1056a 100755 --- a/migrator/attributes_it_test.go +++ b/migrator/attributes_it_test.go @@ -199,18 +199,18 @@ func TestAttributeITMoveEncoding2(t *testing.T) { } func testAttrITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(attrCfgIn.DataDbCfg().DataDbType, - attrCfgIn.DataDbCfg().DataDbHost, attrCfgIn.DataDbCfg().DataDbPort, - attrCfgIn.DataDbCfg().DataDbName, attrCfgIn.DataDbCfg().DataDbUser, - attrCfgIn.DataDbCfg().DataDbPass, attrCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(attrCfgIn.DataDbCfg().Type, + attrCfgIn.DataDbCfg().Host, attrCfgIn.DataDbCfg().Port, + attrCfgIn.DataDbCfg().Name, attrCfgIn.DataDbCfg().User, + attrCfgIn.DataDbCfg().Password, attrCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), attrCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(attrCfgOut.DataDbCfg().DataDbType, - attrCfgOut.DataDbCfg().DataDbHost, attrCfgOut.DataDbCfg().DataDbPort, - attrCfgOut.DataDbCfg().DataDbName, attrCfgOut.DataDbCfg().DataDbUser, - attrCfgOut.DataDbCfg().DataDbPass, attrCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(attrCfgOut.DataDbCfg().Type, + attrCfgOut.DataDbCfg().Host, attrCfgOut.DataDbCfg().Port, + attrCfgOut.DataDbCfg().Name, attrCfgOut.DataDbCfg().User, + attrCfgOut.DataDbCfg().Password, attrCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), attrCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/chargers_it_test.go b/migrator/chargers_it_test.go index e73ffff65..8a3c474d5 100755 --- a/migrator/chargers_it_test.go +++ b/migrator/chargers_it_test.go @@ -124,18 +124,18 @@ func TestChargersITMoveEncoding2(t *testing.T) { } func testChrgITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(chrgCfgIn.DataDbCfg().DataDbType, - chrgCfgIn.DataDbCfg().DataDbHost, chrgCfgIn.DataDbCfg().DataDbPort, - chrgCfgIn.DataDbCfg().DataDbName, chrgCfgIn.DataDbCfg().DataDbUser, - chrgCfgIn.DataDbCfg().DataDbPass, chrgCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(chrgCfgIn.DataDbCfg().Type, + chrgCfgIn.DataDbCfg().Host, chrgCfgIn.DataDbCfg().Port, + chrgCfgIn.DataDbCfg().Name, chrgCfgIn.DataDbCfg().User, + chrgCfgIn.DataDbCfg().Password, chrgCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), chrgCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(chrgCfgOut.DataDbCfg().DataDbType, - chrgCfgOut.DataDbCfg().DataDbHost, chrgCfgOut.DataDbCfg().DataDbPort, - chrgCfgOut.DataDbCfg().DataDbName, chrgCfgOut.DataDbCfg().DataDbUser, - chrgCfgOut.DataDbCfg().DataDbPass, chrgCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(chrgCfgOut.DataDbCfg().Type, + chrgCfgOut.DataDbCfg().Host, chrgCfgOut.DataDbCfg().Port, + chrgCfgOut.DataDbCfg().Name, chrgCfgOut.DataDbCfg().User, + chrgCfgOut.DataDbCfg().Password, chrgCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), chrgCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index 02595f90c..11c499c58 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -78,18 +78,18 @@ func testStartDC(testName string, t *testing.T) { } func testDCITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(dcCfgIn.DataDbCfg().DataDbType, - dcCfgIn.DataDbCfg().DataDbHost, dcCfgIn.DataDbCfg().DataDbPort, - dcCfgIn.DataDbCfg().DataDbName, dcCfgIn.DataDbCfg().DataDbUser, - dcCfgIn.DataDbCfg().DataDbPass, dcCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(dcCfgIn.DataDbCfg().Type, + dcCfgIn.DataDbCfg().Host, dcCfgIn.DataDbCfg().Port, + dcCfgIn.DataDbCfg().Name, dcCfgIn.DataDbCfg().User, + dcCfgIn.DataDbCfg().Password, dcCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), dcCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(dcCfgOut.DataDbCfg().DataDbType, - dcCfgOut.DataDbCfg().DataDbHost, dcCfgOut.DataDbCfg().DataDbPort, - dcCfgOut.DataDbCfg().DataDbName, dcCfgOut.DataDbCfg().DataDbUser, - dcCfgOut.DataDbCfg().DataDbPass, dcCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(dcCfgOut.DataDbCfg().Type, + dcCfgOut.DataDbCfg().Host, dcCfgOut.DataDbCfg().Port, + dcCfgOut.DataDbCfg().Name, dcCfgOut.DataDbCfg().User, + dcCfgOut.DataDbCfg().Password, dcCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), dcCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/dispatchers_it_test.go b/migrator/dispatchers_it_test.go index e4883ed4e..12a7a1b09 100644 --- a/migrator/dispatchers_it_test.go +++ b/migrator/dispatchers_it_test.go @@ -124,18 +124,18 @@ func TestDispatcherITMoveEncoding2(t *testing.T) { } func testDspITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(dspCfgIn.DataDbCfg().DataDbType, - dspCfgIn.DataDbCfg().DataDbHost, dspCfgIn.DataDbCfg().DataDbPort, - dspCfgIn.DataDbCfg().DataDbName, dspCfgIn.DataDbCfg().DataDbUser, - dspCfgIn.DataDbCfg().DataDbPass, dspCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(dspCfgIn.DataDbCfg().Type, + dspCfgIn.DataDbCfg().Host, dspCfgIn.DataDbCfg().Port, + dspCfgIn.DataDbCfg().Name, dspCfgIn.DataDbCfg().User, + dspCfgIn.DataDbCfg().Password, dspCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), dspCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(dspCfgOut.DataDbCfg().DataDbType, - dspCfgOut.DataDbCfg().DataDbHost, dspCfgOut.DataDbCfg().DataDbPort, - dspCfgOut.DataDbCfg().DataDbName, dspCfgOut.DataDbCfg().DataDbUser, - dspCfgOut.DataDbCfg().DataDbPass, dspCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(dspCfgOut.DataDbCfg().Type, + dspCfgOut.DataDbCfg().Host, dspCfgOut.DataDbCfg().Port, + dspCfgOut.DataDbCfg().Name, dspCfgOut.DataDbCfg().User, + dspCfgOut.DataDbCfg().Password, dspCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), dspCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index e8ece716d..dba30ffcb 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -100,18 +100,18 @@ func testFltrStart(testName, action string, t *testing.T) { } func testFltrITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(fltrCfgIn.DataDbCfg().DataDbType, - fltrCfgIn.DataDbCfg().DataDbHost, fltrCfgIn.DataDbCfg().DataDbPort, - fltrCfgIn.DataDbCfg().DataDbName, fltrCfgIn.DataDbCfg().DataDbUser, - fltrCfgIn.DataDbCfg().DataDbPass, fltrCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(fltrCfgIn.DataDbCfg().Type, + fltrCfgIn.DataDbCfg().Host, fltrCfgIn.DataDbCfg().Port, + fltrCfgIn.DataDbCfg().Name, fltrCfgIn.DataDbCfg().User, + fltrCfgIn.DataDbCfg().Password, fltrCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), fltrCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(fltrCfgOut.DataDbCfg().DataDbType, - fltrCfgOut.DataDbCfg().DataDbHost, fltrCfgOut.DataDbCfg().DataDbPort, - fltrCfgOut.DataDbCfg().DataDbName, fltrCfgOut.DataDbCfg().DataDbUser, - fltrCfgOut.DataDbCfg().DataDbPass, fltrCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(fltrCfgOut.DataDbCfg().Type, + fltrCfgOut.DataDbCfg().Host, fltrCfgOut.DataDbCfg().Port, + fltrCfgOut.DataDbCfg().Name, fltrCfgOut.DataDbCfg().User, + fltrCfgOut.DataDbCfg().Password, fltrCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), fltrCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/load_ids_it_test.go b/migrator/load_ids_it_test.go index 9513fab6a..a12f8bc42 100644 --- a/migrator/load_ids_it_test.go +++ b/migrator/load_ids_it_test.go @@ -74,18 +74,18 @@ func testLoadIdsStart(testName string, t *testing.T) { } func testLoadIdsITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(loadCfgIn.DataDbCfg().DataDbType, - loadCfgIn.DataDbCfg().DataDbHost, loadCfgIn.DataDbCfg().DataDbPort, - loadCfgIn.DataDbCfg().DataDbName, loadCfgIn.DataDbCfg().DataDbUser, - loadCfgIn.DataDbCfg().DataDbPass, loadCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(loadCfgIn.DataDbCfg().Type, + loadCfgIn.DataDbCfg().Host, loadCfgIn.DataDbCfg().Port, + loadCfgIn.DataDbCfg().Name, loadCfgIn.DataDbCfg().User, + loadCfgIn.DataDbCfg().Password, loadCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), loadCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(loadCfgOut.DataDbCfg().DataDbType, - loadCfgOut.DataDbCfg().DataDbHost, loadCfgOut.DataDbCfg().DataDbPort, - loadCfgOut.DataDbCfg().DataDbName, loadCfgOut.DataDbCfg().DataDbUser, - loadCfgOut.DataDbCfg().DataDbPass, loadCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(loadCfgOut.DataDbCfg().Type, + loadCfgOut.DataDbCfg().Host, loadCfgOut.DataDbCfg().Port, + loadCfgOut.DataDbCfg().Name, loadCfgOut.DataDbCfg().User, + loadCfgOut.DataDbCfg().Password, loadCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), loadCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/rateprofiles_it_test.go b/migrator/rateprofiles_it_test.go index aa22315a5..6a50c8585 100644 --- a/migrator/rateprofiles_it_test.go +++ b/migrator/rateprofiles_it_test.go @@ -123,18 +123,18 @@ func TestRatePrfITMoveEncoding2(t *testing.T) { } func testRatePrfITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(ratePrfCfgIn.DataDbCfg().DataDbType, - ratePrfCfgIn.DataDbCfg().DataDbHost, ratePrfCfgIn.DataDbCfg().DataDbPort, - ratePrfCfgIn.DataDbCfg().DataDbName, ratePrfCfgIn.DataDbCfg().DataDbUser, - ratePrfCfgIn.DataDbCfg().DataDbPass, ratePrfCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(ratePrfCfgIn.DataDbCfg().Type, + ratePrfCfgIn.DataDbCfg().Host, ratePrfCfgIn.DataDbCfg().Port, + ratePrfCfgIn.DataDbCfg().Name, ratePrfCfgIn.DataDbCfg().User, + ratePrfCfgIn.DataDbCfg().Password, ratePrfCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), ratePrfCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(ratePrfCfgOut.DataDbCfg().DataDbType, - ratePrfCfgOut.DataDbCfg().DataDbHost, ratePrfCfgOut.DataDbCfg().DataDbPort, - ratePrfCfgOut.DataDbCfg().DataDbName, ratePrfCfgOut.DataDbCfg().DataDbUser, - ratePrfCfgOut.DataDbCfg().DataDbPass, ratePrfCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(ratePrfCfgOut.DataDbCfg().Type, + ratePrfCfgOut.DataDbCfg().Host, ratePrfCfgOut.DataDbCfg().Port, + ratePrfCfgOut.DataDbCfg().Name, ratePrfCfgOut.DataDbCfg().User, + ratePrfCfgOut.DataDbCfg().Password, ratePrfCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), ratePrfCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/rating_plan_it_test.go b/migrator/rating_plan_it_test.go index bc64ee2c2..8f776bbad 100644 --- a/migrator/rating_plan_it_test.go +++ b/migrator/rating_plan_it_test.go @@ -123,18 +123,18 @@ func TestRatingPlanITMoveEncoding2(t *testing.T) { } func testRtPlITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(rtplCfgIn.DataDbCfg().DataDbType, - rtplCfgIn.DataDbCfg().DataDbHost, rtplCfgIn.DataDbCfg().DataDbPort, - rtplCfgIn.DataDbCfg().DataDbName, rtplCfgIn.DataDbCfg().DataDbUser, - rtplCfgIn.DataDbCfg().DataDbPass, rtplCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(rtplCfgIn.DataDbCfg().Type, + rtplCfgIn.DataDbCfg().Host, rtplCfgIn.DataDbCfg().Port, + rtplCfgIn.DataDbCfg().Name, rtplCfgIn.DataDbCfg().User, + rtplCfgIn.DataDbCfg().Password, rtplCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), ratePrfCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(rtplCfgOut.DataDbCfg().DataDbType, - rtplCfgOut.DataDbCfg().DataDbHost, rtplCfgOut.DataDbCfg().DataDbPort, - rtplCfgOut.DataDbCfg().DataDbName, rtplCfgOut.DataDbCfg().DataDbUser, - rtplCfgOut.DataDbCfg().DataDbPass, rtplCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(rtplCfgOut.DataDbCfg().Type, + rtplCfgOut.DataDbCfg().Host, rtplCfgOut.DataDbCfg().Port, + rtplCfgOut.DataDbCfg().Name, rtplCfgOut.DataDbCfg().User, + rtplCfgOut.DataDbCfg().Password, rtplCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), ratePrfCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/rating_profile_it_test.go b/migrator/rating_profile_it_test.go index 45eb3a7d5..f40ccaa8d 100644 --- a/migrator/rating_profile_it_test.go +++ b/migrator/rating_profile_it_test.go @@ -124,18 +124,18 @@ func TestRatingProfileITMoveEncoding2(t *testing.T) { } func testRtPrfITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(rtprflCfgIn.DataDbCfg().DataDbType, - rtprflCfgIn.DataDbCfg().DataDbHost, rtprflCfgIn.DataDbCfg().DataDbPort, - rtprflCfgIn.DataDbCfg().DataDbName, rtprflCfgIn.DataDbCfg().DataDbUser, - rtprflCfgIn.DataDbCfg().DataDbPass, rtprflCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(rtprflCfgIn.DataDbCfg().Type, + rtprflCfgIn.DataDbCfg().Host, rtprflCfgIn.DataDbCfg().Port, + rtprflCfgIn.DataDbCfg().Name, rtprflCfgIn.DataDbCfg().User, + rtprflCfgIn.DataDbCfg().Password, rtprflCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), rtprflCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(rtprflCfgOut.DataDbCfg().DataDbType, - rtprflCfgOut.DataDbCfg().DataDbHost, rtprflCfgOut.DataDbCfg().DataDbPort, - rtprflCfgOut.DataDbCfg().DataDbName, rtprflCfgOut.DataDbCfg().DataDbUser, - rtprflCfgOut.DataDbCfg().DataDbPass, rtprflCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(rtprflCfgOut.DataDbCfg().Type, + rtprflCfgOut.DataDbCfg().Host, rtprflCfgOut.DataDbCfg().Port, + rtprflCfgOut.DataDbCfg().Name, rtprflCfgOut.DataDbCfg().User, + rtprflCfgOut.DataDbCfg().Password, rtprflCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), rtplCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/resource_it_test.go b/migrator/resource_it_test.go index 4a93477ec..9d76a338b 100644 --- a/migrator/resource_it_test.go +++ b/migrator/resource_it_test.go @@ -124,18 +124,18 @@ func TestResourceITMoveEncoding2(t *testing.T) { } func testResITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(resCfgIn.DataDbCfg().DataDbType, - resCfgIn.DataDbCfg().DataDbHost, resCfgIn.DataDbCfg().DataDbPort, - resCfgIn.DataDbCfg().DataDbName, resCfgIn.DataDbCfg().DataDbUser, - resCfgIn.DataDbCfg().DataDbPass, resCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(resCfgIn.DataDbCfg().Type, + resCfgIn.DataDbCfg().Host, resCfgIn.DataDbCfg().Port, + resCfgIn.DataDbCfg().Name, resCfgIn.DataDbCfg().User, + resCfgIn.DataDbCfg().Password, resCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), resCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(resCfgOut.DataDbCfg().DataDbType, - resCfgOut.DataDbCfg().DataDbHost, resCfgOut.DataDbCfg().DataDbPort, - resCfgOut.DataDbCfg().DataDbName, resCfgOut.DataDbCfg().DataDbUser, - resCfgOut.DataDbCfg().DataDbPass, resCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(resCfgOut.DataDbCfg().Type, + resCfgOut.DataDbCfg().Host, resCfgOut.DataDbCfg().Port, + resCfgOut.DataDbCfg().Name, resCfgOut.DataDbCfg().User, + resCfgOut.DataDbCfg().Password, resCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), resCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/routes_it_test.go b/migrator/routes_it_test.go index 01dc89c69..5d50e7747 100644 --- a/migrator/routes_it_test.go +++ b/migrator/routes_it_test.go @@ -123,18 +123,18 @@ func TestSuppliersITMoveEncoding2(t *testing.T) { } func testSupITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(supCfgIn.DataDbCfg().DataDbType, - supCfgIn.DataDbCfg().DataDbHost, supCfgIn.DataDbCfg().DataDbPort, - supCfgIn.DataDbCfg().DataDbName, supCfgIn.DataDbCfg().DataDbUser, - supCfgIn.DataDbCfg().DataDbPass, supCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(supCfgIn.DataDbCfg().Type, + supCfgIn.DataDbCfg().Host, supCfgIn.DataDbCfg().Port, + supCfgIn.DataDbCfg().Name, supCfgIn.DataDbCfg().User, + supCfgIn.DataDbCfg().Password, supCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), supCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(supCfgOut.DataDbCfg().DataDbType, - supCfgOut.DataDbCfg().DataDbHost, supCfgOut.DataDbCfg().DataDbPort, - supCfgOut.DataDbCfg().DataDbName, supCfgOut.DataDbCfg().DataDbUser, - supCfgOut.DataDbCfg().DataDbPass, supCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(supCfgOut.DataDbCfg().Type, + supCfgOut.DataDbCfg().Host, supCfgOut.DataDbCfg().Port, + supCfgOut.DataDbCfg().Name, supCfgOut.DataDbCfg().User, + supCfgOut.DataDbCfg().Password, supCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), supCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/sharedgroup_it_test.go b/migrator/sharedgroup_it_test.go index 8b623b027..5ba897f16 100644 --- a/migrator/sharedgroup_it_test.go +++ b/migrator/sharedgroup_it_test.go @@ -142,18 +142,18 @@ func TestSharedGroupITMoveEncoding2(t *testing.T) { } func testShrGrpITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(shrGrpCfgIn.DataDbCfg().DataDbType, - shrGrpCfgIn.DataDbCfg().DataDbHost, shrGrpCfgIn.DataDbCfg().DataDbPort, - shrGrpCfgIn.DataDbCfg().DataDbName, shrGrpCfgIn.DataDbCfg().DataDbUser, - shrGrpCfgIn.DataDbCfg().DataDbPass, shrGrpCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(shrGrpCfgIn.DataDbCfg().Type, + shrGrpCfgIn.DataDbCfg().Host, shrGrpCfgIn.DataDbCfg().Port, + shrGrpCfgIn.DataDbCfg().Name, shrGrpCfgIn.DataDbCfg().User, + shrGrpCfgIn.DataDbCfg().Password, shrGrpCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), shrGrpCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(shrGrpCfgOut.DataDbCfg().DataDbType, - shrGrpCfgOut.DataDbCfg().DataDbHost, shrGrpCfgOut.DataDbCfg().DataDbPort, - shrGrpCfgOut.DataDbCfg().DataDbName, shrGrpCfgOut.DataDbCfg().DataDbUser, - shrGrpCfgOut.DataDbCfg().DataDbPass, shrGrpCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(shrGrpCfgOut.DataDbCfg().Type, + shrGrpCfgOut.DataDbCfg().Host, shrGrpCfgOut.DataDbCfg().Port, + shrGrpCfgOut.DataDbCfg().Name, shrGrpCfgOut.DataDbCfg().User, + shrGrpCfgOut.DataDbCfg().Password, shrGrpCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), shrGrpCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index 7aee4550a..5c82d40ca 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -106,18 +106,18 @@ func TestStatsQueueITMove(t *testing.T) { } func testStsITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(stsCfgIn.DataDbCfg().DataDbType, - stsCfgIn.DataDbCfg().DataDbHost, stsCfgIn.DataDbCfg().DataDbPort, - stsCfgIn.DataDbCfg().DataDbName, stsCfgIn.DataDbCfg().DataDbUser, - stsCfgIn.DataDbCfg().DataDbPass, stsCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(stsCfgIn.DataDbCfg().Type, + stsCfgIn.DataDbCfg().Host, stsCfgIn.DataDbCfg().Port, + stsCfgIn.DataDbCfg().Name, stsCfgIn.DataDbCfg().User, + stsCfgIn.DataDbCfg().Password, stsCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), stsCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(stsCfgOut.DataDbCfg().DataDbType, - stsCfgOut.DataDbCfg().DataDbHost, stsCfgOut.DataDbCfg().DataDbPort, - stsCfgOut.DataDbCfg().DataDbName, stsCfgOut.DataDbCfg().DataDbUser, - stsCfgOut.DataDbCfg().DataDbPass, stsCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(stsCfgOut.DataDbCfg().Type, + stsCfgOut.DataDbCfg().Host, stsCfgOut.DataDbCfg().Port, + stsCfgOut.DataDbCfg().Name, stsCfgOut.DataDbCfg().User, + stsCfgOut.DataDbCfg().Password, stsCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), stsCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/thresholds_it_test.go b/migrator/thresholds_it_test.go index b9498966a..0a7563bba 100644 --- a/migrator/thresholds_it_test.go +++ b/migrator/thresholds_it_test.go @@ -143,18 +143,18 @@ func TestThresholdsITMoveEncoding2(t *testing.T) { } func testTrsITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(trsCfgIn.DataDbCfg().DataDbType, - trsCfgIn.DataDbCfg().DataDbHost, trsCfgIn.DataDbCfg().DataDbPort, - trsCfgIn.DataDbCfg().DataDbName, trsCfgIn.DataDbCfg().DataDbUser, - trsCfgIn.DataDbCfg().DataDbPass, trsCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(trsCfgIn.DataDbCfg().Type, + trsCfgIn.DataDbCfg().Host, trsCfgIn.DataDbCfg().Port, + trsCfgIn.DataDbCfg().Name, trsCfgIn.DataDbCfg().User, + trsCfgIn.DataDbCfg().Password, trsCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), trsCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(trsCfgOut.DataDbCfg().DataDbType, - trsCfgOut.DataDbCfg().DataDbHost, trsCfgOut.DataDbCfg().DataDbPort, - trsCfgOut.DataDbCfg().DataDbName, trsCfgOut.DataDbCfg().DataDbUser, - trsCfgOut.DataDbCfg().DataDbPass, trsCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(trsCfgOut.DataDbCfg().Type, + trsCfgOut.DataDbCfg().Host, trsCfgOut.DataDbCfg().Port, + trsCfgOut.DataDbCfg().Name, trsCfgOut.DataDbCfg().User, + trsCfgOut.DataDbCfg().Password, trsCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), trsCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/user_it_test.go b/migrator/user_it_test.go index db66d83f3..fbd1e2be2 100644 --- a/migrator/user_it_test.go +++ b/migrator/user_it_test.go @@ -76,18 +76,18 @@ func testUsrStart(testName, inPath, outPath string, t *testing.T) { } func testUsrITConnect(t *testing.T) { - dataDBIn, err := NewMigratorDataDB(usrCfgIn.DataDbCfg().DataDbType, - usrCfgIn.DataDbCfg().DataDbHost, usrCfgIn.DataDbCfg().DataDbPort, - usrCfgIn.DataDbCfg().DataDbName, usrCfgIn.DataDbCfg().DataDbUser, - usrCfgIn.DataDbCfg().DataDbPass, usrCfgIn.GeneralCfg().DBDataEncoding, + dataDBIn, err := NewMigratorDataDB(usrCfgIn.DataDbCfg().Type, + usrCfgIn.DataDbCfg().Host, usrCfgIn.DataDbCfg().Port, + usrCfgIn.DataDbCfg().Name, usrCfgIn.DataDbCfg().User, + usrCfgIn.DataDbCfg().Password, usrCfgIn.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), usrCfgIn.DataDbCfg().Opts) if err != nil { log.Fatal(err) } - dataDBOut, err := NewMigratorDataDB(usrCfgOut.DataDbCfg().DataDbType, - usrCfgOut.DataDbCfg().DataDbHost, usrCfgOut.DataDbCfg().DataDbPort, - usrCfgOut.DataDbCfg().DataDbName, usrCfgOut.DataDbCfg().DataDbUser, - usrCfgOut.DataDbCfg().DataDbPass, usrCfgOut.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(usrCfgOut.DataDbCfg().Type, + usrCfgOut.DataDbCfg().Host, usrCfgOut.DataDbCfg().Port, + usrCfgOut.DataDbCfg().Name, usrCfgOut.DataDbCfg().User, + usrCfgOut.DataDbCfg().Password, usrCfgOut.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), usrCfgOut.DataDbCfg().Opts) if err != nil { log.Fatal(err) diff --git a/migrator/versions_it_test.go b/migrator/versions_it_test.go index afa495950..3e7cb7b30 100644 --- a/migrator/versions_it_test.go +++ b/migrator/versions_it_test.go @@ -64,7 +64,7 @@ func TestVersionITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - vrsCfg.StorDbCfg().Name = vrsCfg.DataDbCfg().DataDbName + vrsCfg.StorDbCfg().Name = vrsCfg.DataDbCfg().Name vrsSameOutDB = true for _, stest := range sTestsVrsIT { t.Run("TestVrsionITMigrateMongo", stest) @@ -73,10 +73,10 @@ func TestVersionITMongo(t *testing.T) { } func testVrsITConnect(t *testing.T) { - dataDBOut, err := NewMigratorDataDB(vrsCfg.DataDbCfg().DataDbType, - vrsCfg.DataDbCfg().DataDbHost, vrsCfg.DataDbCfg().DataDbPort, - vrsCfg.DataDbCfg().DataDbName, vrsCfg.DataDbCfg().DataDbUser, - vrsCfg.DataDbCfg().DataDbPass, vrsCfg.GeneralCfg().DBDataEncoding, + dataDBOut, err := NewMigratorDataDB(vrsCfg.DataDbCfg().Type, + vrsCfg.DataDbCfg().Host, vrsCfg.DataDbCfg().Port, + vrsCfg.DataDbCfg().Name, vrsCfg.DataDbCfg().User, + vrsCfg.DataDbCfg().Password, vrsCfg.GeneralCfg().DBDataEncoding, config.CgrConfig().CacheCfg(), vrsCfg.DataDbCfg().Opts) if err != nil { t.Fatal(err) diff --git a/services/datadb.go b/services/datadb.go index 1d0a831dc..922ef7800 100644 --- a/services/datadb.go +++ b/services/datadb.go @@ -59,10 +59,10 @@ func (db *DataDBService) Start() (err error) { db.Lock() defer db.Unlock() db.oldDBCfg = db.cfg.DataDbCfg().Clone() - d, err := engine.NewDataDBConn(db.cfg.DataDbCfg().DataDbType, - db.cfg.DataDbCfg().DataDbHost, db.cfg.DataDbCfg().DataDbPort, - db.cfg.DataDbCfg().DataDbName, db.cfg.DataDbCfg().DataDbUser, - db.cfg.DataDbCfg().DataDbPass, db.cfg.GeneralCfg().DBDataEncoding, + d, err := engine.NewDataDBConn(db.cfg.DataDbCfg().Type, + db.cfg.DataDbCfg().Host, db.cfg.DataDbCfg().Port, + db.cfg.DataDbCfg().Name, db.cfg.DataDbCfg().User, + db.cfg.DataDbCfg().Password, db.cfg.GeneralCfg().DBDataEncoding, db.cfg.DataDbCfg().Opts) if db.mandatoryDB() && err != nil { // Cannot configure getter database, show stopper utils.Logger.Crit(fmt.Sprintf("Could not configure dataDb: %s exiting!", err)) @@ -93,7 +93,7 @@ func (db *DataDBService) Reload() (err error) { db.oldDBCfg = db.cfg.DataDbCfg().Clone() return } - if db.cfg.DataDbCfg().DataDbType == utils.Mongo { + if db.cfg.DataDbCfg().Type == utils.Mongo { var ttl time.Duration if ttl, err = utils.IfaceAsDuration(db.cfg.DataDbCfg().Opts[utils.QueryTimeoutCfg]); err != nil { return @@ -101,7 +101,7 @@ func (db *DataDBService) Reload() (err error) { mgo, canCast := db.dm.DataDB().(*engine.MongoStorage) if !canCast { return fmt.Errorf("can't conver DataDB of type %s to MongoStorage", - db.cfg.DataDbCfg().DataDbType) + db.cfg.DataDbCfg().Type) } mgo.SetTTL(ttl) } @@ -153,15 +153,15 @@ func (db *DataDBService) GetDM() *engine.DataManager { // needsConnectionReload returns if the DB connection needs to reloaded func (db *DataDBService) needsConnectionReload() bool { - if db.oldDBCfg.DataDbType != db.cfg.DataDbCfg().DataDbType || - db.oldDBCfg.DataDbHost != db.cfg.DataDbCfg().DataDbHost || - db.oldDBCfg.DataDbName != db.cfg.DataDbCfg().DataDbName || - db.oldDBCfg.DataDbPort != db.cfg.DataDbCfg().DataDbPort || - db.oldDBCfg.DataDbUser != db.cfg.DataDbCfg().DataDbUser || - db.oldDBCfg.DataDbPass != db.cfg.DataDbCfg().DataDbPass { + if db.oldDBCfg.Type != db.cfg.DataDbCfg().Type || + db.oldDBCfg.Host != db.cfg.DataDbCfg().Host || + db.oldDBCfg.Name != db.cfg.DataDbCfg().Name || + db.oldDBCfg.Port != db.cfg.DataDbCfg().Port || + db.oldDBCfg.User != db.cfg.DataDbCfg().User || + db.oldDBCfg.Password != db.cfg.DataDbCfg().Password { return true } - return db.oldDBCfg.DataDbType == utils.Redis && + return db.oldDBCfg.Type == utils.Redis && (db.oldDBCfg.Opts[utils.RedisSentinelNameCfg] != db.cfg.DataDbCfg().Opts[utils.RedisSentinelNameCfg] || db.oldDBCfg.Opts[utils.RedisClusterCfg] != db.cfg.DataDbCfg().Opts[utils.RedisClusterCfg] || db.oldDBCfg.Opts[utils.RedisClusterSyncCfg] != db.cfg.DataDbCfg().Opts[utils.RedisClusterSyncCfg] || diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 3b78c1ec8..a5b96824d 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -82,11 +82,11 @@ func TestDataDBReload(t *testing.T) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", db.dm, getDm) } oldcfg := &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", @@ -210,10 +210,10 @@ func TestDataDBReloadBadType(t *testing.T) { if err != nil { t.Fatal(err) } - dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { t.Fatal(err) @@ -260,11 +260,11 @@ func TestDataDBReloadBadType(t *testing.T) { cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) db.oldDBCfg = &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", @@ -362,7 +362,7 @@ func TestDataDBReloadBadType(t *testing.T) { Remote: false}, }, } - cfg.DataDbCfg().DataDbType = "dbtype" + cfg.DataDbCfg().Type = "dbtype" db.dm = nil err = db.Reload() if err == nil || err.Error() != "unsupported db_type " { @@ -389,11 +389,11 @@ func TestDataDBReloadErrorMarsheler(t *testing.T) { t.Errorf("Expected service to be down") } db.oldDBCfg = &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", @@ -505,10 +505,10 @@ func TestDataDBStartVersion(t *testing.T) { if err != nil { t.Fatal(err) } - dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { t.Fatal(err) @@ -567,10 +567,10 @@ func TestDataDBReloadCastError(t *testing.T) { if err != nil { t.Fatal(err) } - dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { t.Fatal(err) @@ -617,11 +617,11 @@ func TestDataDBReloadCastError(t *testing.T) { cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) db.oldDBCfg = &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", @@ -735,10 +735,10 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) { if err != nil { t.Fatal(err) } - dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().DataDbType, - cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort, - cfg.DataDbCfg().DataDbName, cfg.DataDbCfg().DataDbUser, - cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, + dbConn, err := engine.NewDataDBConn(cfg.DataDbCfg().Type, + cfg.DataDbCfg().Host, cfg.DataDbCfg().Port, + cfg.DataDbCfg().Name, cfg.DataDbCfg().User, + cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, cfg.DataDbCfg().Opts) if err != nil { t.Fatal(err) @@ -785,11 +785,11 @@ func TestDataDBReloadIfaceAsDurationError(t *testing.T) { cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) db.oldDBCfg = &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", @@ -903,7 +903,7 @@ func TestDataDBStartSessionSCfgErr(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) - cfg.DataDbCfg().DataDbType = "badtype" + cfg.DataDbCfg().Type = "badtype" cfg.SessionSCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" err := db.Start() @@ -917,7 +917,7 @@ func TestDataDBStartRalsSCfgErr(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) - cfg.DataDbCfg().DataDbType = "badtype" + cfg.DataDbCfg().Type = "badtype" db.cfg.RalsCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" err := db.Start() @@ -933,11 +933,11 @@ func TestDataDBReloadError(t *testing.T) { db := NewDataDBService(cfg, cM, srvDep) cfg.GeneralCfg().DBDataEncoding = utils.JSON db.oldDBCfg = &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0", diff --git a/services/datadb_test.go b/services/datadb_test.go index 9b62194a1..232d98b23 100644 --- a/services/datadb_test.go +++ b/services/datadb_test.go @@ -47,11 +47,11 @@ func TestDataDBCoverage(t *testing.T) { t.Errorf("Expected service to be running") } oldcfg := &config.DataDbCfg{ - DataDbType: utils.Mongo, - DataDbHost: "127.0.0.1", - DataDbPort: "27017", - DataDbName: "10", - DataDbUser: "cgrates", + Type: utils.Mongo, + Host: "127.0.0.1", + Port: "27017", + Name: "10", + User: "cgrates", Opts: map[string]interface{}{ utils.QueryTimeoutCfg: "10s", utils.RedisClusterOnDownDelayCfg: "0",