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

Minor fixes in migrator

Browse Source
This commit is contained in:
adragusin
2020-06-16 17:56:15 +03:00
committed by Dan Christian Bogos
parent 310a9158a2
commit 926d4d2cd9
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
migrator/thresholds.go
View File

@@ -185,8 +185,11 @@ func (m *Migrator) migrateV2Thresholds() (err error) {
if m.dryRun {
return
}
if err = m.removeV2Thresholds(); err != nil && err != utils.ErrNoMoreData {
return
if !m.sameDataDB {
if err = m.removeV2Thresholds(); err != nil && err != utils.ErrNoMoreData {
return
}
}
// All done, update version wtih current one
vrs := engine.Versions{utils.Thresholds: engine.CurrentDataDBVersions()[utils.Thresholds]}

35
migrator/thresholds_it_test.go
View File

@@ -157,9 +157,14 @@ func testTrsITConnect(t *testing.T) {
if err != nil {
log.Fatal(err)
}
trsMigrator, err = NewMigrator(dataDBIn, dataDBOut,
nil, nil,
false, false, false, false)
if !reflect.DeepEqual(trsCfgIn, trsCfgOut) {
trsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil,
false, true, false, false)
} else {
trsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil,
false, false, false, false)
}
if err != nil {
log.Fatal(err)
}
@@ -367,16 +372,20 @@ func testTrsITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when getting Thresholds ", err.Error())
}
if !reflect.DeepEqual(tresProf.ID, result.ID) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.ID, result.ID)
} else if !reflect.DeepEqual(tresProf.Tenant, result.Tenant) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.Tenant, result.Tenant)
} else if !reflect.DeepEqual(tresProf.Weight, result.Weight) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.Weight, result.Weight)
} else if !reflect.DeepEqual(tresProf.ActivationInterval, result.ActivationInterval) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.ActivationInterval, result.ActivationInterval)
} else if !reflect.DeepEqual(tresProf.MinSleep, result.MinSleep) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.MinSleep, result.MinSleep)
if result != nil {
if !reflect.DeepEqual(tresProf.ID, result.ID) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.ID, result.ID)
} else if !reflect.DeepEqual(tresProf.Tenant, result.Tenant) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.Tenant, result.Tenant)
} else if !reflect.DeepEqual(tresProf.Weight, result.Weight) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.Weight, result.Weight)
} else if !reflect.DeepEqual(tresProf.ActivationInterval, result.ActivationInterval) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.ActivationInterval, result.ActivationInterval)
} else if !reflect.DeepEqual(tresProf.MinSleep, result.MinSleep) {
t.Errorf("Expecting: %+v, received: %+v", tresProf.MinSleep, result.MinSleep)
}
} else {
t.Error("result is nil")
}
}
}