uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 06:09:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update migrator tests

Browse Source
This commit is contained in:
TeoV
2018-04-27 11:19:59 -04:00
committed by Dan Christian Bogos
parent 858e337c39
commit 7c8f91ee3d
4 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/storage_sql.go
View File

@@ -759,9 +759,12 @@ func (self *SQLStorage) SetSMCost(smc *SMCost) error {
func (self *SQLStorage) RemoveSMCost(smc *SMCost) error {
tx := self.db.Begin()
if err := tx.Where(&SessionsCostsSQL{Cgrid: smc.CGRID,
RunID: smc.RunID}).Delete(SessionsCostsSQL{}).Error; err != nil {
var rmParam *SessionsCostsSQL
if smc != nil {
rmParam = &SessionsCostsSQL{Cgrid: smc.CGRID,
RunID: smc.RunID}
}
if err := tx.Where(rmParam).Delete(SessionsCostsSQL{}).Error; err != nil {
tx.Rollback()
return err
}

2
engine/version.go
View File

@@ -147,7 +147,7 @@ func CurrentDataDBVersions() Versions {
func CurrentStorDBVersions() Versions {
return Versions{
utils.COST_DETAILS: 2,
utils.SessionsCosts: 3,
utils.SessionSCosts: 3,
utils.CDRs: 2,
utils.TpRatingPlans: 1,
utils.TpFilters: 1,

46
migrator/migrator_it_test.go
View File

@@ -115,14 +115,14 @@ func TestMigratorITPostgresConnect(t *testing.T) {
if err != nil {
log.Fatal(err)
}
storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
}
oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
@@ -163,14 +163,14 @@ func TestMigratorITRedisConnect(t *testing.T) {
if err != nil {
log.Fatal(err)
}
storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
}
oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
@@ -211,14 +211,14 @@ func TestMigratorITMongoConnect(t *testing.T) {
if err != nil {
log.Fatal(err)
}
storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
}
oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
@@ -263,14 +263,14 @@ func TestMigratorITMoveConnect(t *testing.T) {
if err != nil {
log.Fatal(err)
}
storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding,
storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName,
cfg_in.StorDBUser, cfg_in.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
}
oldstorDB, err := engine.ConfigureStorStorage(cfg_out.StorDBType, cfg_out.StorDBHost, cfg_out.StorDBPort, cfg_out.StorDBName,
cfg_out.StorDBUser, cfg_out.StorDBPass, cfg_out.DBDataEncoding,
oldstorDB, err := engine.ConfigureStorDB(cfg_out.StorDBType, cfg_out.StorDBHost, cfg_out.StorDBPort, cfg_out.StorDBName,
cfg_out.StorDBUser, cfg_out.StorDBPass,
config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes)
if err != nil {
log.Fatal(err)
@@ -1121,15 +1121,15 @@ func testMigratorSessionsCosts(t *testing.T) {
switch action {
case utils.REDIS:
currentVersion := engine.CurrentStorDBVersions()
currentVersion[utils.SessionsCosts] = 1
currentVersion[utils.SessionSCosts] = 1
err := mig.OutStorDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for SessionsCosts ", err.Error())
}
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionsCosts); err != nil {
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionSCosts); err != nil {
t.Error(err)
} else if vrs[utils.SessionsCosts] != 1 {
t.Errorf("Expecting: 1, received: %+v", vrs[utils.SessionsCosts])
} else if vrs[utils.SessionSCosts] != 1 {
t.Errorf("Expecting: 1, received: %+v", vrs[utils.SessionSCosts])
}
var qry string
if isPostgres {
@@ -1161,10 +1161,10 @@ func testMigratorSessionsCosts(t *testing.T) {
t.Error(err)
}
err, _ = mig.Migrate([]string{utils.MetaSessionsCosts})
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionsCosts); err != nil {
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionSCosts); err != nil {
t.Error(err)
} else if vrs[utils.SessionsCosts] != 2 {
t.Errorf("Expecting: 2, received: %+v", vrs[utils.SessionsCosts])
} else if vrs[utils.SessionSCosts] != 3 {
t.Errorf("Expecting: 3, received: %+v", vrs[utils.SessionSCosts])
}
}
}

2
migrator/sessions_costs.go
View File

@@ -77,7 +77,7 @@ func (m *Migrator) migrateSessionSCosts() (err error) {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,
err.Error(),
fmt.Sprintf("error: <%s> when updating SessionsCosts version into StorDB", err.Error()))
fmt.Sprintf("error: <%s> when updating SessionSCosts version into StorDB", err.Error()))
}
return nil
}