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

Renamed migrator const to match what they contain

Browse Source
This commit is contained in:
Trial97
2019-02-18 13:14:25 +02:00
committed by Dan Christian Bogos
parent 044859eebb
commit fd49d3194b
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
migrator/alias_it_test.go
View File

@@ -197,7 +197,7 @@ func testAlsITMigrateAndMove(t *testing.T) {
t.Errorf("Unexpected version returned: %d", vrs[Alias])
}
//migrate alias
err, _ = alsMigrator.Migrate([]string{MetaAlias})
err, _ = alsMigrator.Migrate([]string{MetaAliases})
if err != nil {
t.Error("Error when migrating Alias ", err.Error())
}
@@ -238,7 +238,7 @@ func testAlsITMigrateAndMove(t *testing.T) {
t.Error("Error when setting version for Alias ", err.Error())
}
//migrate accounts
err, _ = alsMigrator.Migrate([]string{MetaAlias})
err, _ = alsMigrator.Migrate([]string{MetaAliases})
if err != nil {
t.Error("Error when alsMigratorrating Alias ", err.Error())
}

26
migrator/migrator.go
View File

@@ -48,7 +48,7 @@ func NewMigrator(
return m, err
}
var MetaAlias = "*aliases"
const MetaAliases = "*aliases"
type Migrator struct {
dmIN MigratorDataDB
@@ -113,21 +113,21 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
//only Move
case utils.MetaRatingPlans:
err = m.migrateRatingPlans()
case utils.MetaRatingProfile:
case utils.MetaRatingProfiles:
err = m.migrateRatingProfiles()
case utils.MetaDestinations:
err = m.migrateDestinations()
case utils.MetaReverseDestinations:
err = m.migrateReverseDestinations()
case utils.MetaTiming:
case utils.MetaTimings:
err = m.migrateTimings()
case utils.MetaReqFilters:
err = m.migrateRequestFilter()
case utils.MetaResource:
case utils.MetaResources:
err = m.migrateResources()
case MetaAlias:
case MetaAliases:
err = m.migrateAlias()
case utils.MetaUser:
case utils.MetaUsers:
err = m.migrateUser()
case utils.MetaSubscribers:
err = m.migrateSubscribers()
@@ -170,7 +170,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
err = m.migrateTPresources()
case utils.MetaTpRates:
err = m.migrateTPrates()
case utils.MetaTpTiming:
case utils.MetaTpTimings:
err = m.migrateTpTimings()
case utils.MetaTpDestinations:
err = m.migrateTPDestinations()
@@ -211,7 +211,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
log.Print("ERROR: ", utils.MetaRatingPlans, " ", err)
}
if err := m.migrateRatingProfiles(); err != nil {
log.Print("ERROR: ", utils.MetaRatingProfile, " ", err)
log.Print("ERROR: ", utils.MetaRatingProfiles, " ", err)
}
if err := m.migrateDestinations(); err != nil {
log.Print("ERROR: ", utils.MetaDestinations, " ", err)
@@ -220,19 +220,19 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
log.Print("ERROR: ", utils.MetaReverseDestinations, " ", err)
}
if err := m.migrateTimings(); err != nil {
log.Print("ERROR: ", utils.MetaTiming, " ", err)
log.Print("ERROR: ", utils.MetaTimings, " ", err)
}
if err := m.migrateRequestFilter(); err != nil {
log.Print("ERROR: ", utils.MetaReqFilters, " ", err)
}
if err := m.migrateResources(); err != nil {
log.Print("ERROR: ", utils.MetaResource, " ", err)
log.Print("ERROR: ", utils.MetaResources, " ", err)
}
if err := m.migrateAlias(); err != nil {
log.Print("ERROR: ", MetaAlias, " ", err)
log.Print("ERROR: ", MetaAliases, " ", err)
}
if err := m.migrateUser(); err != nil {
log.Print("ERROR: ", utils.MetaUser, " ", err)
log.Print("ERROR: ", utils.MetaUsers, " ", err)
}
if err := m.migrateSubscribers(); err != nil {
log.Print("ERROR: ", utils.MetaSubscribers, " ", err)
@@ -289,7 +289,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
log.Print("ERROR: ", utils.MetaTpRates, " ", err)
}
if err := m.migrateTpTimings(); err != nil {
log.Print("ERROR: ", utils.MetaTpTiming, " ", err)
log.Print("ERROR: ", utils.MetaTpTimings, " ", err)
}
if err := m.migrateTPderivedchargers(); err != nil {
log.Print("ERROR: ", utils.MetaTpDerivedChargersV, " ", err)

2
migrator/tp_timings_it_test.go
View File

@@ -129,7 +129,7 @@ func testTpTimITPopulate(t *testing.T) {
}
func testTpTimITMove(t *testing.T) {
err, _ := tpTimMigrator.Migrate([]string{utils.MetaTpTiming})
err, _ := tpTimMigrator.Migrate([]string{utils.MetaTpTimings})
if err != nil {
t.Error("Error when migrating TpTimings ", err.Error())
}

4
migrator/user_it_test.go
View File

@@ -188,7 +188,7 @@ func testUsrITMigrateAndMove(t *testing.T) {
t.Errorf("Unexpected version returned: %d", vrs[utils.User])
}
//migrate user
err, _ = usrMigrator.Migrate([]string{utils.MetaUser})
err, _ = usrMigrator.Migrate([]string{utils.MetaUsers})
if err != nil {
t.Error("Error when migrating User ", err.Error())
}
@@ -229,7 +229,7 @@ func testUsrITMigrateAndMove(t *testing.T) {
t.Error("Error when setting version for User ", err.Error())
}
//migrate accounts
err, _ = usrMigrator.Migrate([]string{utils.MetaUser})
err, _ = usrMigrator.Migrate([]string{utils.MetaUsers})
if err != nil {
t.Error("Error when usrMigratorrating User ", err.Error())
}

9
utils/consts.go
View File

@@ -470,15 +470,14 @@ const (
RatingPlan = "RatingPlan"
RatingProfile = "RatingProfile"
MetaRatingPlans = "*ratingplans"
MetaRatingProfile = "*ratingprofiles"
MetaRatingProfiles = "*ratingprofiles"
MetaDestinations = "*destinations"
MetaReverseDestinations = "*reversedestinations"
MetaLCR = "*lcr"
MetaCdrStats = "*cdrstats"
MetaTiming = "*timings"
MetaTimings = "*timings"
MetaReqFilters = "*reqfilters"
MetaResource = "*resources"
MetaUser = "*users"
MetaUsers = "*users"
MetaSubscribers = "*subscribers"
MetaDerivedChargersV = "*derivedchargers"
MetaStorDB = "*stordb"
@@ -622,7 +621,7 @@ const (
MetaTpRatingProfiles = "*tp_rating_profiles"
MetaTpResources = "*tp_resources"
MetaTpRates = "*tp_rates"
MetaTpTiming = "*tp_timing"
MetaTpTimings = "*tp_timings"
MetaTpResource = "*tp_resources"
MetaTpDerivedChargersV = "*tp_derived_chargers"
MetaTpCdrStats = "*tp_cdrstats"