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 migrate option for filters

Browse Source
This commit is contained in:
Trial97
2019-03-08 15:39:08 +02:00
committed by Dan Christian Bogos
parent ee1cd56f6d
commit a9d64b4c97
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
migrator/derived_chargers_it_test.go
View File

@@ -230,7 +230,7 @@ func testDCITMigrateAndMove(t *testing.T) {
},
}
if dcidx, err := dcMigrator.dmOut.DataManager().GetFilterIndexes(utils.PrefixToIndexCache[utils.AttributeProfilePrefix],
utils.ConcatenatedKey("cgrates.org", utils.META_ANY), utils.MetaString, nil); err != nil {
utils.ConcatenatedKey("cgrates.org", utils.MetaChargers), utils.MetaString, nil); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expDcIdx, dcidx) {
t.Errorf("Expected %v, recived: %v", utils.ToJSON(expDcIdx), utils.ToJSON(dcidx))
@@ -241,7 +241,7 @@ func testDCITMigrateAndMove(t *testing.T) {
},
}
if dcidx, err := dcMigrator.dmOut.DataManager().GetFilterIndexes(utils.PrefixToIndexCache[utils.ChargerProfilePrefix],
utils.ConcatenatedKey("cgrates.org", utils.META_ANY),
utils.ConcatenatedKey("cgrates.org", utils.MetaChargers),
utils.MetaString, nil); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expected error %v, recived: %v with reply: %v", utils.ErrNotFound, err, utils.ToJSON(dcidx))
}

2
migrator/filters.go
View File

@@ -136,7 +136,7 @@ func (m *Migrator) migrateRequestFilterV1() (err error) {
return
}
func (m *Migrator) migrateRequestFilter() (err error) {
func (m *Migrator) migrateFilters() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmIN.DataManager().DataDB().GetVersions("")

4
migrator/filters_it_test.go
View File

@@ -203,7 +203,7 @@ func testFltrITMigrateAndMove(t *testing.T) {
t.Errorf("Unexpected version returned: %d", vrs[utils.RQF])
}
//migrate Filters
err, _ = fltrMigrator.Migrate([]string{utils.MetaReqFilters})
err, _ = fltrMigrator.Migrate([]string{utils.MetaFilters})
if err != nil {
t.Error("Error when migrating Filters ", err.Error())
}
@@ -250,7 +250,7 @@ func testFltrITMigrateAndMove(t *testing.T) {
t.Error("Error when setting version for Filters ", err.Error())
}
//migrate accounts
err, _ = fltrMigrator.Migrate([]string{utils.MetaReqFilters})
err, _ = fltrMigrator.Migrate([]string{utils.MetaFilters})
if err != nil {
t.Error("Error when fltrMigratorrating Filters ", err.Error())
}

8
migrator/migrator.go
View File

@@ -119,8 +119,8 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
err = m.migrateReverseDestinations()
case utils.MetaTimings:
err = m.migrateTimings()
case utils.MetaReqFilters:
err = m.migrateRequestFilter()
case utils.MetaFilters:
err = m.migrateFilters()
case utils.MetaResources:
err = m.migrateResources()
case MetaAliases:
@@ -218,8 +218,8 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
if err := m.migrateTimings(); err != nil {
log.Print("ERROR: ", utils.MetaTimings, " ", err)
}
if err := m.migrateRequestFilter(); err != nil {
log.Print("ERROR: ", utils.MetaReqFilters, " ", err)
if err := m.migrateFilters(); err != nil {
log.Print("ERROR: ", utils.MetaFilters, " ", err)
}
if err := m.migrateResources(); err != nil {
log.Print("ERROR: ", utils.MetaResources, " ", err)

1
utils/consts.go
View File

@@ -472,7 +472,6 @@ const (
MetaLCR = "*lcr"
MetaCdrStats = "*cdrstats"
MetaTimings = "*timings"
MetaReqFilters = "*reqfilters"
MetaUsers = "*users"
MetaSubscribers = "*subscribers"
MetaDerivedChargersV = "*derivedchargers"