From 47f7fb3ec0da0bcb07231a4a12d538b58bb3aa00 Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 3 Nov 2017 13:48:00 +0100 Subject: [PATCH] Engine tests fixes --- engine/datamanager_it_test.go | 5 +++-- engine/onstor_it_test.go | 8 +++++--- engine/version.go | 5 +++-- engine/versions_it_test.go | 38 +++++++++++++++++++++++------------ 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go index 22d286ce8..07c06e19b 100644 --- a/engine/datamanager_it_test.go +++ b/engine/datamanager_it_test.go @@ -58,8 +58,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, - utils.StorDB, nil, mgoITCfg.CacheConfig, mgoITCfg.LoadHistorySize) + dataDB, err := NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, + mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, + utils.StorDB, nil, mgoITCfg.CacheCfg(), mgoITCfg.LoadHistorySize) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go index a296737a3..f6da2dc44 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -99,7 +99,8 @@ var sTestsOnStorIT = []func(t *testing.T){ func TestOnStorITRedisConnect(t *testing.T) { cfg, _ := config.NewDefaultCGRConfig() - rdsITdb, err = NewRedisStorage(fmt.Sprintf("%s:%s", cfg.DataDbHost, cfg.DataDbPort), 4, cfg.DataDbPass, cfg.DBDataEncoding, utils.REDIS_MAX_CONNS, nil, 1) + rdsITdb, err = NewRedisStorage(fmt.Sprintf("%s:%s", cfg.DataDbHost, cfg.DataDbPort), 4, + cfg.DataDbPass, cfg.DBDataEncoding, utils.REDIS_MAX_CONNS, nil, 1) if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } @@ -119,8 +120,9 @@ func TestOnStorITMongoConnect(t *testing.T) { if err != nil { t.Fatal(err) } - if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, - utils.StorDB, nil, mgoITCfg.CacheConfig, mgoITCfg.LoadHistorySize); err != nil { + if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDBHost, mgoITCfg.StorDBPort, + mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass, + utils.StorDB, nil, mgoITCfg.CacheCfg(), mgoITCfg.LoadHistorySize); err != nil { t.Fatal(err) } onStorCfg = mgoITCfg.StorDBName diff --git a/engine/version.go b/engine/version.go index 9abfde5c8..f364f8c3f 100644 --- a/engine/version.go +++ b/engine/version.go @@ -105,11 +105,12 @@ func (vers Versions) Compare(curent Versions, storType string) string { } func CurrentStorDBVersions() Versions { - return Versions{utils.COST_DETAILS: 2, utils.CDRsTBL: 2} + return Versions{utils.COST_DETAILS: 2, utils.CDRs: 2} } func CurrentDataDBVersions() Versions { - return Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2} + return Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, + utils.ActionPlans: 2, utils.SharedGroups: 2} } func CurrentDBVersions(storType string) Versions { diff --git a/engine/versions_it_test.go b/engine/versions_it_test.go index c528d82f2..9b38aff9f 100644 --- a/engine/versions_it_test.go +++ b/engine/versions_it_test.go @@ -46,12 +46,15 @@ func TestVersionsITMongo(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "tutmongo")); err != nil { t.Fatal(err) } - if dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, - cfg.DBDataEncoding, cfg.CacheConfig, *loadHistorySize); err != nil { + if dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, + cfg.DataDbPort, cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, + cfg.DBDataEncoding, cfg.CacheCfg(), *loadHistorySize); 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.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) if err != nil { log.Fatal(err) } @@ -66,13 +69,16 @@ func TestVersionsITRedisMYSQL(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "tutmysql")); err != nil { t.Fatal(err) } - dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheConfig, *loadHistorySize) + dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, + cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheCfg(), *loadHistorySize) 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.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) if err != nil { log.Fatal(err) } @@ -87,12 +93,15 @@ func TestVersionsITRedisPostgres(t *testing.T) { if cfg, err = config.NewCGRConfigFromFolder(path.Join(*dataDir, "conf", "samples", "storage", "postgres")); err != nil { t.Fatal(err) } - dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheConfig, *loadHistorySize) + dm3, err = ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, + cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheCfg(), *loadHistorySize) 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.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) if err != nil { log.Fatal(err) } @@ -120,7 +129,8 @@ func testVersion(t *testing.T) { storType := dm3.DataDB().GetStorageType() switch storType { case utils.MONGO, utils.MAPSTOR: - currentVersion = Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2} + currentVersion = Versions{utils.Accounts: 2, utils.Actions: 2, + utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2, utils.CDRs: 2} testVersion = Versions{utils.Accounts: 1, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2} test = "Migration needed: please backup cgr data and run : " case utils.REDIS: @@ -159,8 +169,10 @@ func testVersion(t *testing.T) { storType = storageDb.GetStorageType() switch storType { case utils.MONGO, utils.MAPSTOR: - currentVersion = Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2} - testVersion = Versions{utils.Accounts: 1, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2} + currentVersion = Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, + utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2, utils.CDRs: 2} + testVersion = Versions{utils.Accounts: 1, utils.Actions: 2, utils.ActionTriggers: 2, + utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2, utils.CDRs: 2} test = "Migration needed: please backup cgr data and run : " case utils.POSTGRES, utils.MYSQL: currentVersion = CurrentStorDBVersions()