From b243aaf3d0f7fa6e15835044f0c2c652b421bb04 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 15 Jan 2019 14:19:54 +0200 Subject: [PATCH] Fixed some migrator integration tests --- migrator/accounts2_it_test.go | 7 ++++--- migrator/accounts_it_test.go | 25 ++++++++++++++++++++--- migrator/action_it_test.go | 36 ++++++++++++++++++++++++++++++--- migrator/action_plan_it_test.go | 10 +++++++-- migrator/attributes_it_test.go | 7 +++---- migrator/migrator.go | 14 +++++++------ migrator/sharedgroup_it_test.go | 12 +++++++++-- migrator/stats_it_test.go | 5 +++-- migrator/thresholds_it_test.go | 24 ++++++++++++++++++---- 9 files changed, 111 insertions(+), 29 deletions(-) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 568c865ce..87b69e67b 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -216,13 +216,14 @@ func testAcc2ITMigrate(t *testing.T) { utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, - utils.SharedGroups: 2} - err = acc2Migrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + utils.SharedGroups: 2, + } + err = acc2Migrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Accounts ", err.Error()) } //check if version was set correctly - if vrs, err := acc2Migrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil { + if vrs, err := acc2Migrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil { t.Error(err) } else if vrs[utils.Accounts] != 1 { t.Errorf("Unexpected version returned: %d", vrs[utils.Accounts]) diff --git a/migrator/accounts_it_test.go b/migrator/accounts_it_test.go index fcd17deb8..5983bc8f3 100755 --- a/migrator/accounts_it_test.go +++ b/migrator/accounts_it_test.go @@ -101,6 +101,24 @@ func TestAccountITMove(t *testing.T) { } } +func TestAccountITMigrateMongo2Redis(t *testing.T) { + var err error + accPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo") + accCfgIn, err = config.NewCGRConfigFromFolder(accPathIn) + if err != nil { + t.Fatal(err) + } + accPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + accCfgOut, err = config.NewCGRConfigFromFolder(accPathOut) + if err != nil { + t.Fatal(err) + } + accAction = utils.Migrate + for _, stest := range sTestsAccIT { + t.Run("TestAccountITMigrateMongo2Redis", stest) + } +} + func TestAccountITMoveEncoding(t *testing.T) { var err error accPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo") @@ -262,13 +280,14 @@ func testAccITMigrateAndMove(t *testing.T) { utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, - utils.SharedGroups: 2} - err = accMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + utils.SharedGroups: 2, + } + err = accMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Accounts ", err.Error()) } //check if version was set correctly - if vrs, err := accMigrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil { + if vrs, err := accMigrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil { t.Error(err) } else if vrs[utils.Accounts] != 1 { t.Errorf("Unexpected version returned: %d", vrs[utils.Accounts]) diff --git a/migrator/action_it_test.go b/migrator/action_it_test.go index 061920cde..d06cf2e86 100644 --- a/migrator/action_it_test.go +++ b/migrator/action_it_test.go @@ -117,6 +117,25 @@ func TestActionITMoveEncoding(t *testing.T) { } /* +func TestActionITMigrateMongo2Redis(t *testing.T) { + var err error + actPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo") + actCfgIn, err = config.NewCGRConfigFromFolder(actPathIn) + if err != nil { + t.Fatal(err) + } + actPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + actCfgOut, err = config.NewCGRConfigFromFolder(actPathOut) + if err != nil { + t.Fatal(err) + } + actAction = utils.Migrate + for _, stest := range sTestsActIT { + t.Run("TestActionITMigrateMongo2Redis", stest) + } +} +*/ + func TestActionITMoveEncoding2(t *testing.T) { var err error actPathIn = path.Join(*dataDir, "conf", "samples", "tutmysql") @@ -133,7 +152,7 @@ func TestActionITMoveEncoding2(t *testing.T) { for _, stest := range sTestsActIT { t.Run("TestActionITMoveEncoding2", stest) } -}*/ +} func testActITConnect(t *testing.T) { dataDBIn, err := NewMigratorDataDB(actCfgIn.DataDbCfg().DataDbType, @@ -166,6 +185,9 @@ func testActITFlush(t *testing.T) { if err := engine.SetDBVersions(actMigrator.dmIN.DataManager().DataDB()); err != nil { t.Error("Error ", err.Error()) } + if err := engine.SetDBVersions(actMigrator.dmOut.DataManager().DataDB()); err != nil { + t.Error("Error ", err.Error()) + } } func testActITMigrateAndMove(t *testing.T) { @@ -212,8 +234,16 @@ func testActITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when setting v1 Actions ", err.Error()) } - currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 1, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2} - err = actMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion := engine.Versions{ + utils.StatS: 2, + utils.Thresholds: 2, + utils.Accounts: 2, + utils.Actions: 1, + utils.ActionTriggers: 2, + utils.ActionPlans: 2, + utils.SharedGroups: 2, + } + err = actMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Actions ", err.Error()) } diff --git a/migrator/action_plan_it_test.go b/migrator/action_plan_it_test.go index ab4bccf08..0a927b40f 100644 --- a/migrator/action_plan_it_test.go +++ b/migrator/action_plan_it_test.go @@ -202,8 +202,14 @@ func testActPlnITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when setting v1 ActionPlan ", err.Error()) } - currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 1, utils.SharedGroups: 2} - err = actPlnMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion := engine.Versions{ + utils.StatS: 2, utils.Thresholds: 2, + utils.Accounts: 2, utils.Actions: 2, + utils.ActionTriggers: 2, + utils.ActionPlans: 1, + utils.SharedGroups: 2, + } + err = actPlnMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for ActionPlan ", err.Error()) } diff --git a/migrator/attributes_it_test.go b/migrator/attributes_it_test.go index c9ee711e3..1b0d9dc72 100755 --- a/migrator/attributes_it_test.go +++ b/migrator/attributes_it_test.go @@ -243,14 +243,13 @@ func testAttrITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when setting v1 AttributeProfile ", err.Error()) } - currentVersion := engine.Versions{ - utils.Attributes: 1} - err = attrMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion := engine.Versions{utils.Attributes: 1} + err = attrMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Attributes ", err.Error()) } - if vrs, err := attrMigrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil { + if vrs, err := attrMigrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil { t.Error(err) } else if vrs[utils.Attributes] != 1 { t.Errorf("Unexpected version returned: %d", vrs[utils.Attributes]) diff --git a/migrator/migrator.go b/migrator/migrator.go index fc8483b94..cb031bc40 100755 --- a/migrator/migrator.go +++ b/migrator/migrator.go @@ -36,12 +36,14 @@ func NewMigrator( sameStorDB bool) (m *Migrator, err error) { stats := make(map[string]int) m = &Migrator{ - dmOut: dmOut, - dmIN: dmIN, - storDBIn: storDBIn, - storDBOut: storDBOut, - dryRun: dryRun, sameDataDB: sameDataDB, sameStorDB: sameStorDB, - stats: stats, + dmOut: dmOut, + dmIN: dmIN, + storDBIn: storDBIn, + storDBOut: storDBOut, + dryRun: dryRun, + sameDataDB: sameDataDB, + sameStorDB: sameStorDB, + stats: stats, } return m, err } diff --git a/migrator/sharedgroup_it_test.go b/migrator/sharedgroup_it_test.go index 16425f649..805553cb6 100644 --- a/migrator/sharedgroup_it_test.go +++ b/migrator/sharedgroup_it_test.go @@ -188,8 +188,16 @@ func testShrGrpITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when setting v1 SharedGroup ", err.Error()) } - currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 1} - err = shrGrpMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion := engine.Versions{ + utils.StatS: 2, + utils.Thresholds: 2, + utils.Accounts: 2, + utils.Actions: 2, + utils.ActionTriggers: 2, + utils.ActionPlans: 2, + utils.SharedGroups: 1, + } + err = shrGrpMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for SharedGroup ", err.Error()) } diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index ca7ce5d89..8d88bc676 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -245,8 +245,9 @@ func testStsITMigrateAndMove(t *testing.T) { utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, - utils.SharedGroups: 2} - err = stsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + utils.SharedGroups: 2, + } + err = stsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for stats ", err.Error()) } diff --git a/migrator/thresholds_it_test.go b/migrator/thresholds_it_test.go index 9e2cab62e..87dd3981a 100644 --- a/migrator/thresholds_it_test.go +++ b/migrator/thresholds_it_test.go @@ -276,8 +276,16 @@ func testTrsITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when setting v1 Thresholds ", err.Error()) } - currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 1, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2} - err = trsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion := engine.Versions{ + utils.StatS: 2, + utils.Thresholds: 1, + utils.Accounts: 2, + utils.Actions: 2, + utils.ActionTriggers: 2, + utils.ActionPlans: 2, + utils.SharedGroups: 2, + } + err = trsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Thresholds ", err.Error()) } @@ -310,8 +318,16 @@ func testTrsITMigrateAndMove(t *testing.T) { t.Error("Error when setting v1 Thresholds ", err.Error()) } - currentVersion = engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2} - err = trsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false) + currentVersion = engine.Versions{ + utils.StatS: 2, + utils.Thresholds: 2, + utils.Accounts: 2, + utils.Actions: 2, + utils.ActionTriggers: 2, + utils.ActionPlans: 2, + utils.SharedGroups: 2, + } + err = trsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for Thresholds ", err.Error()) }