uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Switched dmOut with dmIn when checking version for migration

Browse Source
This commit is contained in:
Trial97
2019-01-15 16:18:22 +02:00
committed by Dan Christian Bogos
parent 6d2e28edec
commit 4aa45461af
21 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migrator/action.go
View File

@@ -104,7 +104,7 @@ func (m *Migrator) migrateV1Actions() (err error) {
func (m *Migrator) migrateActions() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/action_it_test.go
View File

@@ -116,7 +116,6 @@ func TestActionITMoveEncoding(t *testing.T) {
}
}
/*
func TestActionITMigrateMongo2Redis(t *testing.T) {
var err error
actPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
@@ -134,7 +133,6 @@ func TestActionITMigrateMongo2Redis(t *testing.T) {
t.Run("TestActionITMigrateMongo2Redis", stest)
}
}
*/
func TestActionITMoveEncoding2(t *testing.T) {
var err error

2
migrator/action_plan.go
View File

@@ -112,7 +112,7 @@ func (m *Migrator) migrateV1ActionPlans() (err error) {
func (m *Migrator) migrateActionPlans() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

22
migrator/action_plan_it_test.go
View File

@@ -98,6 +98,24 @@ func TestActionPlanITMove(t *testing.T) {
}
}
func TestActionPlanITMigrateMongo2Redis(t *testing.T) {
var err error
actPlnPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
actPlnCfgIn, err = config.NewCGRConfigFromFolder(actPlnPathIn)
if err != nil {
t.Fatal(err)
}
actPlnPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql")
actPlnCfgOut, err = config.NewCGRConfigFromFolder(actPlnPathOut)
if err != nil {
t.Fatal(err)
}
actActionPlan = utils.Migrate
for _, stest := range sTestsActPlnIT {
t.Run("TestActionPlanITMigrateMongo2Redis", stest)
}
}
func TestActionPlanITMoveEncoding(t *testing.T) {
var err error
actPlnPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
@@ -164,6 +182,10 @@ func testActPlnITFlush(t *testing.T) {
if err := engine.SetDBVersions(actPlnMigrator.dmOut.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
actPlnMigrator.dmIN.DataManager().DataDB().Flush("")
if err := engine.SetDBVersions(actPlnMigrator.dmIN.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
}
func testActPlnITMigrateAndMove(t *testing.T) {

2
migrator/action_trigger.go
View File

@@ -116,7 +116,7 @@ func (m *Migrator) migrateV1ActionTrigger() (err error) {
func (m *Migrator) migrateActionTriggers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/attributes.go
View File

@@ -115,7 +115,7 @@ func (m *Migrator) migrateV1Attributes() (err error) {
func (m *Migrator) migrateAttributeProfile() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

26
migrator/attributes_it_test.go
View File

@@ -99,6 +99,24 @@ func TestAttributeITMove1(t *testing.T) {
}
}
func TestAttributeITMigrateMongo2Redis(t *testing.T) {
var err error
attrPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
attrCfgIn, err = config.NewCGRConfigFromFolder(attrPathIn)
if err != nil {
t.Fatal(err)
}
attrPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql")
attrCfgOut, err = config.NewCGRConfigFromFolder(attrPathOut)
if err != nil {
t.Fatal(err)
}
attrAction = utils.Migrate
for _, stest := range sTestsAttrIT {
t.Run("TestAttributeITMigrateMongo2Redis", stest)
}
}
func TestAttributeITMove2(t *testing.T) {
var err error
attrPathIn = path.Join(*dataDir, "conf", "samples", "tutmysql")
@@ -187,6 +205,9 @@ func testAttrITFlush(t *testing.T) {
} else if isEmpty != true {
t.Errorf("\nExpecting: true got :%+v", isEmpty)
}
if err := engine.SetDBVersions(attrMigrator.dmOut.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
if err := attrMigrator.dmIN.DataManager().DataDB().Flush(""); err != nil {
t.Error(err)
}
@@ -195,6 +216,9 @@ func testAttrITFlush(t *testing.T) {
} else if isEmpty != true {
t.Errorf("\nExpecting: true got :%+v", isEmpty)
}
if err := engine.SetDBVersions(attrMigrator.dmIN.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
}
func testAttrITMigrateAndMove(t *testing.T) {
@@ -298,7 +322,7 @@ func testAttrITMigrateAndMove(t *testing.T) {
result, err := attrMigrator.dmOut.DataManager().GetAttributeProfile("cgrates.org",
"ATTR_1", false, false, utils.NonTransactional)
if err != nil {
t.Error(err)
t.Fatal(err)
}
result.Compile()
attrPrf.Compile()

2
migrator/chargers.go
View File

@@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentCharger() (err error) {
func (m *Migrator) migrateChargers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/derived_chargers.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentDerivedChargers() (err error) {
func (m *Migrator) migrateDerivedChargers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/destinations.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentDestinations() (err error) {
func (m *Migrator) migrateDestinations() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/dispatchers.go
View File

@@ -59,7 +59,7 @@ func (m *Migrator) migrateCurrentDispatcher() (err error) {
func (m *Migrator) migrateDispatchers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/filters.go
View File

@@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentRequestFilter() (err error) {
func (m *Migrator) migrateRequestFilter() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/rating_plan.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentRatingPlans() (err error) {
func (m *Migrator) migrateRatingPlans() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/rating_profile.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentRatingProfiles() (err error) {
func (m *Migrator) migrateRatingProfiles() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/resource.go
View File

@@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentResource() (err error) {
func (m *Migrator) migrateResources() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

8
migrator/storage_mongo_datadb.go
View File

@@ -376,9 +376,15 @@ func (v1ms *mongoMigrator) getV1Alias() (v1a *v1Alias, err error) {
return nil, utils.ErrNoMoreData
}
v1a = new(v1Alias)
if err := (*v1ms.cursor).Decode(v1a); err != nil {
var kv struct {
Key string
Value v1AliasValues
}
if err := (*v1ms.cursor).Decode(&kv); err != nil {
return nil, err
}
v1a.Values = kv.Value
v1a.SetId(kv.Key)
return v1a, nil
}

2
migrator/storage_redis.go
View File

@@ -486,7 +486,7 @@ func (v1rs *redisMigrator) getV1Alias() (v1a *v1Alias, err error) {
if err != nil {
return
} else if len(v1rs.dataKeys) == 0 {
return nil, utils.ErrNotFound
return nil, utils.ErrNoMoreData
}
v1rs.qryIdx = utils.IntPointer(0)
}

2
migrator/subscribers.go
View File

@@ -46,7 +46,7 @@ func (m *Migrator) migrateCurrentSubscribers() (err error) {
func (m *Migrator) migrateSubscribers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/suppliers.go
View File

@@ -55,7 +55,7 @@ func (m *Migrator) migrateCurrentSupplierProfile() (err error) {
func (m *Migrator) migrateSupplierProfiles() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/timings.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentTiming() (err error) {
func (m *Migrator) migrateTimings() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

2
migrator/user.go
View File

@@ -53,7 +53,7 @@ func (m *Migrator) migrateCurrentUser() (err error) {
func (m *Migrator) migrateUser() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataManager().DataDB().GetVersions("")
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,