From fefa4317bf057d476a3fdd72bb1271620d038d87 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 5 Oct 2018 10:57:05 +0300 Subject: [PATCH] Added StroreDb config --- cmd/cgr-engine/cgr-engine.go | 9 +- cmd/cgr-loader/cgr-loader.go | 46 ++++--- cmd/cgr-migrator/cgr-migrator.go | 79 ++++++----- config/config.go | 62 ++------- config/config_defaults.go | 4 +- config/config_test.go | 53 ++++---- config/datadbcfg.go | 5 +- config/datadbcfg_test.go | 4 +- config/storedbcfg.go | 82 +++++++++++ config/storedbcfg_test.go | 131 ++++++++++++++++++ engine/datamanager_it_test.go | 5 +- engine/filterindexer_it_test.go | 7 +- engine/libtest.go | 16 ++- engine/loader_it_test.go | 9 +- engine/onstor_it_test.go | 7 +- engine/storage_cdrs_it_test.go | 54 +++++--- engine/stordb_it_test.go | 166 ++++++++++++----------- engine/versions_it_test.go | 38 ++++-- migrator/accounts2_it_test.go | 23 ++-- migrator/cdrs_it_test.go | 34 ++--- migrator/sessions_costs_it_test.go | 34 ++--- migrator/tp_account_actions_it_test.go | 36 ++--- migrator/tp_action_plans_it_test.go | 40 +++--- migrator/tp_action_triggers_it_test.go | 40 +++--- migrator/tp_actions_it_test.go | 40 +++--- migrator/tp_aliases_it_test.go | 42 +++--- migrator/tp_cdr_stats_it_test.go | 40 +++--- migrator/tp_derived_chargers_it_test.go | 38 +++--- migrator/tp_destination_rates_it_test.go | 38 +++--- migrator/tp_destinations_it_test.go | 36 ++--- migrator/tp_filters_it_test.go | 38 +++--- migrator/tp_rates_it_test.go | 40 +++--- migrator/tp_rating_plans_it_test.go | 44 +++--- migrator/tp_rating_profiles_it_test.go | 40 +++--- migrator/tp_resources_it_test.go | 36 ++--- migrator/tp_shared_groups_it_test.go | 40 +++--- migrator/tp_stats_it_test.go | 38 +++--- migrator/tp_suppliers_it_test.go | 38 +++--- migrator/tp_thresholds_it_test.go | 36 ++--- migrator/tp_timings_it_test.go | 36 ++--- migrator/tp_users_it_test.go | 40 +++--- 41 files changed, 958 insertions(+), 686 deletions(-) create mode 100644 config/storedbcfg.go create mode 100644 config/storedbcfg_test.go diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index d83407255..d1e46b583 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -1180,9 +1180,12 @@ func main() { } } if cfg.RALsEnabled || cfg.CDRSEnabled { - storDb, err := engine.ConfigureStorStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort, - cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, cfg.StorDBMaxOpenConns, - cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime, cfg.StorDBCDRSIndexes) + storDb, err := engine.ConfigureStorStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.DBDataEncoding, + cfg.StorDbCfg().StorDBMaxOpenConns, cfg.StorDbCfg().StorDBMaxIdleConns, + cfg.StorDbCfg().StorDBConnMaxLifetime, cfg.StorDbCfg().StorDBCDRSIndexes) if err != nil { // Cannot configure logger database, show stopper utils.Logger.Crit(fmt.Sprintf("Could not configure logger database: %s exiting!", err)) return diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 6e084ee76..4dd8f83bd 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -54,17 +54,17 @@ var ( dbRedisSentinel = flag.String("redis_sentinel", dfltCfg.DataDbCfg().DataDbSentinelName, "The name of redis sentinel") - storDBType = flag.String("stordb_type", dfltCfg.StorDBType, + storDBType = flag.String("stordb_type", dfltCfg.StorDbCfg().StorDBType, "The type of the storDb database <*mysql|*postgres|*mongo>") - storDBHost = flag.String("stordb_host", dfltCfg.StorDBHost, + storDBHost = flag.String("stordb_host", dfltCfg.StorDbCfg().StorDBHost, "The storDb host to connect to.") - storDBPort = flag.String("stordb_port", dfltCfg.StorDBPort, + storDBPort = flag.String("stordb_port", dfltCfg.StorDbCfg().StorDBPort, "The storDb port to bind to.") - storDBName = flag.String("stordb_name", dfltCfg.StorDBName, + storDBName = flag.String("stordb_name", dfltCfg.StorDbCfg().StorDBName, "The name/number of the storDb to connect to.") - storDBUser = flag.String("stordb_user", dfltCfg.StorDBUser, + storDBUser = flag.String("stordb_user", dfltCfg.StorDbCfg().StorDBUser, "The storDb user to sign in as.") - storDBPasswd = flag.String("stordb_passwd", dfltCfg.StorDBPass, + storDBPasswd = flag.String("stordb_passwd", dfltCfg.StorDbCfg().StorDBPass, "The storDb user's password.") flush = flag.Bool("flushdb", false, @@ -144,28 +144,28 @@ func main() { ldrCfg.DataDbCfg().DataDbSentinelName = *dbRedisSentinel } - if *storDBType != dfltCfg.StorDBType { - ldrCfg.StorDBType = *storDBType + if *storDBType != dfltCfg.StorDbCfg().StorDBType { + ldrCfg.StorDbCfg().StorDBType = *storDBType } - if *storDBHost != dfltCfg.StorDBHost { - ldrCfg.StorDBHost = *storDBHost + if *storDBHost != dfltCfg.StorDbCfg().StorDBHost { + ldrCfg.StorDbCfg().StorDBHost = *storDBHost } - if *storDBPort != dfltCfg.StorDBPort { - ldrCfg.StorDBPort = *storDBPort + if *storDBPort != dfltCfg.StorDbCfg().StorDBPort { + ldrCfg.StorDbCfg().StorDBPort = *storDBPort } - if *storDBName != dfltCfg.StorDBName { - ldrCfg.StorDBName = *storDBName + if *storDBName != dfltCfg.StorDbCfg().StorDBName { + ldrCfg.StorDbCfg().StorDBName = *storDBName } - if *storDBUser != dfltCfg.StorDBUser { - ldrCfg.StorDBUser = *storDBUser + if *storDBUser != dfltCfg.StorDbCfg().StorDBUser { + ldrCfg.StorDbCfg().StorDBUser = *storDBUser } if *storDBPasswd != "" { - ldrCfg.StorDBPass = *storDBPasswd + ldrCfg.StorDbCfg().StorDBPass = *storDBPasswd } if *dbDataEncoding != "" { @@ -225,10 +225,14 @@ func main() { } if *fromStorDB || *toStorDB { - if storDb, err = engine.ConfigureLoadStorage(ldrCfg.StorDBType, ldrCfg.StorDBHost, ldrCfg.StorDBPort, - ldrCfg.StorDBName, ldrCfg.StorDBUser, ldrCfg.StorDBPass, ldrCfg.DBDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes); err != nil { + if storDb, err = engine.ConfigureLoadStorage(ldrCfg.StorDbCfg().StorDBType, + ldrCfg.StorDbCfg().StorDBHost, ldrCfg.StorDbCfg().StorDBPort, + ldrCfg.StorDbCfg().StorDBName, ldrCfg.StorDbCfg().StorDBUser, + ldrCfg.StorDbCfg().StorDBPass, ldrCfg.DBDataEncoding, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes); err != nil { log.Fatalf("Coud not open storDB connection: %s", err.Error()) } defer storDb.Close() diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index b67f53d1e..91d501465 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -76,17 +76,17 @@ var ( outDataDBRedisSentinel = flag.String("out_redis_sentinel", utils.MetaDataDB, "the name of redis sentinel") - inStorDBType = flag.String("stordb_type", dfltCfg.StorDBType, + inStorDBType = flag.String("stordb_type", dfltCfg.StorDbCfg().StorDBType, "the type of the StorDB Database <*mysql|*postgres|*mongo>") - inStorDBHost = flag.String("stordb_host", dfltCfg.StorDBHost, + inStorDBHost = flag.String("stordb_host", dfltCfg.StorDbCfg().StorDBHost, "the StorDB host") - inStorDBPort = flag.String("stordb_port", dfltCfg.StorDBPort, + inStorDBPort = flag.String("stordb_port", dfltCfg.StorDbCfg().StorDBPort, "the StorDB port") - inStorDBName = flag.String("stordb_name", dfltCfg.StorDBName, + inStorDBName = flag.String("stordb_name", dfltCfg.StorDbCfg().StorDBName, "the name/number of the StorDB") - inStorDBUser = flag.String("stordb_user", dfltCfg.StorDBUser, + inStorDBUser = flag.String("stordb_user", dfltCfg.StorDbCfg().StorDBUser, "the StorDB user") - inStorDBPass = flag.String("stordb_passwd", dfltCfg.StorDBPass, + inStorDBPass = flag.String("stordb_passwd", dfltCfg.StorDbCfg().StorDBPass, "the StorDB password") outStorDBType = flag.String("out_stordb_type", utils.MetaStorDB, @@ -231,81 +231,82 @@ func main() { } // inStorDB - if *inStorDBType != dfltCfg.StorDBType { - mgrCfg.StorDBType = strings.TrimPrefix(*inStorDBType, "*") + if *inStorDBType != dfltCfg.StorDbCfg().StorDBType { + mgrCfg.StorDbCfg().StorDBType = strings.TrimPrefix(*inStorDBType, "*") } - if *inStorDBHost != dfltCfg.StorDBHost { - mgrCfg.StorDBHost = *inStorDBHost + if *inStorDBHost != dfltCfg.StorDbCfg().StorDBHost { + mgrCfg.StorDbCfg().StorDBHost = *inStorDBHost } - if *inStorDBPort != dfltCfg.StorDBPort { - mgrCfg.StorDBPort = *inStorDBPort + if *inStorDBPort != dfltCfg.StorDbCfg().StorDBPort { + mgrCfg.StorDbCfg().StorDBPort = *inStorDBPort } - if *inStorDBName != dfltCfg.StorDBName { - mgrCfg.StorDBName = *inStorDBName + if *inStorDBName != dfltCfg.StorDbCfg().StorDBName { + mgrCfg.StorDbCfg().StorDBName = *inStorDBName } - if *inStorDBUser != dfltCfg.StorDBUser { - mgrCfg.StorDBUser = *inStorDBUser + if *inStorDBUser != dfltCfg.StorDbCfg().StorDBUser { + mgrCfg.StorDbCfg().StorDBUser = *inStorDBUser } - if *inStorDBPass != dfltCfg.StorDBPass { - mgrCfg.StorDBPass = *inStorDBPass + if *inStorDBPass != dfltCfg.StorDbCfg().StorDBPass { + mgrCfg.StorDbCfg().StorDBPass = *inStorDBPass } // outStorDB if *outStorDBType == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBType == mgrCfg.MigratorCgrConfig.OutStorDBType { - mgrCfg.MigratorCgrConfig.OutStorDBType = mgrCfg.StorDBType + mgrCfg.MigratorCgrConfig.OutStorDBType = mgrCfg.StorDbCfg().StorDBType } } else { mgrCfg.MigratorCgrConfig.OutStorDBType = strings.TrimPrefix(*outStorDBType, "*") } if *outStorDBHost == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBHost == mgrCfg.MigratorCgrConfig.OutStorDBHost { - mgrCfg.MigratorCgrConfig.OutStorDBHost = mgrCfg.StorDBHost + mgrCfg.MigratorCgrConfig.OutStorDBHost = mgrCfg.StorDbCfg().StorDBHost } } else { mgrCfg.MigratorCgrConfig.OutStorDBHost = *outStorDBHost } if *outStorDBPort == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBPort == mgrCfg.MigratorCgrConfig.OutStorDBPort { - mgrCfg.MigratorCgrConfig.OutStorDBPort = mgrCfg.StorDBPort + mgrCfg.MigratorCgrConfig.OutStorDBPort = mgrCfg.StorDbCfg().StorDBPort } } else { mgrCfg.MigratorCgrConfig.OutStorDBPort = *outStorDBPort } if *outStorDBName == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBName == mgrCfg.MigratorCgrConfig.OutStorDBName { - mgrCfg.MigratorCgrConfig.OutStorDBName = mgrCfg.StorDBName + mgrCfg.MigratorCgrConfig.OutStorDBName = mgrCfg.StorDbCfg().StorDBName } } else { mgrCfg.MigratorCgrConfig.OutStorDBName = *outStorDBName } if *outStorDBUser == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBUser == mgrCfg.MigratorCgrConfig.OutStorDBUser { - mgrCfg.MigratorCgrConfig.OutStorDBUser = mgrCfg.StorDBUser + mgrCfg.MigratorCgrConfig.OutStorDBUser = mgrCfg.StorDbCfg().StorDBUser } } else { mgrCfg.MigratorCgrConfig.OutStorDBUser = *outStorDBUser } if *outStorDBPass == utils.MetaStorDB { if dfltCfg.MigratorCgrConfig.OutStorDBPassword == mgrCfg.MigratorCgrConfig.OutStorDBPassword { - mgrCfg.MigratorCgrConfig.OutStorDBPassword = mgrCfg.StorDBPass + mgrCfg.MigratorCgrConfig.OutStorDBPassword = mgrCfg.StorDbCfg().StorDBPass } } else { mgrCfg.MigratorCgrConfig.OutStorDBPassword = *outStorDBPass } - sameStorDB = mgrCfg.MigratorCgrConfig.OutStorDBType == mgrCfg.StorDBType && - mgrCfg.MigratorCgrConfig.OutStorDBHost == mgrCfg.StorDBHost && - mgrCfg.MigratorCgrConfig.OutStorDBPort == mgrCfg.StorDBPort && - mgrCfg.MigratorCgrConfig.OutStorDBName == mgrCfg.StorDBName + sameStorDB = mgrCfg.MigratorCgrConfig.OutStorDBType == mgrCfg.StorDbCfg().StorDBType && + mgrCfg.MigratorCgrConfig.OutStorDBHost == mgrCfg.StorDbCfg().StorDBHost && + mgrCfg.MigratorCgrConfig.OutStorDBPort == mgrCfg.StorDbCfg().StorDBPort && + mgrCfg.MigratorCgrConfig.OutStorDBName == mgrCfg.StorDbCfg().StorDBName - if storDBIn, err = migrator.NewMigratorStorDB(mgrCfg.StorDBType, - mgrCfg.StorDBHost, mgrCfg.StorDBPort, - mgrCfg.StorDBName, mgrCfg.StorDBUser, mgrCfg.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes); err != nil { + if storDBIn, err = migrator.NewMigratorStorDB(mgrCfg.StorDbCfg().StorDBType, + mgrCfg.StorDbCfg().StorDBHost, mgrCfg.StorDbCfg().StorDBPort, + mgrCfg.StorDbCfg().StorDBName, mgrCfg.StorDbCfg().StorDBUser, + mgrCfg.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes); err != nil { log.Fatal(err) } @@ -314,11 +315,9 @@ func main() { } else if storDBOut, err = migrator.NewMigratorStorDB(mgrCfg.MigratorCgrConfig.OutStorDBType, mgrCfg.MigratorCgrConfig.OutStorDBHost, mgrCfg.MigratorCgrConfig.OutStorDBPort, mgrCfg.MigratorCgrConfig.OutStorDBName, mgrCfg.MigratorCgrConfig.OutStorDBUser, - mgrCfg.MigratorCgrConfig.OutStorDBPassword, - mgrCfg.StorDBMaxOpenConns, - mgrCfg.StorDBMaxIdleConns, - mgrCfg.StorDBConnMaxLifetime, - mgrCfg.StorDBCDRSIndexes); err != nil { + mgrCfg.MigratorCgrConfig.OutStorDBPassword, mgrCfg.StorDbCfg().StorDBMaxOpenConns, + mgrCfg.StorDbCfg().StorDBMaxIdleConns, mgrCfg.StorDbCfg().StorDBConnMaxLifetime, + mgrCfg.StorDbCfg().StorDBCDRSIndexes); err != nil { log.Fatal(err) } diff --git a/config/config.go b/config/config.go index 275af7843..7bb89776f 100755 --- a/config/config.go +++ b/config/config.go @@ -141,6 +141,7 @@ func NewDefaultCGRConfig() (*CGRConfig, error) { cfg.NodeID = utils.UUIDSha1Prefix() cfg.DataFolderPath = "/usr/share/cgrates/" cfg.dataDbCfg = new(DataDbCfg) + cfg.storDbCfg = new(StorDbCfg) cfg.sessionSCfg = new(SessionSCfg) cfg.cacheConfig = make(CacheConfig) cfg.fsAgentCfg = new(FsAgentConfig) @@ -251,16 +252,6 @@ func NewCGRConfigFromFolder(cfgDir string) (*CGRConfig, error) { // Holds system configuration, defaults are overwritten with values from config file if found type CGRConfig struct { NodeID string // Identifier for this engine instance - StorDBType string // Should reflect the database type used to store logs - StorDBHost string // The host to connect to. Values that start with / are for UNIX domain sockets. - StorDBPort string // Th e port to bind to. - StorDBName string // The name of the database to connect to. - StorDBUser string // The user to sign in as. - StorDBPass string // The user's password. - StorDBMaxOpenConns int // Maximum database connections opened - StorDBMaxIdleConns int // Maximum idle connections to keep opened - StorDBConnMaxLifetime int - StorDBCDRSIndexes []string DBDataEncoding string // The encoding used to store object data in strings: cacheConfig CacheConfig RPCJSONListen string // RPC JSON listening address @@ -363,7 +354,9 @@ type CGRConfig struct { // Cache defaults loaded from json and needing clones dfltCdreProfile *CdreConfig // Default cdreConfig profile dfltCdrcProfile *CdrcConfig // Default cdrcConfig profile - dataDbCfg *DataDbCfg // Database config + + dataDbCfg *DataDbCfg // Database config + storDbCfg *StorDbCfg //StroreDb config } func (self *CGRConfig) checkConfigSanity() error { @@ -897,47 +890,12 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) (err error) { return nil } - if jsnDataDbCfg != nil { - if err := self.dataDbCfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { - return err - } + if err := self.dataDbCfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { + return err } - if jsnStorDbCfg != nil { - if jsnStorDbCfg.Db_type != nil { - self.StorDBType = *jsnStorDbCfg.Db_type - } - if jsnStorDbCfg.Db_host != nil { - self.StorDBHost = *jsnStorDbCfg.Db_host - } - if jsnStorDbCfg.Db_port != nil { - port := strconv.Itoa(*jsnStorDbCfg.Db_port) - if port == "-1" { - port = utils.MetaDynamic - } - self.StorDBPort = NewDbDefaults().DBPort(*jsnStorDbCfg.Db_type, port) - } - if jsnStorDbCfg.Db_name != nil { - self.StorDBName = *jsnStorDbCfg.Db_name - } - if jsnStorDbCfg.Db_user != nil { - self.StorDBUser = *jsnStorDbCfg.Db_user - } - if jsnStorDbCfg.Db_password != nil { - self.StorDBPass = *jsnStorDbCfg.Db_password - } - if jsnStorDbCfg.Max_open_conns != nil { - self.StorDBMaxOpenConns = *jsnStorDbCfg.Max_open_conns - } - if jsnStorDbCfg.Max_idle_conns != nil { - self.StorDBMaxIdleConns = *jsnStorDbCfg.Max_idle_conns - } - if jsnStorDbCfg.Conn_max_lifetime != nil { - self.StorDBConnMaxLifetime = *jsnStorDbCfg.Conn_max_lifetime - } - if jsnStorDbCfg.Cdrs_indexes != nil { - self.StorDBCDRSIndexes = *jsnStorDbCfg.Cdrs_indexes - } + if err := self.storDbCfg.loadFromJsonCfg(jsnStorDbCfg); err != nil { + return err } if jsnGeneralCfg != nil { @@ -1589,3 +1547,7 @@ func (cfg *CGRConfig) SchedulerCfg() *SchedulerCfg { func (cfg *CGRConfig) DataDbCfg() *DataDbCfg { return cfg.dataDbCfg } + +func (cfg *CGRConfig) StorDbCfg() *StorDbCfg { + return cfg.storDbCfg +} diff --git a/config/config_defaults.go b/config/config_defaults.go index 2f7b9d29a..0f6f7c8d9 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -54,7 +54,7 @@ const CGRATES_CFG_JSON = ` "data_db": { // database used to store runtime data (eg: accounts, cdr stats) - "db_type": "redis", // data_db type: + "db_type": "redis", // data_db type: <*redis|*mongo|*internal> "db_host": "127.0.0.1", // data_db host address "db_port": 6379, // data_db port to reach the database "db_name": "10", // data_db database name to connect to @@ -65,7 +65,7 @@ const CGRATES_CFG_JSON = ` "stor_db": { // database used to store offline tariff plans and CDRs - "db_type": "mysql", // stor database type to use: + "db_type": "mysql", // stor database type to use: <*mongo|*mysql|*postgres|*internal> "db_host": "127.0.0.1", // the host to connect to "db_port": 3306, // the port to reach the stordb "db_name": "cgrates", // stor database name diff --git a/config/config_test.go b/config/config_test.go index 58386e704..2622c1171 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -139,10 +139,10 @@ func TestCgrCfgStorDBPortWithoutDynamic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(JSN_CFG); err != nil { t.Error(err) - } else if cgrCfg.StorDBType != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBType, utils.MONGO) - } else if cgrCfg.StorDBPort != "3306" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBPort, "3306") + } else if cgrCfg.StorDbCfg().StorDBType != utils.MONGO { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().StorDBType, utils.MONGO) + } else if cgrCfg.StorDbCfg().StorDBPort != "3306" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().StorDBPort, "3306") } } @@ -157,10 +157,10 @@ func TestCgrCfgStorDBPortWithDymanic(t *testing.T) { if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(JSN_CFG); err != nil { t.Error(err) - } else if cgrCfg.StorDBType != utils.MONGO { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBType, utils.MONGO) - } else if cgrCfg.StorDBPort != "27017" { - t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDBPort, "27017") + } else if cgrCfg.StorDbCfg().StorDBType != utils.MONGO { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().StorDBType, utils.MONGO) + } else if cgrCfg.StorDbCfg().StorDBPort != "27017" { + t.Errorf("Expected: %+v, received: %+v", cgrCfg.StorDbCfg().StorDBPort, "27017") } } @@ -433,33 +433,32 @@ func TestCgrCfgJSONDefaultsjsnDataDb(t *testing.T) { } func TestCgrCfgJSONDefaultsStorDB(t *testing.T) { - if cgrCfg.StorDBType != "mysql" { - t.Error(cgrCfg.StorDBType) + if cgrCfg.StorDbCfg().StorDBType != "mysql" { + t.Errorf("Expecting: mysql , recived: %+v", cgrCfg.StorDbCfg().StorDBType) } - if cgrCfg.StorDBHost != "127.0.0.1" { - t.Error(cgrCfg.StorDBHost) + if cgrCfg.StorDbCfg().StorDBHost != "127.0.0.1" { + t.Errorf("Expecting: 127.0.0.1 , recived: %+v", cgrCfg.StorDbCfg().StorDBHost) } - if cgrCfg.StorDBPort != "3306" { - t.Error(cgrCfg.StorDBPort) + if cgrCfg.StorDbCfg().StorDBPort != "3306" { + t.Errorf("Expecting: 3306 , recived: %+v", cgrCfg.StorDbCfg().StorDBPort) } - if cgrCfg.StorDBName != "cgrates" { - t.Error(cgrCfg.StorDBName) + if cgrCfg.StorDbCfg().StorDBName != "cgrates" { + t.Errorf("Expecting: cgrates , recived: %+v", cgrCfg.StorDbCfg().StorDBName) } - if cgrCfg.StorDBUser != "cgrates" { - t.Error(cgrCfg.StorDBUser) + if cgrCfg.StorDbCfg().StorDBUser != "cgrates" { + t.Errorf("Expecting: cgrates , recived: %+v", cgrCfg.StorDbCfg().StorDBUser) } - if cgrCfg.StorDBPass != "" { - t.Error(cgrCfg.StorDBPass) + if cgrCfg.StorDbCfg().StorDBPass != "" { + t.Errorf("Expecting: , recived: %+v", cgrCfg.StorDbCfg().StorDBPass) } - if cgrCfg.StorDBMaxOpenConns != 100 { - t.Error(cgrCfg.StorDBMaxOpenConns) + if cgrCfg.StorDbCfg().StorDBMaxOpenConns != 100 { + t.Errorf("Expecting: 100 , recived: %+v", cgrCfg.StorDbCfg().StorDBMaxOpenConns) } - if cgrCfg.StorDBMaxIdleConns != 10 { - t.Error(cgrCfg.StorDBMaxIdleConns) + if cgrCfg.StorDbCfg().StorDBMaxIdleConns != 10 { + t.Errorf("Expecting: 10 , recived: %+v", cgrCfg.StorDbCfg().StorDBMaxIdleConns) } - Eslice := []string{} - if !reflect.DeepEqual(cgrCfg.StorDBCDRSIndexes, Eslice) { - t.Error(cgrCfg.StorDBCDRSIndexes) + if !reflect.DeepEqual(cgrCfg.StorDbCfg().StorDBCDRSIndexes, []string{}) { + t.Errorf("Expecting: %+v , recived: %+v", []string{}, cgrCfg.StorDbCfg().StorDBCDRSIndexes) } } diff --git a/config/datadbcfg.go b/config/datadbcfg.go index 80ce3d7da..3c7a11818 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -20,6 +20,7 @@ package config import ( "strconv" + "strings" "github.com/cgrates/cgrates/utils" ) @@ -41,7 +42,7 @@ func (dbcfg *DataDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) { return nil } if jsnDbCfg.Db_type != nil { - dbcfg.DataDbType = *jsnDbCfg.Db_type + dbcfg.DataDbType = strings.TrimPrefix(*jsnDbCfg.Db_type, "*") } if jsnDbCfg.Db_host != nil { dbcfg.DataDbHost = *jsnDbCfg.Db_host @@ -51,7 +52,7 @@ func (dbcfg *DataDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) { if port == "-1" { port = utils.MetaDynamic } - dbcfg.DataDbPort = NewDbDefaults().DBPort(*jsnDbCfg.Db_type, port) + dbcfg.DataDbPort = NewDbDefaults().DBPort(dbcfg.DataDbType, port) } if jsnDbCfg.Db_name != nil { dbcfg.DataDbName = *jsnDbCfg.Db_name diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go index d03c4e711..6552dda3e 100644 --- a/config/datadbcfg_test.go +++ b/config/datadbcfg_test.go @@ -37,7 +37,7 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) { } cfgJSONStr := `{ "data_db": { // database used to store runtime data (eg: accounts, cdr stats) - "db_type": "redis", // data_db type: + "db_type": "*redis", // data_db type: <*redis|*mongo|*internal> "db_host": "127.0.0.1", // data_db host address "db_port": -1, // data_db port to reach the database "db_name": "10", // data_db database name to connect to @@ -105,7 +105,7 @@ func TestDataDbCfgloadFromJsonCfgPort(t *testing.T) { } cfgJSONStr = `{ "data_db": { - "db_type": "internal", + "db_type": "*internal", "db_port": -1, } }` diff --git a/config/storedbcfg.go b/config/storedbcfg.go new file mode 100644 index 000000000..bd8aedc9b --- /dev/null +++ b/config/storedbcfg.go @@ -0,0 +1,82 @@ +/* +Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +Copyright (C) ITsysCOM GmbH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see +*/ + +package config + +import ( + "strconv" + "strings" + + "github.com/cgrates/cgrates/utils" +) + +// StorDbCfg StroreDb config +type StorDbCfg struct { + StorDBType string // Should reflect the database type used to store logs + StorDBHost string // The host to connect to. Values that start with / are for UNIX domain sockets. + StorDBPort string // Th e port to bind to. + StorDBName string // The name of the database to connect to. + StorDBUser string // The user to sign in as. + StorDBPass string // The user's password. + StorDBMaxOpenConns int // Maximum database connections opened + StorDBMaxIdleConns int // Maximum idle connections to keep opened + StorDBConnMaxLifetime int + StorDBCDRSIndexes []string +} + +//loadFromJsonCfg loads StoreDb config from JsonCfg +func (dbcfg *StorDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) { + if jsnDbCfg == nil { + return nil + } + if jsnDbCfg.Db_type != nil { + dbcfg.StorDBType = strings.TrimPrefix(*jsnDbCfg.Db_type, "*") + } + if jsnDbCfg.Db_host != nil { + dbcfg.StorDBHost = *jsnDbCfg.Db_host + } + if jsnDbCfg.Db_port != nil { + port := strconv.Itoa(*jsnDbCfg.Db_port) + if port == "-1" { + port = utils.MetaDynamic + } + dbcfg.StorDBPort = NewDbDefaults().DBPort(dbcfg.StorDBType, port) + } + if jsnDbCfg.Db_name != nil { + dbcfg.StorDBName = *jsnDbCfg.Db_name + } + if jsnDbCfg.Db_user != nil { + dbcfg.StorDBUser = *jsnDbCfg.Db_user + } + if jsnDbCfg.Db_password != nil { + dbcfg.StorDBPass = *jsnDbCfg.Db_password + } + if jsnDbCfg.Max_open_conns != nil { + dbcfg.StorDBMaxOpenConns = *jsnDbCfg.Max_open_conns + } + if jsnDbCfg.Max_idle_conns != nil { + dbcfg.StorDBMaxIdleConns = *jsnDbCfg.Max_idle_conns + } + if jsnDbCfg.Conn_max_lifetime != nil { + dbcfg.StorDBConnMaxLifetime = *jsnDbCfg.Conn_max_lifetime + } + if jsnDbCfg.Cdrs_indexes != nil { + dbcfg.StorDBCDRSIndexes = *jsnDbCfg.Cdrs_indexes + } + return nil +} diff --git a/config/storedbcfg_test.go b/config/storedbcfg_test.go new file mode 100644 index 000000000..92c3f910e --- /dev/null +++ b/config/storedbcfg_test.go @@ -0,0 +1,131 @@ +/* +Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +Copyright (C) ITsysCOM GmbH + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see +*/ +package config + +import ( + "reflect" + "strings" + "testing" +) + +func TestStoreDbCfgloadFromJsonCfg(t *testing.T) { + var dbcfg, expected StorDbCfg + if err := dbcfg.loadFromJsonCfg(nil); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(dbcfg, expected) { + t.Errorf("Expected: %+v ,recived: %+v", expected, dbcfg) + } + if err := dbcfg.loadFromJsonCfg(new(DbJsonCfg)); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(dbcfg, expected) { + t.Errorf("Expected: %+v ,recived: %+v", expected, dbcfg) + } + cfgJSONStr := `{ +"stor_db": { // database used to store offline tariff plans and CDRs + "db_type": "*mysql", // stor database type to use: <*mongo|*mysql|*postgres|*internal> + "db_host": "127.0.0.1", // the host to connect to + "db_port": 3306, // the port to reach the stordb + "db_name": "cgrates", // stor database name + "db_user": "cgrates", // username to use when connecting to stordb + "db_password": "password", // password to use when connecting to stordb + "max_open_conns": 100, // maximum database connections opened, not applying for mongo + "max_idle_conns": 10, // maximum database connections idle, not applying for mongo + "conn_max_lifetime": 0, // maximum amount of time in seconds a connection may be reused (0 for unlimited), not applying for mongo + "cdrs_indexes": [], // indexes on cdrs table to speed up queries, used only in case of mongo + } +}` + expected = StorDbCfg{ + StorDBType: "mysql", + StorDBHost: "127.0.0.1", + StorDBPort: "3306", + StorDBName: "cgrates", + StorDBUser: "cgrates", + StorDBPass: "password", + StorDBMaxOpenConns: 100, + StorDBMaxIdleConns: 10, + StorDBConnMaxLifetime: 0, + StorDBCDRSIndexes: []string{}, + } + if jsnCfg, err := NewCgrJsonCfgFromReader(strings.NewReader(cfgJSONStr)); err != nil { + t.Error(err) + } else if jsnDataDbCfg, err := jsnCfg.DbJsonCfg(STORDB_JSN); err != nil { + t.Error(err) + } else if err = dbcfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(expected, dbcfg) { + t.Errorf("Expected: %+v , recived: %+v", expected, dbcfg) + } +} +func TestStoreDbCfgloadFromJsonCfgPort(t *testing.T) { + var dbcfg StorDbCfg + cfgJSONStr := `{ +"stor_db": { + "db_type": "mongo", + } +}` + expected := StorDbCfg{ + StorDBType: "mongo", + } + if jsnCfg, err := NewCgrJsonCfgFromReader(strings.NewReader(cfgJSONStr)); err != nil { + t.Error(err) + } else if jsnDataDbCfg, err := jsnCfg.DbJsonCfg(STORDB_JSN); err != nil { + t.Error(err) + } else if err = dbcfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(expected, dbcfg) { + t.Errorf("Expected: %+v , recived: %+v", expected, dbcfg) + } + cfgJSONStr = `{ +"stor_db": { + "db_type": "mongo", + "db_port": -1, + } +}` + expected = StorDbCfg{ + StorDBType: "mongo", + StorDBPort: "27017", + } + if jsnCfg, err := NewCgrJsonCfgFromReader(strings.NewReader(cfgJSONStr)); err != nil { + t.Error(err) + } else if jsnDataDbCfg, err := jsnCfg.DbJsonCfg(STORDB_JSN); err != nil { + t.Error(err) + } else if err = dbcfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(expected, dbcfg) { + t.Errorf("Expected: %+v , recived: %+v", expected, dbcfg) + } + cfgJSONStr = `{ +"stor_db": { + "db_type": "*internal", + "db_port": -1, + } +}` + expected = StorDbCfg{ + StorDBType: "internal", + StorDBPort: "internal", + } + if jsnCfg, err := NewCgrJsonCfgFromReader(strings.NewReader(cfgJSONStr)); err != nil { + t.Error(err) + } else if jsnDataDbCfg, err := jsnCfg.DbJsonCfg(STORDB_JSN); err != nil { + t.Error(err) + } else if err = dbcfg.loadFromJsonCfg(jsnDataDbCfg); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(expected, dbcfg) { + t.Errorf("Expected: %+v , recived: %+v", expected, dbcfg) + } +} diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go index 545a11e93..624952ace 100644 --- a/engine/datamanager_it_test.go +++ b/engine/datamanager_it_test.go @@ -60,8 +60,9 @@ func TestDMitMongo(t *testing.T) { if err != nil { t.Fatal(err) } - dataDB, err := NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, - mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, + dataDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().StorDBHost, + mgoITCfg.StorDbCfg().StorDBPort, mgoITCfg.StorDbCfg().StorDBName, + mgoITCfg.StorDbCfg().StorDBUser, mgoITCfg.StorDbCfg().StorDBPass, utils.StorDB, nil, mgoITCfg.CacheCfg()) 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 0fea1bef7..cbedc14c9 100644 --- a/engine/filterindexer_it_test.go +++ b/engine/filterindexer_it_test.go @@ -82,13 +82,14 @@ func TestFilterIndexerITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - mongoDB, err := NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, - mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, + mongoDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().StorDBHost, + mgoITCfg.StorDbCfg().StorDBPort, mgoITCfg.StorDbCfg().StorDBName, + mgoITCfg.StorDbCfg().StorDBUser, mgoITCfg.StorDbCfg().StorDBPass, utils.StorDB, nil, mgoITCfg.CacheCfg()) if err != nil { t.Fatal(err) } - cfgDBName = mgoITCfg.StorDBName + cfgDBName = mgoITCfg.StorDbCfg().StorDBName dataManager = NewDataManager(mongoDB) for _, stest := range sTests { t.Run("TestITMongo", stest) diff --git a/engine/libtest.go b/engine/libtest.go index 715652fef..39d1b8220 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -55,18 +55,20 @@ func InitDataDb(cfg *config.CGRConfig) error { func InitStorDb(cfg *config.CGRConfig) error { x := []string{utils.MYSQL, utils.POSTGRES} - storDb, err := ConfigureLoadStorage(cfg.StorDBType, - cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, - cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, - cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, - cfg.StorDBConnMaxLifetime, cfg.StorDBCDRSIndexes) + storDb, err := ConfigureLoadStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.DBDataEncoding, + cfg.StorDbCfg().StorDBMaxOpenConns, cfg.StorDbCfg().StorDBMaxIdleConns, + cfg.StorDbCfg().StorDBConnMaxLifetime, cfg.StorDbCfg().StorDBCDRSIndexes) if err != nil { return err } - if err := storDb.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDBType)); err != nil { + if err := storDb.Flush(path.Join(cfg.DataFolderPath, "storage", + cfg.StorDbCfg().StorDBType)); err != nil { return err } - if utils.IsSliceMember(x, cfg.StorDBType) { + if utils.IsSliceMember(x, cfg.StorDbCfg().StorDBType) { if err := SetDBVersions(storDb); err != nil { return err } diff --git a/engine/loader_it_test.go b/engine/loader_it_test.go index 3d0d312fe..9cfce2651 100644 --- a/engine/loader_it_test.go +++ b/engine/loader_it_test.go @@ -41,7 +41,7 @@ var tpCsvScenario = flag.String("tp_scenario", "testtp", "Use this scenario fold // Will use 3 different datadbs in order to be able to see differences in data loaded func TestLoaderITConnDataDbs(t *testing.T) { lCfg, _ = config.NewDefaultCGRConfig() - lCfg.StorDBPass = "CGRateS.org" + lCfg.StorDbCfg().StorDBPass = "CGRateS.org" var err error if dataDbCsv, err = ConfigureDataStorage(lCfg.DataDbCfg().DataDbType, lCfg.DataDbCfg().DataDbHost, lCfg.DataDbCfg().DataDbPort, "7", @@ -71,8 +71,11 @@ func TestLoaderITConnDataDbs(t *testing.T) { // Create/reset storage tariff plan tables, used as database connectin establishment also func TestLoaderITCreateStorTpTables(t *testing.T) { - db, err := NewMySQLStorage(lCfg.StorDBHost, lCfg.StorDBPort, lCfg.StorDBName, - lCfg.StorDBUser, lCfg.StorDBPass, lCfg.StorDBMaxOpenConns, lCfg.StorDBMaxIdleConns, lCfg.StorDBConnMaxLifetime) + db, err := NewMySQLStorage(lCfg.StorDbCfg().StorDBHost, + lCfg.StorDbCfg().StorDBPort, lCfg.StorDbCfg().StorDBName, + lCfg.StorDbCfg().StorDBUser, lCfg.StorDbCfg().StorDBPass, + lCfg.StorDbCfg().StorDBMaxOpenConns, lCfg.StorDbCfg().StorDBMaxIdleConns, + lCfg.StorDbCfg().StorDBConnMaxLifetime) 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 bd63f9799..f6050da85 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -114,12 +114,13 @@ func TestOnStorITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, - mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, + if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDbCfg().StorDBHost, + mgoITCfg.StorDbCfg().StorDBPort, mgoITCfg.StorDbCfg().StorDBName, + mgoITCfg.StorDbCfg().StorDBUser, mgoITCfg.StorDbCfg().StorDBPass, utils.StorDB, nil, mgoITCfg.CacheCfg()); err != nil { t.Fatal(err) } - onStorCfg = mgoITCfg.StorDBName + onStorCfg = mgoITCfg.StorDbCfg().StorDBName onStor = NewDataManager(mgoITdb) for _, stest := range sTestsOnStorIT { t.Run("TestOnStorITMongo", stest) diff --git a/engine/storage_cdrs_it_test.go b/engine/storage_cdrs_it_test.go index 4c74b9704..4030cf8f7 100644 --- a/engine/storage_cdrs_it_test.go +++ b/engine/storage_cdrs_it_test.go @@ -84,8 +84,12 @@ func testSetCDR(cfg *config.CGRConfig) error { if err := InitStorDb(cfg); err != nil { return err } - cdrStorage, err := ConfigureCdrStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, - cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime, cfg.StorDBCDRSIndexes) + cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.StorDbCfg().StorDBMaxOpenConns, + cfg.StorDbCfg().StorDBMaxIdleConns, cfg.StorDbCfg().StorDBConnMaxLifetime, + cfg.StorDbCfg().StorDBCDRSIndexes) if err != nil { return err } @@ -186,8 +190,12 @@ func testSMCosts(cfg *config.CGRConfig) error { if err := InitStorDb(cfg); err != nil { return fmt.Errorf("testSMCosts #1 err: %v", err) } - cdrStorage, err := ConfigureCdrStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, - cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime, cfg.StorDBCDRSIndexes) + cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.StorDbCfg().StorDBMaxOpenConns, + cfg.StorDbCfg().StorDBMaxIdleConns, cfg.StorDbCfg().StorDBConnMaxLifetime, + cfg.StorDbCfg().StorDBCDRSIndexes) if err != nil { return fmt.Errorf("testSMCosts #2 err: %v", err) } @@ -195,7 +203,7 @@ func testSMCosts(cfg *config.CGRConfig) error { Direction: utils.OUT, Destination: "+4986517174963", Timespans: []*TimeSpan{ - &TimeSpan{ + { TimeStart: time.Date(2015, 12, 28, 8, 53, 0, 0, time.UTC), TimeEnd: time.Date(2015, 12, 28, 8, 54, 40, 0, time.UTC), DurationIndex: 0, @@ -235,8 +243,12 @@ func testGetCDRs(cfg *config.CGRConfig) error { if err := InitStorDb(cfg); err != nil { return fmt.Errorf("testGetCDRs #1: %v", err) } - cdrStorage, err := ConfigureCdrStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, - cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime, cfg.StorDBCDRSIndexes) + cdrStorage, err := ConfigureCdrStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.StorDbCfg().StorDBMaxOpenConns, + cfg.StorDbCfg().StorDBMaxIdleConns, cfg.StorDbCfg().StorDBConnMaxLifetime, + cfg.StorDbCfg().StorDBCDRSIndexes) if err != nil { return fmt.Errorf("testGetCDRs #2: %v", err) } @@ -245,7 +257,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { return fmt.Errorf("testGetCDRs #3: %v", err) } cdrs := []*CDR{ - &CDR{ + { CGRID: utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()), RunID: utils.MetaRaw, OriginHost: "127.0.0.1", @@ -265,7 +277,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "", Cost: -1, }, - &CDR{ + { CGRID: utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()), RunID: utils.META_DEFAULT, OriginHost: "127.0.0.1", @@ -285,7 +297,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "testGetCDRs", Cost: 0.17, }, - &CDR{ + { CGRID: utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()), RunID: "run2", OriginHost: "127.0.0.1", @@ -305,7 +317,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "testGetCDRs", Cost: 0.17, }, - &CDR{ + { CGRID: utils.Sha1("testevent2", time.Date(2015, 12, 29, 12, 58, 0, 0, time.UTC).String()), RunID: utils.META_DEFAULT, OriginHost: "192.168.1.12", @@ -325,7 +337,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "rater1", Cost: 0, }, - &CDR{ + { CGRID: utils.Sha1("testevent3", time.Date(2015, 12, 28, 12, 58, 0, 0, time.UTC).String()), RunID: utils.MetaRaw, OriginHost: "192.168.1.13", @@ -345,7 +357,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "", Cost: -1, }, - &CDR{ + { CGRID: utils.Sha1("testevent3", time.Date(2015, 12, 28, 12, 58, 0, 0, time.UTC).String()), RunID: utils.META_DEFAULT, OriginHost: "192.168.1.13", @@ -366,7 +378,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { Cost: -1, ExtraInfo: "AccountNotFound", }, - &CDR{ + { CGRID: utils.Sha1("testevent4", time.Date(2015, 12, 14, 14, 52, 0, 0, time.UTC).String()), RunID: utils.MetaRaw, OriginHost: "192.168.1.14", @@ -386,7 +398,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "", Cost: -1, }, - &CDR{ + { CGRID: utils.Sha1("testevent4", time.Date(2015, 12, 14, 14, 52, 0, 0, time.UTC).String()), RunID: utils.META_DEFAULT, OriginHost: "192.168.1.14", @@ -406,7 +418,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "testSetCDRs", Cost: 1.205, }, - &CDR{ + { CGRID: utils.Sha1("testevent5", time.Date(2015, 12, 15, 18, 22, 0, 0, time.UTC).String()), RunID: utils.MetaRaw, OriginHost: "127.0.0.1", @@ -426,7 +438,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { CostSource: "", Cost: -1, }, - &CDR{ + { CGRID: utils.Sha1("testevent5", time.Date(2015, 12, 15, 18, 22, 0, 0, time.UTC).String()), RunID: utils.META_DEFAULT, OriginHost: "127.0.0.1", @@ -757,7 +769,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "OrderID;desc"}, false); err != nil { return fmt.Errorf("testGetCDRs #95, err: %v", err) } else { - for i, _ := range CDRs { + for i := range CDRs { if i+1 > len(CDRs)-1 { break } @@ -770,7 +782,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "OrderID"}, false); err != nil { return fmt.Errorf("testGetCDRs #95, err: %v", err) } else { - for i, _ := range CDRs { + for i := range CDRs { if i+1 > len(CDRs)-1 { break } @@ -783,7 +795,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "Cost;desc"}, false); err != nil { return fmt.Errorf("testGetCDRs #95, err: %v", err) } else { - for i, _ := range CDRs { + for i := range CDRs { if i+1 > len(CDRs)-1 { break } @@ -796,7 +808,7 @@ func testGetCDRs(cfg *config.CGRConfig) error { if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "Cost"}, false); err != nil { return fmt.Errorf("testGetCDRs #95, err: %v", err) } else { - for i, _ := range CDRs { + for i := range CDRs { if i+1 > len(CDRs)-1 { break } diff --git a/engine/stordb_it_test.go b/engine/stordb_it_test.go index b78e7fa6e..cf7438c3d 100644 --- a/engine/stordb_it_test.go +++ b/engine/stordb_it_test.go @@ -66,8 +66,11 @@ func TestStorDBitMySQL(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "storage", "mysql")); err != nil { t.Fatal(err) } - if storDB, err = NewMySQLStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, - cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime); err != nil { + if storDB, err = NewMySQLStorage(cfg.StorDbCfg().StorDBHost, + cfg.StorDbCfg().StorDBPort, cfg.StorDbCfg().StorDBName, + cfg.StorDbCfg().StorDBUser, cfg.StorDbCfg().StorDBPass, + cfg.StorDbCfg().StorDBMaxOpenConns, cfg.StorDbCfg().StorDBMaxIdleConns, + cfg.StorDbCfg().StorDBConnMaxLifetime); err != nil { t.Fatal(err) } storDB2ndDBname = "mysql" @@ -83,8 +86,11 @@ func TestStorDBitPostgresSQL(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "storage", "postgres")); err != nil { t.Fatal(err) } - if storDB, err = NewPostgresStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, - cfg.StorDBUser, cfg.StorDBPass, cfg.StorDBMaxOpenConns, cfg.StorDBMaxIdleConns, cfg.StorDBConnMaxLifetime); err != nil { + if storDB, err = NewPostgresStorage(cfg.StorDbCfg().StorDBHost, + cfg.StorDbCfg().StorDBPort, cfg.StorDbCfg().StorDBName, + cfg.StorDbCfg().StorDBUser, cfg.StorDbCfg().StorDBPass, + cfg.StorDbCfg().StorDBMaxOpenConns, cfg.StorDbCfg().StorDBMaxIdleConns, + cfg.StorDbCfg().StorDBConnMaxLifetime); err != nil { t.Fatal(err) } storDB2ndDBname = "postgres" @@ -100,8 +106,10 @@ func TestStorDBitMongo(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "storage", "mongo")); err != nil { t.Fatal(err) } - if storDB, err = NewMongoStorage(cfg.StorDBHost, cfg.StorDBPort, cfg.StorDBName, - cfg.StorDBUser, cfg.StorDBPass, utils.StorDB, cfg.StorDBCDRSIndexes, nil); err != nil { + if storDB, err = NewMongoStorage(cfg.StorDbCfg().StorDBHost, + cfg.StorDbCfg().StorDBPort, cfg.StorDbCfg().StorDBName, + cfg.StorDbCfg().StorDBUser, cfg.StorDbCfg().StorDBPass, + utils.StorDB, cfg.StorDbCfg().StorDBCDRSIndexes, nil); err != nil { t.Fatal(err) } storDB2ndDBname = "todo" @@ -143,7 +151,7 @@ func testStorDBitCRUDTpTimings(t *testing.T) { } // WRITE var snd = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "testTPid", ID: "testTag1", Years: "*any", @@ -152,7 +160,7 @@ func testStorDBitCRUDTpTimings(t *testing.T) { WeekDays: "1;2;3;4;5", Time: "01:00:00", }, - &utils.ApierTPTiming{ + { TPid: "testTPid", ID: "testTag2", Years: "*any", @@ -204,12 +212,12 @@ func testStorDBitCRUDTpDestinations(t *testing.T) { } // WRITE snd := []*utils.TPDestination{ - &utils.TPDestination{ + { TPid: "testTPid", ID: "testTag1", Prefixes: []string{`0256`, `0257`, `0723`, `+49`}, }, - &utils.TPDestination{ + { TPid: "testTPid", ID: "testTag2", Prefixes: []string{`0256`, `0257`, `0723`, `+49`}, @@ -227,7 +235,7 @@ func testStorDBitCRUDTpDestinations(t *testing.T) { prfs[prf] = true } pfrOk := true - for i, _ := range rcv[0].Prefixes { + for i := range rcv[0].Prefixes { found1, _ := prfs[rcv[0].Prefixes[i]] found2, _ := prfs[rcv[1].Prefixes[i]] if !found1 && !found2 { @@ -257,7 +265,7 @@ func testStorDBitCRUDTpDestinations(t *testing.T) { prfs[prf] = true } pfrOk := true - for i, _ := range rcv[0].Prefixes { + for i := range rcv[0].Prefixes { found1, _ := prfs[rcv[0].Prefixes[i]] found2, _ := prfs[rcv[1].Prefixes[i]] if !found1 && !found2 { @@ -289,18 +297,18 @@ func testStorDBitCRUDTpRates(t *testing.T) { } // WRITE var snd = []*utils.TPRate{ - &utils.TPRate{ + { TPid: "testTPid", ID: "1", RateSlots: []*utils.RateSlot{ - &utils.RateSlot{ + { ConnectFee: 0.0, Rate: 0.0, RateUnit: "60s", RateIncrement: "60s", GroupIntervalStart: "0s", }, - &utils.RateSlot{ + { ConnectFee: 0.0, Rate: 0.0, RateUnit: "60s", @@ -309,11 +317,11 @@ func testStorDBitCRUDTpRates(t *testing.T) { }, }, }, - &utils.TPRate{ + { TPid: "testTPid", ID: "2", RateSlots: []*utils.RateSlot{ - &utils.RateSlot{ + { ConnectFee: 0.0, Rate: 0.0, RateUnit: "60s", @@ -370,11 +378,11 @@ func testStorDBitCRUDTpDestinationRates(t *testing.T) { } // WRITE var snd = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: "testTPid", ID: "1", DestinationRates: []*utils.DestinationRate{ - &utils.DestinationRate{ + { DestinationId: "GERMANY", RateId: "RT_1CENT", RoundingMethod: "*up", @@ -384,11 +392,11 @@ func testStorDBitCRUDTpDestinationRates(t *testing.T) { }, }, }, - &utils.TPDestinationRate{ + { TPid: "testTPid", ID: "2", DestinationRates: []*utils.DestinationRate{ - &utils.DestinationRate{ + { DestinationId: "GERMANY", RateId: "RT_1CENT", RoundingMethod: "*up", @@ -442,22 +450,22 @@ func testStorDBitCRUDTpRatingPlans(t *testing.T) { } // WRITE var snd = []*utils.TPRatingPlan{ - &utils.TPRatingPlan{ + { TPid: "testTPid", ID: "1", RatingPlanBindings: []*utils.TPRatingPlanBinding{ - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "1", TimingId: "ALWAYS", Weight: 0.0, }, }, }, - &utils.TPRatingPlan{ + { TPid: "testTPid", ID: "2", RatingPlanBindings: []*utils.TPRatingPlanBinding{ - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "2", TimingId: "ALWAYS", Weight: 2, @@ -510,7 +518,7 @@ func testStorDBitCRUDTpRatingProfiles(t *testing.T) { } // WRITE var snd = []*utils.TPRatingProfile{ - &utils.TPRatingProfile{ + { TPid: "testTPid", LoadId: "TEST_LOADID", Direction: "*out", @@ -518,7 +526,7 @@ func testStorDBitCRUDTpRatingProfiles(t *testing.T) { Category: "call", Subject: "test", RatingPlanActivations: []*utils.TPRatingActivation{ - &utils.TPRatingActivation{ + { ActivationTime: "2014-07-29T15:00:00Z", RatingPlanId: "test", FallbackSubjects: "", @@ -526,7 +534,7 @@ func testStorDBitCRUDTpRatingProfiles(t *testing.T) { }, }, }, - &utils.TPRatingProfile{ + { TPid: "testTPid", LoadId: "TEST_LOADID2", Direction: "*out", @@ -534,7 +542,7 @@ func testStorDBitCRUDTpRatingProfiles(t *testing.T) { Category: "call", Subject: "test", RatingPlanActivations: []*utils.TPRatingActivation{ - &utils.TPRatingActivation{ + { ActivationTime: "2014-07-29T15:00:00Z", RatingPlanId: "test", FallbackSubjects: "", @@ -585,22 +593,22 @@ func testStorDBitCRUDTpSharedGroups(t *testing.T) { } // WRITE var snd = []*utils.TPSharedGroups{ - &utils.TPSharedGroups{ + { TPid: "testTPid", ID: "1", SharedGroups: []*utils.TPSharedGroup{ - &utils.TPSharedGroup{ + { Account: "test", Strategy: "*lowest_cost", RatingSubject: "test", }, }, }, - &utils.TPSharedGroups{ + { TPid: "testTPid", ID: "2", SharedGroups: []*utils.TPSharedGroup{ - &utils.TPSharedGroup{ + { Account: "test", Strategy: "*lowest_cost", RatingSubject: "test", @@ -650,11 +658,11 @@ func testStorDBitCRUDTpActions(t *testing.T) { } // WRITE var snd = []*utils.TPActions{ - &utils.TPActions{ + { TPid: "testTPid", ID: "1", Actions: []*utils.TPAction{ - &utils.TPAction{ + { Identifier: "", BalanceId: "", BalanceUuid: "", @@ -676,11 +684,11 @@ func testStorDBitCRUDTpActions(t *testing.T) { }, }, }, - &utils.TPActions{ + { TPid: "testTPid", ID: "2", Actions: []*utils.TPAction{ - &utils.TPAction{ + { Identifier: "", BalanceId: "", BalanceUuid: "", @@ -745,22 +753,22 @@ func testStorDBitCRUDTpActionPlans(t *testing.T) { } // WRITE var snd = []*utils.TPActionPlan{ - &utils.TPActionPlan{ + { TPid: "testTPid", ID: "1", ActionPlan: []*utils.TPActionTiming{ - &utils.TPActionTiming{ + { ActionsId: "1", TimingId: "1", Weight: 1, }, }, }, - &utils.TPActionPlan{ + { TPid: "testTPid", ID: "2", ActionPlan: []*utils.TPActionTiming{ - &utils.TPActionTiming{ + { ActionsId: "1", TimingId: "1", Weight: 1, @@ -810,11 +818,11 @@ func testStorDBitCRUDTpActionTriggers(t *testing.T) { } // WRITE var snd = []*utils.TPActionTriggers{ - &utils.TPActionTriggers{ + { TPid: "testTPid", ID: "1", ActionTriggers: []*utils.TPActionTrigger{ - &utils.TPActionTrigger{ + { Id: "1", UniqueID: "", ThresholdType: "1", @@ -841,11 +849,11 @@ func testStorDBitCRUDTpActionTriggers(t *testing.T) { }, }, }, - &utils.TPActionTriggers{ + { TPid: "testTPid", ID: "2", ActionTriggers: []*utils.TPActionTrigger{ - &utils.TPActionTrigger{ + { Id: "2", UniqueID: "", ThresholdType: "1", @@ -918,7 +926,7 @@ func testStorDBitCRUDTpAccountActions(t *testing.T) { } // WRITE var snd = []*utils.TPAccountActions{ - &utils.TPAccountActions{ + { TPid: "testTPid", LoadId: "TEST_LOADID", Tenant: "cgrates.org", @@ -928,7 +936,7 @@ func testStorDBitCRUDTpAccountActions(t *testing.T) { AllowNegative: true, Disabled: true, }, - &utils.TPAccountActions{ + { TPid: "testTPid", LoadId: "TEST_LOADID", Tenant: "cgrates.org", @@ -984,7 +992,7 @@ func testStorDBitCRUDTpLCRs(t *testing.T) { Account: "", Subject: "", Rules: []*utils.TPLcrRule{ - &utils.TPLcrRule{ + { DestinationId: "", RpCategory: "", Strategy: "", @@ -999,7 +1007,7 @@ func testStorDBitCRUDTpLCRs(t *testing.T) { } // WRITE var snd = []*utils.TPLcrRules{ - &utils.TPLcrRules{ + { TPid: "testTPid", Direction: "*in", Tenant: "cgrates.org", @@ -1007,7 +1015,7 @@ func testStorDBitCRUDTpLCRs(t *testing.T) { Account: "1000", Subject: "test", Rules: []*utils.TPLcrRule{ - &utils.TPLcrRule{ + { DestinationId: "", RpCategory: "LCR_STANDARD", Strategy: "*lowest_cost", @@ -1017,7 +1025,7 @@ func testStorDBitCRUDTpLCRs(t *testing.T) { }, }, }, - &utils.TPLcrRules{ + { TPid: "testTPid", Direction: "*out", Tenant: "cgrates.org", @@ -1025,7 +1033,7 @@ func testStorDBitCRUDTpLCRs(t *testing.T) { Account: "1000", Subject: "test", Rules: []*utils.TPLcrRule{ - &utils.TPLcrRule{ + { DestinationId: "", RpCategory: "LCR_STANDARD", Strategy: "*lowest_cost", @@ -1081,7 +1089,7 @@ func testStorDBitCRUDTpDerivedChargers(t *testing.T) { } // WRITE var snd = []*utils.TPDerivedChargers{ - &utils.TPDerivedChargers{ + { TPid: "testTPid", LoadId: "TEST_LOADID", Direction: "*out", @@ -1091,7 +1099,7 @@ func testStorDBitCRUDTpDerivedChargers(t *testing.T) { Subject: "test", DestinationIds: "", DerivedChargers: []*utils.TPDerivedCharger{ - &utils.TPDerivedCharger{ + { RunId: "default", RunFilters: "test", ReqTypeField: "test", @@ -1112,7 +1120,7 @@ func testStorDBitCRUDTpDerivedChargers(t *testing.T) { }, }, }, - &utils.TPDerivedChargers{ + { TPid: "testTPid", LoadId: "TEST_LOADID2", Direction: "*out", @@ -1122,7 +1130,7 @@ func testStorDBitCRUDTpDerivedChargers(t *testing.T) { Subject: "test", DestinationIds: "", DerivedChargers: []*utils.TPDerivedCharger{ - &utils.TPDerivedCharger{ + { RunId: "default", RunFilters: "test", ReqTypeField: "test", @@ -1186,11 +1194,11 @@ func testStorDBitCRUDTpCdrStats(t *testing.T) { } // WRITE var snd = []*utils.TPCdrStats{ - &utils.TPCdrStats{ + { TPid: "testTPid", ID: "1", CdrStats: []*utils.TPCdrStat{ - &utils.TPCdrStat{ + { QueueLength: "0", TimeWindow: "10m", SaveInterval: "3s", @@ -1218,11 +1226,11 @@ func testStorDBitCRUDTpCdrStats(t *testing.T) { }, }, }, - &utils.TPCdrStats{ + { TPid: "testTPid", ID: "2", CdrStats: []*utils.TPCdrStat{ - &utils.TPCdrStat{ + { QueueLength: "0", TimeWindow: "10m", SaveInterval: "3s", @@ -1296,27 +1304,27 @@ func testStorDBitCRUDTpUsers(t *testing.T) { } // WRITE var snd = []*utils.TPUsers{ - &utils.TPUsers{ + { TPid: "testTPid", Tenant: "cgrates.org", Masked: true, UserName: "1001", Weight: 0.1, Profile: []*utils.TPUserProfile{ - &utils.TPUserProfile{ + { AttrName: "Account", AttrValue: "1001", }, }, }, - &utils.TPUsers{ + { TPid: "testTPid", Tenant: "cgrates.org", Masked: true, UserName: "1002", Weight: 0.1, Profile: []*utils.TPUserProfile{ - &utils.TPUserProfile{ + { AttrName: "Account", AttrValue: "1001", }, @@ -1368,7 +1376,7 @@ func testStorDBitCRUDTpAliases(t *testing.T) { } // WRITE var snd = []*utils.TPAliases{ - &utils.TPAliases{ + { TPid: "testTPid", Direction: "*out", Tenant: "cgrates.org", @@ -1377,7 +1385,7 @@ func testStorDBitCRUDTpAliases(t *testing.T) { Subject: "1006", Context: "*rating", Values: []*utils.TPAliasValue{ - &utils.TPAliasValue{ + { DestinationId: "*any", Target: "Subject", Original: "1006", @@ -1386,7 +1394,7 @@ func testStorDBitCRUDTpAliases(t *testing.T) { }, }, }, - &utils.TPAliases{ + { TPid: "testTPid", Direction: "*out", Tenant: "cgrates.org", @@ -1395,7 +1403,7 @@ func testStorDBitCRUDTpAliases(t *testing.T) { Subject: "1006", Context: "*rating", Values: []*utils.TPAliasValue{ - &utils.TPAliasValue{ + { DestinationId: "*any", Target: "Subject", Original: "1006", @@ -1447,7 +1455,7 @@ func testStorDBitCRUDTpResources(t *testing.T) { } //WRITE var snd = []*utils.TPResource{ - &utils.TPResource{ + { TPid: "testTPid", ID: "testTag1", Weight: 0.0, @@ -1457,7 +1465,7 @@ func testStorDBitCRUDTpResources(t *testing.T) { Blocker: true, Stored: true, }, - &utils.TPResource{ + { TPid: "testTPid", ID: "testTag2", ActivationInterval: &utils.TPActivationInterval{ActivationTime: "test"}, @@ -1542,7 +1550,7 @@ func testStorDBitCRUDTpStats(t *testing.T) { } //WRITE eTPs := []*utils.TPStats{ - &utils.TPStats{ + { TPid: "TEST_TPID", Tenant: "Test", ID: "Stats1", @@ -1553,15 +1561,15 @@ func testStorDBitCRUDTpStats(t *testing.T) { QueueLength: 100, TTL: "1s", Metrics: []*utils.MetricWithParams{ - &utils.MetricWithParams{ + { MetricID: "*asr", Parameters: "", }, - &utils.MetricWithParams{ + { MetricID: "*acd", Parameters: "", }, - &utils.MetricWithParams{ + { MetricID: "*acc", Parameters: "", }, @@ -1635,7 +1643,7 @@ func testStorDBitCRUDCDRs(t *testing.T) { } // WRITE var snd = []*CDR{ - &CDR{ + { CGRID: "88ed9c38005f07576a1e1af293063833b60edcc6", RunID: "1", OrderID: 0, @@ -1645,7 +1653,7 @@ func testStorDBitCRUDCDRs(t *testing.T) { CostDetails: NewBareEventCost(), ExtraFields: map[string]string{"Service-Context-Id": "voice@huawei.com"}, }, - &CDR{ + { CGRID: "88ed9c38005f07576a1e1af293063833b60edcc2", RunID: "2", OrderID: 0, @@ -1769,14 +1777,14 @@ func testStorDBitCRUDSMCosts(t *testing.T) { } // WRITE var snd = []*SMCost{ - &SMCost{ + { CGRID: "88ed9c38005f07576a1e1af293063833b60edcc6", RunID: "1", OriginHost: "host2", OriginID: "2", CostDetails: NewBareEventCost(), }, - &SMCost{ + { CGRID: "88ed9c38005f07576a1e1af293063833b60edcc2", RunID: "2", OriginHost: "host2", @@ -1822,7 +1830,7 @@ func testStorDBitCRUDSMCosts(t *testing.T) { } func testStorDBitFlush(t *testing.T) { - if err := storDB.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDBType)); err != nil { + if err := storDB.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } diff --git a/engine/versions_it_test.go b/engine/versions_it_test.go index f4c332e79..2a950d392 100644 --- a/engine/versions_it_test.go +++ b/engine/versions_it_test.go @@ -52,10 +52,14 @@ func TestVersionsITMongo(t *testing.T) { cfg.CacheCfg(), ""); err != nil { log.Fatal(err) } - storageDb, err = ConfigureStorStorage(cfg.StorDBType, cfg.StorDBHost, - cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) + storageDb, err = ConfigureStorStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.DBDataEncoding, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -78,10 +82,14 @@ func TestVersionsITRedisMYSQL(t *testing.T) { log.Fatal(err) } - storageDb, err = ConfigureStorStorage(cfg.StorDBType, cfg.StorDBHost, cfg.StorDBPort, - cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) + storageDb, err = ConfigureStorStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.DBDataEncoding, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -103,10 +111,14 @@ func TestVersionsITRedisPostgres(t *testing.T) { if err != nil { log.Fatal(err) } - storageDb, err = ConfigureStorStorage(cfg.StorDBType, cfg.StorDBHost, - cfg.StorDBPort, cfg.StorDBName, cfg.StorDBUser, cfg.StorDBPass, cfg.DBDataEncoding, - config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) + storageDb, err = ConfigureStorStorage(cfg.StorDbCfg().StorDBType, + cfg.StorDbCfg().StorDBHost, cfg.StorDbCfg().StorDBPort, + cfg.StorDbCfg().StorDBName, cfg.StorDbCfg().StorDBUser, + cfg.StorDbCfg().StorDBPass, cfg.DBDataEncoding, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -122,7 +134,7 @@ func testVersionsFlush(t *testing.T) { if err != nil { t.Error("Error when flushing Mongo ", err.Error()) } - if err := storageDb.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDBType)); err != nil { + if err := storageDb.Flush(path.Join(cfg.DataFolderPath, "storage", cfg.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 69f063beb..57ef5ded9 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -80,17 +80,24 @@ func testAcc2ITConnect(t *testing.T) { t.Error(err) } - storDBIn, err := NewMigratorStorDB(acc2CfgIn.StorDBType, - acc2CfgIn.StorDBHost, acc2CfgIn.StorDBPort, acc2CfgIn.StorDBName, - acc2CfgIn.StorDBUser, acc2CfgIn.StorDBPass, acc2CfgIn.StorDBMaxOpenConns, - acc2CfgIn.StorDBMaxIdleConns, acc2CfgIn.StorDBConnMaxLifetime, acc2CfgIn.StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(acc2CfgIn.StorDbCfg().StorDBType, + acc2CfgIn.StorDbCfg().StorDBHost, acc2CfgIn.StorDbCfg().StorDBPort, + acc2CfgIn.StorDbCfg().StorDBName, acc2CfgIn.StorDbCfg().StorDBUser, + acc2CfgIn.StorDbCfg().StorDBPass, + acc2CfgIn.StorDbCfg().StorDBMaxOpenConns, + acc2CfgIn.StorDbCfg().StorDBMaxIdleConns, + acc2CfgIn.StorDbCfg().StorDBConnMaxLifetime, + acc2CfgIn.StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } - storDBOut, err := NewMigratorStorDB(acc2CfgOut.StorDBType, - acc2CfgOut.StorDBHost, acc2CfgOut.StorDBPort, acc2CfgOut.StorDBName, - acc2CfgOut.StorDBUser, acc2CfgOut.StorDBPass, acc2CfgOut.StorDBMaxOpenConns, - acc2CfgOut.StorDBMaxIdleConns, acc2CfgOut.StorDBConnMaxLifetime, acc2CfgOut.StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(acc2CfgOut.StorDbCfg().StorDBType, + acc2CfgOut.StorDbCfg().StorDBHost, acc2CfgOut.StorDbCfg().StorDBPort, + acc2CfgOut.StorDbCfg().StorDBName, acc2CfgOut.StorDbCfg().StorDBUser, + acc2CfgOut.StorDbCfg().StorDBPass, acc2CfgOut.StorDbCfg().StorDBMaxOpenConns, + acc2CfgOut.StorDbCfg().StorDBMaxIdleConns, + acc2CfgOut.StorDbCfg().StorDBConnMaxLifetime, + acc2CfgOut.StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 373224eed..9590287c8 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -70,23 +70,25 @@ func TestCdrITMySql(t *testing.T) { } func testCdrITConnect(t *testing.T) { - storDBIn, err := NewMigratorStorDB(cdrCfgIn.StorDBType, cdrCfgIn.StorDBHost, - cdrCfgIn.StorDBPort, cdrCfgIn.StorDBName, - cdrCfgIn.StorDBUser, cdrCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(cdrCfgIn.StorDbCfg().StorDBType, + cdrCfgIn.StorDbCfg().StorDBHost, cdrCfgIn.StorDbCfg().StorDBPort, + cdrCfgIn.StorDbCfg().StorDBName, cdrCfgIn.StorDbCfg().StorDBUser, + cdrCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } - storDBOut, err := NewMigratorStorDB(cdrCfgIn.StorDBType, - cdrCfgIn.StorDBHost, cdrCfgIn.StorDBPort, cdrCfgIn.StorDBName, - cdrCfgIn.StorDBUser, cdrCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(cdrCfgIn.StorDbCfg().StorDBType, + cdrCfgIn.StorDbCfg().StorDBHost, cdrCfgIn.StorDbCfg().StorDBPort, + cdrCfgIn.StorDbCfg().StorDBName, cdrCfgIn.StorDbCfg().StorDBUser, + cdrCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } @@ -101,7 +103,7 @@ func testCdrITConnect(t *testing.T) { func testCdrITFlush(t *testing.T) { if err := cdrMigrator.storDBOut.StorDB().Flush( - path.Join(cdrCfgIn.DataFolderPath, "storage", cdrCfgIn.StorDBType)); err != nil { + path.Join(cdrCfgIn.DataFolderPath, "storage", cdrCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } @@ -111,7 +113,7 @@ func testCdrITMigrateAndMove(t *testing.T) { Direction: utils.OUT, Destination: "0723045326", Timespans: []*engine.TimeSpan{ - &engine.TimeSpan{ + { TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 24, 10, 48, 10, 0, time.UTC), DurationIndex: 0, diff --git a/migrator/sessions_costs_it_test.go b/migrator/sessions_costs_it_test.go index 9f93ebde8..1646260bb 100755 --- a/migrator/sessions_costs_it_test.go +++ b/migrator/sessions_costs_it_test.go @@ -79,23 +79,25 @@ func TestSessionCostITMySql(t *testing.T) { } func testSessionCostITConnect(t *testing.T) { - storDBIn, err := NewMigratorStorDB(sCostCfgIn.StorDBType, sCostCfgIn.StorDBHost, - sCostCfgIn.StorDBPort, sCostCfgIn.StorDBName, - sCostCfgIn.StorDBUser, sCostCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(sCostCfgIn.StorDbCfg().StorDBType, + sCostCfgIn.StorDbCfg().StorDBHost, sCostCfgIn.StorDbCfg().StorDBPort, + sCostCfgIn.StorDbCfg().StorDBName, sCostCfgIn.StorDbCfg().StorDBUser, + sCostCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } - storDBOut, err := NewMigratorStorDB(sCostCfgOut.StorDBType, - sCostCfgOut.StorDBHost, sCostCfgOut.StorDBPort, sCostCfgOut.StorDBName, - sCostCfgOut.StorDBUser, sCostCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(sCostCfgOut.StorDbCfg().StorDBType, + sCostCfgOut.StorDbCfg().StorDBHost, sCostCfgOut.StorDbCfg().StorDBPort, + sCostCfgOut.StorDbCfg().StorDBName, sCostCfgOut.StorDbCfg().StorDBUser, + sCostCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { t.Error(err) } @@ -138,7 +140,7 @@ func testSessionCostITRename(t *testing.T) { func testSessionCostITFlush(t *testing.T) { if err := sCostMigrator.storDBOut.StorDB().Flush( - path.Join(sCostCfgIn.DataFolderPath, "storage", sCostCfgIn.StorDBType)); err != nil { + path.Join(sCostCfgIn.DataFolderPath, "storage", sCostCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } @@ -149,7 +151,7 @@ func testSessionCostITMigrate(t *testing.T) { Cost: 1.23, Destination: "0723045326", Timespans: []*engine.TimeSpan{ - &engine.TimeSpan{ + { TimeStart: time.Date(2013, 9, 24, 10, 48, 0, 0, time.UTC), TimeEnd: time.Date(2013, 9, 24, 10, 48, 10, 0, time.UTC), DurationIndex: 0, diff --git a/migrator/tp_account_actions_it_test.go b/migrator/tp_account_actions_it_test.go index a5be5d3af..72620b99c 100644 --- a/migrator/tp_account_actions_it_test.go +++ b/migrator/tp_account_actions_it_test.go @@ -66,23 +66,25 @@ func testTpAccActITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpAccActCfgIn.StorDBType, tpAccActCfgIn.StorDBHost, - tpAccActCfgIn.StorDBPort, tpAccActCfgIn.StorDBName, - tpAccActCfgIn.StorDBUser, tpAccActCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpAccActCfgIn.StorDbCfg().StorDBType, + tpAccActCfgIn.StorDbCfg().StorDBHost, tpAccActCfgIn.StorDbCfg().StorDBPort, + tpAccActCfgIn.StorDbCfg().StorDBName, tpAccActCfgIn.StorDbCfg().StorDBUser, + tpAccActCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpAccActCfgOut.StorDBType, - tpAccActCfgOut.StorDBHost, tpAccActCfgOut.StorDBPort, tpAccActCfgOut.StorDBName, - tpAccActCfgOut.StorDBUser, tpAccActCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpAccActCfgOut.StorDbCfg().StorDBType, + tpAccActCfgOut.StorDbCfg().StorDBHost, tpAccActCfgOut.StorDbCfg().StorDBPort, + tpAccActCfgOut.StorDbCfg().StorDBName, tpAccActCfgOut.StorDbCfg().StorDBUser, + tpAccActCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpAccActITConnect(t *testing.T) { func testTpAccActITFlush(t *testing.T) { if err := tpAccActMigrator.storDBIn.StorDB().Flush( - path.Join(tpAccActCfgIn.DataFolderPath, "storage", tpAccActCfgIn.StorDBType)); err != nil { + path.Join(tpAccActCfgIn.DataFolderPath, "storage", tpAccActCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpAccActMigrator.storDBOut.StorDB().Flush( - path.Join(tpAccActCfgOut.DataFolderPath, "storage", tpAccActCfgOut.StorDBType)); err != nil { + path.Join(tpAccActCfgOut.DataFolderPath, "storage", tpAccActCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpAccActITPopulate(t *testing.T) { tpAccountActions = []*utils.TPAccountActions{ - &utils.TPAccountActions{ + { TPid: "TPAcc", LoadId: "ID", Tenant: "cgrates.org", diff --git a/migrator/tp_action_plans_it_test.go b/migrator/tp_action_plans_it_test.go index 870c6401a..a9275f4d3 100644 --- a/migrator/tp_action_plans_it_test.go +++ b/migrator/tp_action_plans_it_test.go @@ -66,23 +66,25 @@ func testTpActPlnITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpActPlnCfgIn.StorDBType, tpActPlnCfgIn.StorDBHost, - tpActPlnCfgIn.StorDBPort, tpActPlnCfgIn.StorDBName, - tpActPlnCfgIn.StorDBUser, tpActPlnCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpActPlnCfgIn.StorDbCfg().StorDBType, + tpActPlnCfgIn.StorDbCfg().StorDBHost, tpActPlnCfgIn.StorDbCfg().StorDBPort, + tpActPlnCfgIn.StorDbCfg().StorDBName, tpActPlnCfgIn.StorDbCfg().StorDBUser, + tpActPlnCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpActPlnCfgOut.StorDBType, - tpActPlnCfgOut.StorDBHost, tpActPlnCfgOut.StorDBPort, tpActPlnCfgOut.StorDBName, - tpActPlnCfgOut.StorDBUser, tpActPlnCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpActPlnCfgOut.StorDbCfg().StorDBType, + tpActPlnCfgOut.StorDbCfg().StorDBHost, tpActPlnCfgOut.StorDbCfg().StorDBPort, + tpActPlnCfgOut.StorDbCfg().StorDBName, tpActPlnCfgOut.StorDbCfg().StorDBUser, + tpActPlnCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,28 +96,28 @@ func testTpActPlnITConnect(t *testing.T) { func testTpActPlnITFlush(t *testing.T) { if err := tpActPlnMigrator.storDBIn.StorDB().Flush( - path.Join(tpActPlnCfgIn.DataFolderPath, "storage", tpActPlnCfgIn.StorDBType)); err != nil { + path.Join(tpActPlnCfgIn.DataFolderPath, "storage", tpActPlnCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpActPlnMigrator.storDBOut.StorDB().Flush( - path.Join(tpActPlnCfgOut.DataFolderPath, "storage", tpActPlnCfgOut.StorDBType)); err != nil { + path.Join(tpActPlnCfgOut.DataFolderPath, "storage", tpActPlnCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpActPlnITPopulate(t *testing.T) { tpActionPlans = []*utils.TPActionPlan{ - &utils.TPActionPlan{ + { TPid: "TPAcc", ID: "ID", ActionPlan: []*utils.TPActionTiming{ - &utils.TPActionTiming{ + { ActionsId: "AccId", TimingId: "TimingID", Weight: 10, }, - &utils.TPActionTiming{ + { ActionsId: "AccId2", TimingId: "TimingID2", Weight: 11, diff --git a/migrator/tp_action_triggers_it_test.go b/migrator/tp_action_triggers_it_test.go index 85142bb49..bfcf300c9 100644 --- a/migrator/tp_action_triggers_it_test.go +++ b/migrator/tp_action_triggers_it_test.go @@ -66,23 +66,25 @@ func testTpActTrgITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpActTrgCfgIn.StorDBType, tpActTrgCfgIn.StorDBHost, - tpActTrgCfgIn.StorDBPort, tpActTrgCfgIn.StorDBName, - tpActTrgCfgIn.StorDBUser, tpActTrgCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpActTrgCfgIn.StorDbCfg().StorDBType, + tpActTrgCfgIn.StorDbCfg().StorDBHost, tpActTrgCfgIn.StorDbCfg().StorDBPort, + tpActTrgCfgIn.StorDbCfg().StorDBName, tpActTrgCfgIn.StorDbCfg().StorDBUser, + tpActTrgCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpActTrgCfgOut.StorDBType, - tpActTrgCfgOut.StorDBHost, tpActTrgCfgOut.StorDBPort, tpActTrgCfgOut.StorDBName, - tpActTrgCfgOut.StorDBUser, tpActTrgCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpActTrgCfgOut.StorDbCfg().StorDBType, + tpActTrgCfgOut.StorDbCfg().StorDBHost, tpActTrgCfgOut.StorDbCfg().StorDBPort, + tpActTrgCfgOut.StorDbCfg().StorDBName, tpActTrgCfgOut.StorDbCfg().StorDBUser, + tpActTrgCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,23 +96,23 @@ func testTpActTrgITConnect(t *testing.T) { func testTpActTrgITFlush(t *testing.T) { if err := tpActTrgMigrator.storDBIn.StorDB().Flush( - path.Join(tpActTrgCfgIn.DataFolderPath, "storage", tpActTrgCfgIn.StorDBType)); err != nil { + path.Join(tpActTrgCfgIn.DataFolderPath, "storage", tpActTrgCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpActTrgMigrator.storDBOut.StorDB().Flush( - path.Join(tpActTrgCfgOut.DataFolderPath, "storage", tpActTrgCfgOut.StorDBType)); err != nil { + path.Join(tpActTrgCfgOut.DataFolderPath, "storage", tpActTrgCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpActTrgITPopulate(t *testing.T) { tpActionTriggers = []*utils.TPActionTriggers{ - &utils.TPActionTriggers{ + { TPid: "TPAct", ID: "ID", ActionTriggers: []*utils.TPActionTrigger{ - &utils.TPActionTrigger{ + { Id: "ID", UniqueID: "", ThresholdType: "*max_event_counter", @@ -135,7 +137,7 @@ func testTpActTrgITPopulate(t *testing.T) { ActionsId: "LOG_WARNING", Weight: 10, }, - &utils.TPActionTrigger{ + { Id: "ID", UniqueID: "", ThresholdType: "*min_balance", diff --git a/migrator/tp_actions_it_test.go b/migrator/tp_actions_it_test.go index 85d102613..816f7ef27 100644 --- a/migrator/tp_actions_it_test.go +++ b/migrator/tp_actions_it_test.go @@ -66,23 +66,25 @@ func testTpActITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpActCfgIn.StorDBType, tpActCfgIn.StorDBHost, - tpActCfgIn.StorDBPort, tpActCfgIn.StorDBName, - tpActCfgIn.StorDBUser, tpActCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpActCfgIn.StorDbCfg().StorDBType, + tpActCfgIn.StorDbCfg().StorDBHost, tpActCfgIn.StorDbCfg().StorDBPort, + tpActCfgIn.StorDbCfg().StorDBName, tpActCfgIn.StorDbCfg().StorDBUser, + tpActCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpActCfgOut.StorDBType, - tpActCfgOut.StorDBHost, tpActCfgOut.StorDBPort, tpActCfgOut.StorDBName, - tpActCfgOut.StorDBUser, tpActCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpActCfgOut.StorDbCfg().StorDBType, + tpActCfgOut.StorDbCfg().StorDBHost, tpActCfgOut.StorDbCfg().StorDBPort, + tpActCfgOut.StorDbCfg().StorDBName, tpActCfgOut.StorDbCfg().StorDBUser, + tpActCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,23 +96,23 @@ func testTpActITConnect(t *testing.T) { func testTpActITFlush(t *testing.T) { if err := tpActMigrator.storDBIn.StorDB().Flush( - path.Join(tpActCfgIn.DataFolderPath, "storage", tpActCfgIn.StorDBType)); err != nil { + path.Join(tpActCfgIn.DataFolderPath, "storage", tpActCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpActMigrator.storDBOut.StorDB().Flush( - path.Join(tpActCfgOut.DataFolderPath, "storage", tpActCfgOut.StorDBType)); err != nil { + path.Join(tpActCfgOut.DataFolderPath, "storage", tpActCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpActITPopulate(t *testing.T) { tpActions = []*utils.TPActions{ - &utils.TPActions{ + { TPid: "TPAcc", ID: "ID", Actions: []*utils.TPAction{ - &utils.TPAction{ + { Identifier: "*log", BalanceId: "BalID1", BalanceUuid: "", @@ -130,7 +132,7 @@ func testTpActITPopulate(t *testing.T) { BalanceDisabled: "false", Weight: 11, }, - &utils.TPAction{ + { Identifier: "*topup_reset", BalanceId: "BalID2", BalanceUuid: "", diff --git a/migrator/tp_aliases_it_test.go b/migrator/tp_aliases_it_test.go index 69e3ba7a0..6b7210519 100644 --- a/migrator/tp_aliases_it_test.go +++ b/migrator/tp_aliases_it_test.go @@ -66,23 +66,25 @@ func testTpAliITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpAliCfgIn.StorDBType, tpAliCfgIn.StorDBHost, - tpAliCfgIn.StorDBPort, tpAliCfgIn.StorDBName, - tpAliCfgIn.StorDBUser, tpAliCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpAliCfgIn.StorDbCfg().StorDBType, + tpAliCfgIn.StorDbCfg().StorDBHost, tpAliCfgIn.StorDbCfg().StorDBPort, + tpAliCfgIn.StorDbCfg().StorDBName, tpAliCfgIn.StorDbCfg().StorDBUser, + tpAliCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpAliCfgOut.StorDBType, - tpAliCfgOut.StorDBHost, tpAliCfgOut.StorDBPort, tpAliCfgOut.StorDBName, - tpAliCfgOut.StorDBUser, tpAliCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpAliCfgOut.StorDbCfg().StorDBType, + tpAliCfgOut.StorDbCfg().StorDBHost, tpAliCfgOut.StorDbCfg().StorDBPort, + tpAliCfgOut.StorDbCfg().StorDBName, tpAliCfgOut.StorDbCfg().StorDBUser, + tpAliCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpAliITConnect(t *testing.T) { func testTpAliITFlush(t *testing.T) { if err := tpAliMigrator.storDBIn.StorDB().Flush( - path.Join(tpAliCfgIn.DataFolderPath, "storage", tpAliCfgIn.StorDBType)); err != nil { + path.Join(tpAliCfgIn.DataFolderPath, "storage", tpAliCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpAliMigrator.storDBOut.StorDB().Flush( - path.Join(tpAliCfgOut.DataFolderPath, "storage", tpAliCfgOut.StorDBType)); err != nil { + path.Join(tpAliCfgOut.DataFolderPath, "storage", tpAliCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpAliITPopulate(t *testing.T) { tpAliases = []*utils.TPAliases{ - &utils.TPAliases{ + { TPid: "testTPid1", Direction: "*out", Tenant: "cgrates.org", @@ -115,7 +117,7 @@ func testTpAliITPopulate(t *testing.T) { Subject: "1006", Context: "*rating", Values: []*utils.TPAliasValue{ - &utils.TPAliasValue{ + { DestinationId: "*any", Target: "Subject", Original: "1006", @@ -124,7 +126,7 @@ func testTpAliITPopulate(t *testing.T) { }, }, }, - &utils.TPAliases{ + { TPid: "testTPid2", Direction: "*out", Tenant: "cgrates.org", @@ -133,7 +135,7 @@ func testTpAliITPopulate(t *testing.T) { Subject: "1001", Context: "*rating", Values: []*utils.TPAliasValue{ - &utils.TPAliasValue{ + { DestinationId: "*any", Target: "Subject", Original: "1001", diff --git a/migrator/tp_cdr_stats_it_test.go b/migrator/tp_cdr_stats_it_test.go index fa4018eb2..8781defd7 100644 --- a/migrator/tp_cdr_stats_it_test.go +++ b/migrator/tp_cdr_stats_it_test.go @@ -66,23 +66,25 @@ func testTpCdrStatITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpCdrStatCfgIn.StorDBType, tpCdrStatCfgIn.StorDBHost, - tpCdrStatCfgIn.StorDBPort, tpCdrStatCfgIn.StorDBName, - tpCdrStatCfgIn.StorDBUser, tpCdrStatCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpCdrStatCfgIn.StorDbCfg().StorDBType, + tpCdrStatCfgIn.StorDbCfg().StorDBHost, tpCdrStatCfgIn.StorDbCfg().StorDBPort, + tpCdrStatCfgIn.StorDbCfg().StorDBName, tpCdrStatCfgIn.StorDbCfg().StorDBUser, + tpCdrStatCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpCdrStatCfgOut.StorDBType, - tpCdrStatCfgOut.StorDBHost, tpCdrStatCfgOut.StorDBPort, tpCdrStatCfgOut.StorDBName, - tpCdrStatCfgOut.StorDBUser, tpCdrStatCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpCdrStatCfgOut.StorDbCfg().StorDBType, + tpCdrStatCfgOut.StorDbCfg().StorDBHost, tpCdrStatCfgOut.StorDbCfg().StorDBPort, + tpCdrStatCfgOut.StorDbCfg().StorDBName, tpCdrStatCfgOut.StorDbCfg().StorDBUser, + tpCdrStatCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,23 +96,23 @@ func testTpCdrStatITConnect(t *testing.T) { func testTpCdrStatITFlush(t *testing.T) { if err := tpCdrStatMigrator.storDBIn.StorDB().Flush( - path.Join(tpCdrStatCfgIn.DataFolderPath, "storage", tpCdrStatCfgIn.StorDBType)); err != nil { + path.Join(tpCdrStatCfgIn.DataFolderPath, "storage", tpCdrStatCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpCdrStatMigrator.storDBOut.StorDB().Flush( - path.Join(tpCdrStatCfgOut.DataFolderPath, "storage", tpCdrStatCfgOut.StorDBType)); err != nil { + path.Join(tpCdrStatCfgOut.DataFolderPath, "storage", tpCdrStatCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpCdrStatITPopulate(t *testing.T) { tpCdrStat = []*utils.TPCdrStats{ - &utils.TPCdrStats{ + { TPid: "TPCdr", ID: "ID", CdrStats: []*utils.TPCdrStat{ - &utils.TPCdrStat{ + { QueueLength: "10", TimeWindow: "0", SaveInterval: "10s", @@ -136,7 +138,7 @@ func testTpCdrStatITPopulate(t *testing.T) { CostInterval: "", ActionTriggers: "CDRST1_WARN", }, - &utils.TPCdrStat{ + { QueueLength: "10", TimeWindow: "0", SaveInterval: "10s", diff --git a/migrator/tp_derived_chargers_it_test.go b/migrator/tp_derived_chargers_it_test.go index 0a57179db..94d3954dc 100644 --- a/migrator/tp_derived_chargers_it_test.go +++ b/migrator/tp_derived_chargers_it_test.go @@ -67,23 +67,25 @@ func testTpDrChgITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpDrChgCfgIn.StorDBType, tpDrChgCfgIn.StorDBHost, - tpDrChgCfgIn.StorDBPort, tpDrChgCfgIn.StorDBName, - tpDrChgCfgIn.StorDBUser, tpDrChgCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpDrChgCfgIn.StorDbCfg().StorDBType, + tpDrChgCfgIn.StorDbCfg().StorDBHost, tpDrChgCfgIn.StorDbCfg().StorDBPort, + tpDrChgCfgIn.StorDbCfg().StorDBName, tpDrChgCfgIn.StorDbCfg().StorDBUser, + tpDrChgCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpDrChgCfgOut.StorDBType, - tpDrChgCfgOut.StorDBHost, tpDrChgCfgOut.StorDBPort, tpDrChgCfgOut.StorDBName, - tpDrChgCfgOut.StorDBUser, tpDrChgCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpDrChgCfgOut.StorDbCfg().StorDBType, + tpDrChgCfgOut.StorDbCfg().StorDBHost, tpDrChgCfgOut.StorDbCfg().StorDBPort, + tpDrChgCfgOut.StorDbCfg().StorDBName, tpDrChgCfgOut.StorDbCfg().StorDBUser, + tpDrChgCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -95,19 +97,19 @@ func testTpDrChgITConnect(t *testing.T) { func testTpDrChgITFlush(t *testing.T) { if err := tpDrChgMigrator.storDBIn.StorDB().Flush( - path.Join(tpDrChgCfgIn.DataFolderPath, "storage", tpDrChgCfgIn.StorDBType)); err != nil { + path.Join(tpDrChgCfgIn.DataFolderPath, "storage", tpDrChgCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpDrChgMigrator.storDBOut.StorDB().Flush( - path.Join(tpDrChgCfgOut.DataFolderPath, "storage", tpDrChgCfgOut.StorDBType)); err != nil { + path.Join(tpDrChgCfgOut.DataFolderPath, "storage", tpDrChgCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpDrChgITPopulate(t *testing.T) { tpDerivedChargers = []*utils.TPDerivedChargers{ - &utils.TPDerivedChargers{ + { TPid: "TPD", LoadId: "LoadID", Direction: "*out", @@ -117,7 +119,7 @@ func testTpDrChgITPopulate(t *testing.T) { Subject: "1001", DestinationIds: "", DerivedChargers: []*utils.TPDerivedCharger{ - &utils.TPDerivedCharger{ + { RunId: "derived_run1", RunFilters: "", ReqTypeField: "^*rated", diff --git a/migrator/tp_destination_rates_it_test.go b/migrator/tp_destination_rates_it_test.go index 9ae353b58..7a87fe548 100644 --- a/migrator/tp_destination_rates_it_test.go +++ b/migrator/tp_destination_rates_it_test.go @@ -66,23 +66,25 @@ func testTpDstRtITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpDstRtCfgIn.StorDBType, tpDstRtCfgIn.StorDBHost, - tpDstRtCfgIn.StorDBPort, tpDstRtCfgIn.StorDBName, - tpDstRtCfgIn.StorDBUser, tpDstRtCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpDstRtCfgIn.StorDbCfg().StorDBType, + tpDstRtCfgIn.StorDbCfg().StorDBHost, tpDstRtCfgIn.StorDbCfg().StorDBPort, + tpDstRtCfgIn.StorDbCfg().StorDBName, tpDstRtCfgIn.StorDbCfg().StorDBUser, + tpDstRtCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpDstRtCfgOut.StorDBType, - tpDstRtCfgOut.StorDBHost, tpDstRtCfgOut.StorDBPort, tpDstRtCfgOut.StorDBName, - tpDstRtCfgOut.StorDBUser, tpDstRtCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpDstRtCfgOut.StorDbCfg().StorDBType, + tpDstRtCfgOut.StorDbCfg().StorDBHost, tpDstRtCfgOut.StorDbCfg().StorDBPort, + tpDstRtCfgOut.StorDbCfg().StorDBName, tpDstRtCfgOut.StorDbCfg().StorDBUser, + tpDstRtCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,23 +96,23 @@ func testTpDstRtITConnect(t *testing.T) { func testTpDstRtITFlush(t *testing.T) { if err := tpDstRtMigrator.storDBIn.StorDB().Flush( - path.Join(tpDstRtCfgIn.DataFolderPath, "storage", tpDstRtCfgIn.StorDBType)); err != nil { + path.Join(tpDstRtCfgIn.DataFolderPath, "storage", tpDstRtCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpDstRtMigrator.storDBOut.StorDB().Flush( - path.Join(tpDstRtCfgOut.DataFolderPath, "storage", tpDstRtCfgOut.StorDBType)); err != nil { + path.Join(tpDstRtCfgOut.DataFolderPath, "storage", tpDstRtCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpDstRtITPopulate(t *testing.T) { tpDestinationRate = []*utils.TPDestinationRate{ - &utils.TPDestinationRate{ + { TPid: utils.TEST_SQL, ID: "DR_FREESWITCH_USERS", DestinationRates: []*utils.DestinationRate{ - &utils.DestinationRate{ + { DestinationId: "FS_USERS", RateId: "RT_FS_USERS", RoundingMethod: "*up", diff --git a/migrator/tp_destinations_it_test.go b/migrator/tp_destinations_it_test.go index 3f472a889..96d4f7b24 100644 --- a/migrator/tp_destinations_it_test.go +++ b/migrator/tp_destinations_it_test.go @@ -66,23 +66,25 @@ func testTpDstITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpDstCfgIn.StorDBType, tpDstCfgIn.StorDBHost, - tpDstCfgIn.StorDBPort, tpDstCfgIn.StorDBName, - tpDstCfgIn.StorDBUser, tpDstCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpDstCfgIn.StorDbCfg().StorDBType, + tpDstCfgIn.StorDbCfg().StorDBHost, tpDstCfgIn.StorDbCfg().StorDBPort, + tpDstCfgIn.StorDbCfg().StorDBName, tpDstCfgIn.StorDbCfg().StorDBUser, + tpDstCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpDstCfgOut.StorDBType, - tpDstCfgOut.StorDBHost, tpDstCfgOut.StorDBPort, tpDstCfgOut.StorDBName, - tpDstCfgOut.StorDBUser, tpDstCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpDstCfgOut.StorDbCfg().StorDBType, + tpDstCfgOut.StorDbCfg().StorDBHost, tpDstCfgOut.StorDbCfg().StorDBPort, + tpDstCfgOut.StorDbCfg().StorDBName, tpDstCfgOut.StorDbCfg().StorDBUser, + tpDstCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpDstITConnect(t *testing.T) { func testTpDstITFlush(t *testing.T) { if err := tpDstMigrator.storDBIn.StorDB().Flush( - path.Join(tpDstCfgIn.DataFolderPath, "storage", tpDstCfgIn.StorDBType)); err != nil { + path.Join(tpDstCfgIn.DataFolderPath, "storage", tpDstCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpDstMigrator.storDBOut.StorDB().Flush( - path.Join(tpDstCfgOut.DataFolderPath, "storage", tpDstCfgOut.StorDBType)); err != nil { + path.Join(tpDstCfgOut.DataFolderPath, "storage", tpDstCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpDstITPopulate(t *testing.T) { tpDestination = []*utils.TPDestination{ - &utils.TPDestination{ + { TPid: "TPD", ID: "GERMANY", Prefixes: []string{"+49", "+4915"}, diff --git a/migrator/tp_filters_it_test.go b/migrator/tp_filters_it_test.go index 76999d10d..c6c1124fe 100755 --- a/migrator/tp_filters_it_test.go +++ b/migrator/tp_filters_it_test.go @@ -66,23 +66,25 @@ func testTpFltrITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpFltrCfgIn.StorDBType, tpFltrCfgIn.StorDBHost, - tpFltrCfgIn.StorDBPort, tpFltrCfgIn.StorDBName, - tpFltrCfgIn.StorDBUser, tpFltrCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpFltrCfgIn.StorDbCfg().StorDBType, + tpFltrCfgIn.StorDbCfg().StorDBHost, tpFltrCfgIn.StorDbCfg().StorDBPort, + tpFltrCfgIn.StorDbCfg().StorDBName, tpFltrCfgIn.StorDbCfg().StorDBUser, + tpFltrCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpFltrCfgOut.StorDBType, - tpFltrCfgOut.StorDBHost, tpFltrCfgOut.StorDBPort, tpFltrCfgOut.StorDBName, - tpFltrCfgOut.StorDBUser, tpFltrCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpFltrCfgOut.StorDbCfg().StorDBType, + tpFltrCfgOut.StorDbCfg().StorDBHost, tpFltrCfgOut.StorDbCfg().StorDBPort, + tpFltrCfgOut.StorDbCfg().StorDBName, tpFltrCfgOut.StorDbCfg().StorDBUser, + tpFltrCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,24 +96,24 @@ func testTpFltrITConnect(t *testing.T) { func testTpFltrITFlush(t *testing.T) { if err := tpFltrMigrator.storDBIn.StorDB().Flush( - path.Join(tpFltrCfgIn.DataFolderPath, "storage", tpFltrCfgIn.StorDBType)); err != nil { + path.Join(tpFltrCfgIn.DataFolderPath, "storage", tpFltrCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpFltrMigrator.storDBOut.StorDB().Flush( - path.Join(tpFltrCfgOut.DataFolderPath, "storage", tpFltrCfgOut.StorDBType)); err != nil { + path.Join(tpFltrCfgOut.DataFolderPath, "storage", tpFltrCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpFltrITPopulate(t *testing.T) { tpFilters = []*utils.TPFilterProfile{ - &utils.TPFilterProfile{ + { TPid: "TP1", Tenant: "cgrates.org", ID: "Filter", Filters: []*utils.TPFilter{ - &utils.TPFilter{ + { Type: "*string", FieldName: "Account", Values: []string{"1001", "1002"}, diff --git a/migrator/tp_rates_it_test.go b/migrator/tp_rates_it_test.go index e236b6766..1331a3cb8 100644 --- a/migrator/tp_rates_it_test.go +++ b/migrator/tp_rates_it_test.go @@ -66,23 +66,25 @@ func testTpRatesITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpRatesCfgIn.StorDBType, tpRatesCfgIn.StorDBHost, - tpRatesCfgIn.StorDBPort, tpRatesCfgIn.StorDBName, - tpRatesCfgIn.StorDBUser, tpRatesCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpRatesCfgIn.StorDbCfg().StorDBType, + tpRatesCfgIn.StorDbCfg().StorDBHost, tpRatesCfgIn.StorDbCfg().StorDBPort, + tpRatesCfgIn.StorDbCfg().StorDBName, tpRatesCfgIn.StorDbCfg().StorDBUser, + tpRatesCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpRatesCfgOut.StorDBType, - tpRatesCfgOut.StorDBHost, tpRatesCfgOut.StorDBPort, tpRatesCfgOut.StorDBName, - tpRatesCfgOut.StorDBUser, tpRatesCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpRatesCfgOut.StorDbCfg().StorDBType, + tpRatesCfgOut.StorDbCfg().StorDBHost, tpRatesCfgOut.StorDbCfg().StorDBPort, + tpRatesCfgOut.StorDbCfg().StorDBName, tpRatesCfgOut.StorDbCfg().StorDBUser, + tpRatesCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,30 +96,30 @@ func testTpRatesITConnect(t *testing.T) { func testTpRatesITFlush(t *testing.T) { if err := tpRatesMigrator.storDBIn.StorDB().Flush( - path.Join(tpRatesCfgIn.DataFolderPath, "storage", tpRatesCfgIn.StorDBType)); err != nil { + path.Join(tpRatesCfgIn.DataFolderPath, "storage", tpRatesCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpRatesMigrator.storDBOut.StorDB().Flush( - path.Join(tpRatesCfgOut.DataFolderPath, "storage", tpRatesCfgOut.StorDBType)); err != nil { + path.Join(tpRatesCfgOut.DataFolderPath, "storage", tpRatesCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpRatesITPopulate(t *testing.T) { tpRates = []*utils.TPRate{ - &utils.TPRate{ + { TPid: "TPidTpRate", ID: "RT_FS_USERS", RateSlots: []*utils.RateSlot{ - &utils.RateSlot{ + { ConnectFee: 12, Rate: 3, RateUnit: "6s", RateIncrement: "6s", GroupIntervalStart: "0s", }, - &utils.RateSlot{ + { ConnectFee: 12, Rate: 3, RateUnit: "4s", diff --git a/migrator/tp_rating_plans_it_test.go b/migrator/tp_rating_plans_it_test.go index 6004cd1f4..cd97aadf4 100644 --- a/migrator/tp_rating_plans_it_test.go +++ b/migrator/tp_rating_plans_it_test.go @@ -66,23 +66,25 @@ func testTpRatPlnITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpRatPlnCfgIn.StorDBType, tpRatPlnCfgIn.StorDBHost, - tpRatPlnCfgIn.StorDBPort, tpRatPlnCfgIn.StorDBName, - tpRatPlnCfgIn.StorDBUser, tpRatPlnCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpRatPlnCfgIn.StorDbCfg().StorDBType, + tpRatPlnCfgIn.StorDbCfg().StorDBHost, tpRatPlnCfgIn.StorDbCfg().StorDBPort, + tpRatPlnCfgIn.StorDbCfg().StorDBName, tpRatPlnCfgIn.StorDbCfg().StorDBUser, + tpRatPlnCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpRatPlnCfgOut.StorDBType, - tpRatPlnCfgOut.StorDBHost, tpRatPlnCfgOut.StorDBPort, tpRatPlnCfgOut.StorDBName, - tpRatPlnCfgOut.StorDBUser, tpRatPlnCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpRatPlnCfgOut.StorDbCfg().StorDBType, + tpRatPlnCfgOut.StorDbCfg().StorDBHost, tpRatPlnCfgOut.StorDbCfg().StorDBPort, + tpRatPlnCfgOut.StorDbCfg().StorDBName, tpRatPlnCfgOut.StorDbCfg().StorDBUser, + tpRatPlnCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,28 +96,28 @@ func testTpRatPlnITConnect(t *testing.T) { func testTpRatPlnITFlush(t *testing.T) { if err := tpRatPlnMigrator.storDBIn.StorDB().Flush( - path.Join(tpRatPlnCfgIn.DataFolderPath, "storage", tpRatPlnCfgIn.StorDBType)); err != nil { + path.Join(tpRatPlnCfgIn.DataFolderPath, "storage", tpRatPlnCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpRatPlnMigrator.storDBOut.StorDB().Flush( - path.Join(tpRatPlnCfgOut.DataFolderPath, "storage", tpRatPlnCfgOut.StorDBType)); err != nil { + path.Join(tpRatPlnCfgOut.DataFolderPath, "storage", tpRatPlnCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpRatPlnITPopulate(t *testing.T) { tpRatingPlan = []*utils.TPRatingPlan{ - &utils.TPRatingPlan{ + { TPid: "TPRP1", ID: "IDPlan2", RatingPlanBindings: []*utils.TPRatingPlanBinding{ - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "RateId", TimingId: "TimingID", Weight: 12, }, - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "DR_FREESWITCH_USERS", TimingId: "ALWAYS", Weight: 10, @@ -142,12 +144,12 @@ func testTpRatPlnITMove(t *testing.T) { func testTpRatPlnITCheckData(t *testing.T) { reverseRatingPlanBindings := []*utils.TPRatingPlanBinding{ - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "DR_FREESWITCH_USERS", TimingId: "ALWAYS", Weight: 10, }, - &utils.TPRatingPlanBinding{ + { DestinationRatesId: "RateId", TimingId: "TimingID", Weight: 12, diff --git a/migrator/tp_rating_profiles_it_test.go b/migrator/tp_rating_profiles_it_test.go index ab90a8e41..f220dd4b6 100644 --- a/migrator/tp_rating_profiles_it_test.go +++ b/migrator/tp_rating_profiles_it_test.go @@ -66,23 +66,25 @@ func testTpRatPrfITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpRatPrfCfgIn.StorDBType, tpRatPrfCfgIn.StorDBHost, - tpRatPrfCfgIn.StorDBPort, tpRatPrfCfgIn.StorDBName, - tpRatPrfCfgIn.StorDBUser, tpRatPrfCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpRatPrfCfgIn.StorDbCfg().StorDBType, + tpRatPrfCfgIn.StorDbCfg().StorDBHost, tpRatPrfCfgIn.StorDbCfg().StorDBPort, + tpRatPrfCfgIn.StorDbCfg().StorDBName, tpRatPrfCfgIn.StorDbCfg().StorDBUser, + tpRatPrfCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpRatPrfCfgOut.StorDBType, - tpRatPrfCfgOut.StorDBHost, tpRatPrfCfgOut.StorDBPort, tpRatPrfCfgOut.StorDBName, - tpRatPrfCfgOut.StorDBUser, tpRatPrfCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpRatPrfCfgOut.StorDbCfg().StorDBType, + tpRatPrfCfgOut.StorDbCfg().StorDBHost, tpRatPrfCfgOut.StorDbCfg().StorDBPort, + tpRatPrfCfgOut.StorDbCfg().StorDBName, tpRatPrfCfgOut.StorDbCfg().StorDBUser, + tpRatPrfCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpRatPrfITConnect(t *testing.T) { func testTpRatPrfITFlush(t *testing.T) { if err := tpRatPrfMigrator.storDBIn.StorDB().Flush( - path.Join(tpRatPrfCfgIn.DataFolderPath, "storage", tpRatPrfCfgIn.StorDBType)); err != nil { + path.Join(tpRatPrfCfgIn.DataFolderPath, "storage", tpRatPrfCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpRatPrfMigrator.storDBOut.StorDB().Flush( - path.Join(tpRatPrfCfgOut.DataFolderPath, "storage", tpRatPrfCfgOut.StorDBType)); err != nil { + path.Join(tpRatPrfCfgOut.DataFolderPath, "storage", tpRatPrfCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpRatPrfITPopulate(t *testing.T) { tpRatingProfile = []*utils.TPRatingProfile{ - &utils.TPRatingProfile{ + { TPid: "TPRProf1", LoadId: "RPrf", Direction: "*out", @@ -114,13 +116,13 @@ func testTpRatPrfITPopulate(t *testing.T) { Category: "Category", Subject: "Subject", RatingPlanActivations: []*utils.TPRatingActivation{ - &utils.TPRatingActivation{ + { ActivationTime: "2014-07-29T15:00:00Z", RatingPlanId: "PlanOne", FallbackSubjects: "FallBack", CdrStatQueueIds: "RandomId", }, - &utils.TPRatingActivation{ + { ActivationTime: "2015-07-29T10:00:00Z", RatingPlanId: "PlanTwo", FallbackSubjects: "FallOut", diff --git a/migrator/tp_resources_it_test.go b/migrator/tp_resources_it_test.go index 8c7e587f0..d5fc95b71 100644 --- a/migrator/tp_resources_it_test.go +++ b/migrator/tp_resources_it_test.go @@ -66,23 +66,25 @@ func testTpResITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpResCfgIn.StorDBType, tpResCfgIn.StorDBHost, - tpResCfgIn.StorDBPort, tpResCfgIn.StorDBName, - tpResCfgIn.StorDBUser, tpResCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpResCfgIn.StorDbCfg().StorDBType, + tpResCfgIn.StorDbCfg().StorDBHost, tpResCfgIn.StorDbCfg().StorDBPort, + tpResCfgIn.StorDbCfg().StorDBName, tpResCfgIn.StorDbCfg().StorDBUser, + tpResCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpResCfgOut.StorDBType, - tpResCfgOut.StorDBHost, tpResCfgOut.StorDBPort, tpResCfgOut.StorDBName, - tpResCfgOut.StorDBUser, tpResCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpResCfgOut.StorDbCfg().StorDBType, + tpResCfgOut.StorDbCfg().StorDBHost, tpResCfgOut.StorDbCfg().StorDBPort, + tpResCfgOut.StorDbCfg().StorDBName, tpResCfgOut.StorDbCfg().StorDBUser, + tpResCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -95,19 +97,19 @@ func testTpResITConnect(t *testing.T) { func testTpResITFlush(t *testing.T) { if err := tpResMigrator.storDBIn.StorDB().Flush( - path.Join(tpResCfgIn.DataFolderPath, "storage", tpResCfgIn.StorDBType)); err != nil { + path.Join(tpResCfgIn.DataFolderPath, "storage", tpResCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpResMigrator.storDBOut.StorDB().Flush( - path.Join(tpResCfgOut.DataFolderPath, "storage", tpResCfgOut.StorDBType)); err != nil { + path.Join(tpResCfgOut.DataFolderPath, "storage", tpResCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpResITPopulate(t *testing.T) { tpResources = []*utils.TPResource{ - &utils.TPResource{ + { Tenant: "cgrates.org", TPid: "TPR1", ID: "ResGroup1", diff --git a/migrator/tp_shared_groups_it_test.go b/migrator/tp_shared_groups_it_test.go index d46de0b64..f84c90240 100644 --- a/migrator/tp_shared_groups_it_test.go +++ b/migrator/tp_shared_groups_it_test.go @@ -66,23 +66,25 @@ func testTpShrGrITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpShrGrCfgIn.StorDBType, tpShrGrCfgIn.StorDBHost, - tpShrGrCfgIn.StorDBPort, tpShrGrCfgIn.StorDBName, - tpShrGrCfgIn.StorDBUser, tpShrGrCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpShrGrCfgIn.StorDbCfg().StorDBType, + tpShrGrCfgIn.StorDbCfg().StorDBHost, tpShrGrCfgIn.StorDbCfg().StorDBPort, + tpShrGrCfgIn.StorDbCfg().StorDBName, tpShrGrCfgIn.StorDbCfg().StorDBUser, + tpShrGrCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpShrGrCfgOut.StorDBType, - tpShrGrCfgOut.StorDBHost, tpShrGrCfgOut.StorDBPort, tpShrGrCfgOut.StorDBName, - tpShrGrCfgOut.StorDBUser, tpShrGrCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpShrGrCfgOut.StorDbCfg().StorDBType, + tpShrGrCfgOut.StorDbCfg().StorDBHost, tpShrGrCfgOut.StorDbCfg().StorDBPort, + tpShrGrCfgOut.StorDbCfg().StorDBName, tpShrGrCfgOut.StorDbCfg().StorDBUser, + tpShrGrCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,28 +96,28 @@ func testTpShrGrITConnect(t *testing.T) { func testTpShrGrITFlush(t *testing.T) { if err := tpShrGrMigrator.storDBIn.StorDB().Flush( - path.Join(tpShrGrCfgIn.DataFolderPath, "storage", tpShrGrCfgIn.StorDBType)); err != nil { + path.Join(tpShrGrCfgIn.DataFolderPath, "storage", tpShrGrCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpShrGrMigrator.storDBOut.StorDB().Flush( - path.Join(tpShrGrCfgOut.DataFolderPath, "storage", tpShrGrCfgOut.StorDBType)); err != nil { + path.Join(tpShrGrCfgOut.DataFolderPath, "storage", tpShrGrCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpShrGrITPopulate(t *testing.T) { tpSharedGroups = []*utils.TPSharedGroups{ - &utils.TPSharedGroups{ + { TPid: "TPS1", ID: "Group1", SharedGroups: []*utils.TPSharedGroup{ - &utils.TPSharedGroup{ + { Account: "AccOne", Strategy: "StrategyOne", RatingSubject: "SubOne", }, - &utils.TPSharedGroup{ + { Account: "AccTow", Strategy: "StrategyTwo", RatingSubject: "SubTwo", diff --git a/migrator/tp_stats_it_test.go b/migrator/tp_stats_it_test.go index fc4af0c7a..099be3789 100644 --- a/migrator/tp_stats_it_test.go +++ b/migrator/tp_stats_it_test.go @@ -66,23 +66,25 @@ func testTpStatsITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpStatsCfgIn.StorDBType, tpStatsCfgIn.StorDBHost, - tpStatsCfgIn.StorDBPort, tpStatsCfgIn.StorDBName, - tpStatsCfgIn.StorDBUser, tpStatsCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpStatsCfgIn.StorDbCfg().StorDBType, + tpStatsCfgIn.StorDbCfg().StorDBHost, tpStatsCfgIn.StorDbCfg().StorDBPort, + tpStatsCfgIn.StorDbCfg().StorDBName, tpStatsCfgIn.StorDbCfg().StorDBUser, + tpStatsCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpStatsCfgOut.StorDBType, - tpStatsCfgOut.StorDBHost, tpStatsCfgOut.StorDBPort, tpStatsCfgOut.StorDBName, - tpStatsCfgOut.StorDBUser, tpStatsCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpStatsCfgOut.StorDbCfg().StorDBType, + tpStatsCfgOut.StorDbCfg().StorDBHost, tpStatsCfgOut.StorDbCfg().StorDBPort, + tpStatsCfgOut.StorDbCfg().StorDBName, tpStatsCfgOut.StorDbCfg().StorDBUser, + tpStatsCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpStatsITConnect(t *testing.T) { func testTpStatsITFlush(t *testing.T) { if err := tpStatsMigrator.storDBIn.StorDB().Flush( - path.Join(tpStatsCfgIn.DataFolderPath, "storage", tpStatsCfgIn.StorDBType)); err != nil { + path.Join(tpStatsCfgIn.DataFolderPath, "storage", tpStatsCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpStatsMigrator.storDBOut.StorDB().Flush( - path.Join(tpStatsCfgOut.DataFolderPath, "storage", tpStatsCfgOut.StorDBType)); err != nil { + path.Join(tpStatsCfgOut.DataFolderPath, "storage", tpStatsCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpStatsITPopulate(t *testing.T) { tpStats = []*utils.TPStats{ - &utils.TPStats{ + { Tenant: "cgrates.org", TPid: "TPS1", ID: "Stat1", @@ -117,7 +119,7 @@ func testTpStatsITPopulate(t *testing.T) { }, TTL: "1", Metrics: []*utils.MetricWithParams{ - &utils.MetricWithParams{ + { MetricID: "*sum", Parameters: "Param1", }, diff --git a/migrator/tp_suppliers_it_test.go b/migrator/tp_suppliers_it_test.go index 89f4a76ab..ba9116690 100644 --- a/migrator/tp_suppliers_it_test.go +++ b/migrator/tp_suppliers_it_test.go @@ -66,23 +66,25 @@ func testTpSplITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpSplCfgIn.StorDBType, tpSplCfgIn.StorDBHost, - tpSplCfgIn.StorDBPort, tpSplCfgIn.StorDBName, - tpSplCfgIn.StorDBUser, tpSplCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpSplCfgIn.StorDbCfg().StorDBType, + tpSplCfgIn.StorDbCfg().StorDBHost, tpSplCfgIn.StorDbCfg().StorDBPort, + tpSplCfgIn.StorDbCfg().StorDBName, tpSplCfgIn.StorDbCfg().StorDBUser, + tpSplCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpSplCfgOut.StorDBType, - tpSplCfgOut.StorDBHost, tpSplCfgOut.StorDBPort, tpSplCfgOut.StorDBName, - tpSplCfgOut.StorDBUser, tpSplCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpSplCfgOut.StorDbCfg().StorDBType, + tpSplCfgOut.StorDbCfg().StorDBHost, tpSplCfgOut.StorDbCfg().StorDBPort, + tpSplCfgOut.StorDbCfg().StorDBName, tpSplCfgOut.StorDbCfg().StorDBUser, + tpSplCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpSplITConnect(t *testing.T) { func testTpSplITFlush(t *testing.T) { if err := tpSplMigrator.storDBIn.StorDB().Flush( - path.Join(tpSplCfgIn.DataFolderPath, "storage", tpSplCfgIn.StorDBType)); err != nil { + path.Join(tpSplCfgIn.DataFolderPath, "storage", tpSplCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpSplMigrator.storDBOut.StorDB().Flush( - path.Join(tpSplCfgOut.DataFolderPath, "storage", tpSplCfgOut.StorDBType)); err != nil { + path.Join(tpSplCfgOut.DataFolderPath, "storage", tpSplCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpSplITPopulate(t *testing.T) { tpSuppliers = []*utils.TPSupplierProfile{ - &utils.TPSupplierProfile{ + { TPid: "TP1", Tenant: "cgrates.org", ID: "SUPL_1", @@ -118,7 +120,7 @@ func testTpSplITPopulate(t *testing.T) { Sorting: "*lowest_cost", SortingParameters: []string{}, Suppliers: []*utils.TPSupplier{ - &utils.TPSupplier{ + { ID: "supplier1", FilterIDs: []string{"FLTR_1"}, AccountIDs: []string{"Acc1", "Acc2"}, diff --git a/migrator/tp_thresholds_it_test.go b/migrator/tp_thresholds_it_test.go index c2d42846c..90a5eb3e0 100644 --- a/migrator/tp_thresholds_it_test.go +++ b/migrator/tp_thresholds_it_test.go @@ -66,23 +66,25 @@ func testTpTresITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpTresCfgIn.StorDBType, tpTresCfgIn.StorDBHost, - tpTresCfgIn.StorDBPort, tpTresCfgIn.StorDBName, - tpTresCfgIn.StorDBUser, tpTresCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpTresCfgIn.StorDbCfg().StorDBType, + tpTresCfgIn.StorDbCfg().StorDBHost, tpTresCfgIn.StorDbCfg().StorDBPort, + tpTresCfgIn.StorDbCfg().StorDBName, tpTresCfgIn.StorDbCfg().StorDBUser, + tpTresCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpTresCfgOut.StorDBType, - tpTresCfgOut.StorDBHost, tpTresCfgOut.StorDBPort, tpTresCfgOut.StorDBName, - tpTresCfgOut.StorDBUser, tpTresCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpTresCfgOut.StorDbCfg().StorDBType, + tpTresCfgOut.StorDbCfg().StorDBHost, tpTresCfgOut.StorDbCfg().StorDBPort, + tpTresCfgOut.StorDbCfg().StorDBName, tpTresCfgOut.StorDbCfg().StorDBUser, + tpTresCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpTresITConnect(t *testing.T) { func testTpTresITFlush(t *testing.T) { if err := tpTresMigrator.storDBIn.StorDB().Flush( - path.Join(tpTresCfgIn.DataFolderPath, "storage", tpTresCfgIn.StorDBType)); err != nil { + path.Join(tpTresCfgIn.DataFolderPath, "storage", tpTresCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpTresMigrator.storDBOut.StorDB().Flush( - path.Join(tpTresCfgOut.DataFolderPath, "storage", tpTresCfgOut.StorDBType)); err != nil { + path.Join(tpTresCfgOut.DataFolderPath, "storage", tpTresCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpTresITPopulate(t *testing.T) { tpThresholds = []*utils.TPThreshold{ - &utils.TPThreshold{ + { TPid: "TH1", Tenant: "cgrates.org", ID: "Threhold", diff --git a/migrator/tp_timings_it_test.go b/migrator/tp_timings_it_test.go index 895cd956d..d68992b1d 100644 --- a/migrator/tp_timings_it_test.go +++ b/migrator/tp_timings_it_test.go @@ -66,23 +66,25 @@ func testTpTimITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpTimCfgIn.StorDBType, tpTimCfgIn.StorDBHost, - tpTimCfgIn.StorDBPort, tpTimCfgIn.StorDBName, - tpTimCfgIn.StorDBUser, tpTimCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpTimCfgIn.StorDbCfg().StorDBType, + tpTimCfgIn.StorDbCfg().StorDBHost, tpTimCfgIn.StorDbCfg().StorDBPort, + tpTimCfgIn.StorDbCfg().StorDBName, tpTimCfgIn.StorDbCfg().StorDBUser, + tpTimCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpTimCfgOut.StorDBType, - tpTimCfgOut.StorDBHost, tpTimCfgOut.StorDBPort, tpTimCfgOut.StorDBName, - tpTimCfgOut.StorDBUser, tpTimCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpTimCfgOut.StorDbCfg().StorDBType, + tpTimCfgOut.StorDbCfg().StorDBHost, tpTimCfgOut.StorDbCfg().StorDBPort, + tpTimCfgOut.StorDbCfg().StorDBName, tpTimCfgOut.StorDbCfg().StorDBUser, + tpTimCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,19 +96,19 @@ func testTpTimITConnect(t *testing.T) { func testTpTimITFlush(t *testing.T) { if err := tpTimMigrator.storDBIn.StorDB().Flush( - path.Join(tpTimCfgIn.DataFolderPath, "storage", tpTimCfgIn.StorDBType)); err != nil { + path.Join(tpTimCfgIn.DataFolderPath, "storage", tpTimCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpTimMigrator.storDBOut.StorDB().Flush( - path.Join(tpTimCfgOut.DataFolderPath, "storage", tpTimCfgOut.StorDBType)); err != nil { + path.Join(tpTimCfgOut.DataFolderPath, "storage", tpTimCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpTimITPopulate(t *testing.T) { tpTimings = []*utils.ApierTPTiming{ - &utils.ApierTPTiming{ + { TPid: "TPT1", ID: "Timing", Years: "2017", diff --git a/migrator/tp_users_it_test.go b/migrator/tp_users_it_test.go index e93f7fed7..b52f6f9b1 100644 --- a/migrator/tp_users_it_test.go +++ b/migrator/tp_users_it_test.go @@ -66,23 +66,25 @@ func testTpUserITConnect(t *testing.T) { if err != nil { t.Fatal(err) } - storDBIn, err := NewMigratorStorDB(tpUserCfgIn.StorDBType, tpUserCfgIn.StorDBHost, - tpUserCfgIn.StorDBPort, tpUserCfgIn.StorDBName, - tpUserCfgIn.StorDBUser, tpUserCfgIn.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBIn, err := NewMigratorStorDB(tpUserCfgIn.StorDbCfg().StorDBType, + tpUserCfgIn.StorDbCfg().StorDBHost, tpUserCfgIn.StorDbCfg().StorDBPort, + tpUserCfgIn.StorDbCfg().StorDBName, tpUserCfgIn.StorDbCfg().StorDBUser, + tpUserCfgIn.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - storDBOut, err := NewMigratorStorDB(tpUserCfgOut.StorDBType, - tpUserCfgOut.StorDBHost, tpUserCfgOut.StorDBPort, tpUserCfgOut.StorDBName, - tpUserCfgOut.StorDBUser, tpUserCfgOut.StorDBPass, - config.CgrConfig().StorDBMaxOpenConns, - config.CgrConfig().StorDBMaxIdleConns, - config.CgrConfig().StorDBConnMaxLifetime, - config.CgrConfig().StorDBCDRSIndexes) + storDBOut, err := NewMigratorStorDB(tpUserCfgOut.StorDbCfg().StorDBType, + tpUserCfgOut.StorDbCfg().StorDBHost, tpUserCfgOut.StorDbCfg().StorDBPort, + tpUserCfgOut.StorDbCfg().StorDBName, tpUserCfgOut.StorDbCfg().StorDBUser, + tpUserCfgOut.StorDbCfg().StorDBPass, + config.CgrConfig().StorDbCfg().StorDBMaxOpenConns, + config.CgrConfig().StorDbCfg().StorDBMaxIdleConns, + config.CgrConfig().StorDbCfg().StorDBConnMaxLifetime, + config.CgrConfig().StorDbCfg().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } @@ -94,30 +96,30 @@ func testTpUserITConnect(t *testing.T) { func testTpUserITFlush(t *testing.T) { if err := tpUserMigrator.storDBIn.StorDB().Flush( - path.Join(tpUserCfgIn.DataFolderPath, "storage", tpUserCfgIn.StorDBType)); err != nil { + path.Join(tpUserCfgIn.DataFolderPath, "storage", tpUserCfgIn.StorDbCfg().StorDBType)); err != nil { t.Error(err) } if err := tpUserMigrator.storDBOut.StorDB().Flush( - path.Join(tpUserCfgOut.DataFolderPath, "storage", tpUserCfgOut.StorDBType)); err != nil { + path.Join(tpUserCfgOut.DataFolderPath, "storage", tpUserCfgOut.StorDbCfg().StorDBType)); err != nil { t.Error(err) } } func testTpUserITPopulate(t *testing.T) { tpUsers = []*utils.TPUsers{ - &utils.TPUsers{ + { TPid: "TPU1", UserName: "User1", Tenant: "Tenant1", Masked: true, Weight: 20, Profile: []*utils.TPUserProfile{ - &utils.TPUserProfile{ + { AttrName: "UserProfile1", AttrValue: "ValUP1", }, - &utils.TPUserProfile{ + { AttrName: "UserProfile2", AttrValue: "ValUP2", },