diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index 29acf94d9..e5d826c74 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -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)) } diff --git a/migrator/filters.go b/migrator/filters.go index ab7ac4e9b..76fde14a9 100644 --- a/migrator/filters.go +++ b/migrator/filters.go @@ -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("") diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index 2bc019b20..5cd601173 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -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()) } diff --git a/migrator/migrator.go b/migrator/migrator.go index e3eeba90e..21f21aa98 100755 --- a/migrator/migrator.go +++ b/migrator/migrator.go @@ -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) diff --git a/utils/consts.go b/utils/consts.go index 45172ddfc..fdc2bb3e2 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -472,7 +472,6 @@ const ( MetaLCR = "*lcr" MetaCdrStats = "*cdrstats" MetaTimings = "*timings" - MetaReqFilters = "*reqfilters" MetaUsers = "*users" MetaSubscribers = "*subscribers" MetaDerivedChargersV = "*derivedchargers"