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

added tests for migrator

Browse Source
This commit is contained in:
edwardro22
2017-12-07 09:26:43 +00:00
committed by Dan Christian Bogos
parent eeaad37b48
commit 9b1e10472b
31 changed files with 2131 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/version.go
View File

@@ -143,7 +143,7 @@ func CurrentStorDBVersions() Versions {
utils.TpFilters: 1,
utils.TpDestinationRates: 1,
utils.TpActionTriggers: 1,
utils.TpAccountActions: 1,
utils.TpAccountActionsV: 1,
utils.TpActionPlans: 1,
utils.TpActions: 1,
utils.TpDerivedCharges: 1,

114
migrator/alias.go
View File

@@ -20,6 +20,7 @@ package migrator
import (
"fmt"
//"log"
"strings"
"github.com/cgrates/cgrates/engine"
@@ -50,36 +51,43 @@ func (m *Migrator) migrateCurrentAlias() (err error) {
return
}
func (m *Migrator) migrateCurrentReverseAlias() (err error) {
var ids []string
ids, err = m.dmIN.DataDB().GetKeysForPrefix(utils.REVERSE_ALIASES_PREFIX)
if err != nil {
return err
}
for _, id := range ids {
idg := strings.TrimPrefix(id, utils.REVERSE_ALIASES_PREFIX)
// func (m *Migrator) migrateCurrentReverseAlias() (err error) {
// var ids []string
// ids, err = m.dmIN.DataDB().GetKeysForPrefix(utils.REVERSE_ALIASES_PREFIX)
// if err != nil {
// return err
// }
// log.Print("ids: ", ids)
// for _, id := range ids {
// idg := strings.TrimPrefix(id, utils.REVERSE_ALIASES_PREFIX)
// usrs, err := m.dmIN.DataDB().GetReverseAlias(idg, true, utils.NonTransactional)
// if err != nil {
// return err
// }
// log.Print(id)
// log.Print(idg)
// log.Print("values: ", usrs)
usrs, err := m.dmIN.DataDB().GetReverseAlias(idg, true, utils.NonTransactional)
if err != nil {
return err
}
for _, usr := range usrs {
alias, err := m.dmIN.DataDB().GetAlias(usr, true, utils.NonTransactional)
if err != nil {
return err
}
if alias != nil {
if m.dryRun != true {
if err := m.dmOut.DataDB().SetReverseAlias(alias, utils.NonTransactional); err != nil {
return err
}
m.stats[utils.ReverseAlias] += 1
}
}
}
}
return
}
// for _, usr := range usrs {
// log.Print(usr)
// alias, err := m.dmIN.DataDB().GetAlias(usr, true, utils.NonTransactional)
// if err != nil {
// log.Print("erorr")
// return err
// }
// if alias != nil {
// if m.dryRun != true {
// if err := m.dmOut.DataDB().SetReverseAlias(alias, utils.NonTransactional); err != nil {
// return err
// }
// m.stats[utils.ReverseAlias] += 1
// }
// }
// }
// }
// return
// }
func (m *Migrator) migrateAlias() (err error) {
var vrs engine.Versions
@@ -110,29 +118,29 @@ func (m *Migrator) migrateAlias() (err error) {
}
func (m *Migrator) migrateReverseAlias() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,
err.Error(),
fmt.Sprintf("error: <%s> when querying oldDataDB for versions", err.Error()))
} else if len(vrs) == 0 {
return utils.NewCGRError(utils.Migrator,
utils.MandatoryIEMissingCaps,
utils.UndefinedVersion,
"version number is not defined for ActionTriggers model")
}
switch vrs[utils.ReverseAlias] {
case current[utils.ReverseAlias]:
if m.sameDataDB {
return
}
if err := m.migrateCurrentReverseAlias(); err != nil {
return err
}
return
}
// var vrs engine.Versions
// current := engine.CurrentDataDBVersions()
// vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
// if err != nil {
// return utils.NewCGRError(utils.Migrator,
// utils.ServerErrorCaps,
// err.Error(),
// fmt.Sprintf("error: <%s> when querying oldDataDB for versions", err.Error()))
// } else if len(vrs) == 0 {
// return utils.NewCGRError(utils.Migrator,
// utils.MandatoryIEMissingCaps,
// utils.UndefinedVersion,
// "version number is not defined for ActionTriggers model")
// }
// switch vrs[utils.ReverseAlias] {
// case current[utils.ReverseAlias]:
// if m.sameDataDB {
// return
// }
// if err := m.migrateCurrentReverseAlias(); err != nil {
// return err
// }
// return
// }
return
}

2
migrator/derived_chargers.go
View File

@@ -40,7 +40,7 @@ func (m *Migrator) migrateCurrentDerivedChargers() (err error) {
}
if drc != nil {
if m.dryRun != true {
if err := m.dmOut.DataDB().SetDerivedChargers(id, drc, utils.NonTransactional); err != nil {
if err := m.dmOut.DataDB().SetDerivedChargers(idg, drc, utils.NonTransactional); err != nil {
return err
}
m.stats[utils.DerivedChargersV] += 1

27
migrator/destinations.go
View File

@@ -80,27 +80,34 @@ func (m *Migrator) migrateDestinations() (err error) {
func (m *Migrator) migrateCurrentReverseDestinations() (err error) {
var ids []string
var mapids []string
mappedvals := make(map[string][]string)
ids, err = m.dmIN.DataDB().GetKeysForPrefix(utils.REVERSE_DESTINATION_PREFIX)
if err != nil {
return err
}
for _, id := range ids {
id := strings.TrimPrefix(id, utils.REVERSE_DESTINATION_PREFIX)
rdst, err := m.dmIN.DataDB().GetReverseDestination(id, true, utils.NonTransactional)
if err != nil {
return err
}
for _, id := range rdst {
rdst, err := m.dmIN.DataDB().GetDestination(id, true, utils.NonTransactional)
if err != nil {
return err
if rdst != nil {
for _, rdid := range rdst {
mapids = append(mapids, rdid)
mappedvals[rdid] = append(mappedvals[rdid], id)
}
if rdst != nil {
if m.dryRun != true {
if err := m.dmOut.DataDB().SetReverseDestination(rdst, utils.NonTransactional); err != nil {
return err
}
m.stats[utils.ReverseDestinations] += 1
}
}
for _, id := range mapids {
dst := &engine.Destination{Id: id, Prefixes: mappedvals[id]}
if dst != nil {
if m.dryRun != true {
if err := m.dmOut.DataDB().SetReverseDestination(dst, utils.NonTransactional); err != nil {
return err
}
m.stats[utils.ReverseDestinations] += 1
}
}
}

12
migrator/request_filter.go → migrator/filters.go
View File

@@ -22,25 +22,27 @@ import (
"fmt"
"strings"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func (m *Migrator) migrateCurrentRequestFilter() (err error) {
var ids []string
ids, err = m.dmIN.DataDB().GetKeysForPrefix("request_filter_indexes")
tenant := config.CgrConfig().DefaultTenant
ids, err = m.dmIN.DataDB().GetKeysForPrefix(utils.FilterPrefix)
if err != nil {
return err
}
for _, id := range ids {
idg := strings.TrimPrefix(id, "request_filter_indexes")
rq, err := m.dmIN.GetReqFilterIndexes(idg)
idg := strings.TrimPrefix(id, utils.FilterPrefix+tenant+":")
fl, err := m.dmIN.GetFilter(tenant, idg, true, utils.NonTransactional)
if err != nil {
return err
}
if rq != nil {
if fl != nil {
if m.dryRun != true {
if err := m.dmOut.SetReqFilterIndexes(id, rq); err != nil {
if err := m.dmOut.SetFilter(fl); err != nil {
return err
}
m.stats[utils.RQF] += 1

14
migrator/migrator.go
View File

@@ -165,8 +165,8 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
//TPS
case utils.MetaTpRatingPlans:
err = m.migrateTPratingplans()
case utils.MetaTpLcrs:
err = m.migrateTPlcrs()
case utils.MetaTpLCRRules:
err = m.migrateTpLCRRules()
case utils.MetaTpFilters:
err = m.migrateTPfilters()
case utils.MetaTpDestinationRates:
@@ -179,7 +179,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
err = m.migrateTPactionplans()
case utils.MetaTpActions:
err = m.migrateTPactions()
case utils.MetaTpDerivedCharges:
case utils.MetaTpDerivedChargers:
err = m.migrateTPderivedchargers()
case utils.MetaTpThresholds:
err = m.migrateTPthresholds()
@@ -201,8 +201,6 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
err = m.migrateTPaliases()
case utils.MetaTpUsers:
err = m.migrateTPusers()
case utils.MetaTpDerivedChargersV:
err = m.migrateTPderivedchargers()
case utils.MetaTpCdrStats:
err = m.migrateTPcdrstats()
case utils.MetaTpDestinations:
@@ -281,8 +279,8 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
if err := m.migrateTPratingplans(); err != nil {
log.Print("ERROR: ", utils.MetaTpRatingPlans, " ", err)
}
if err := m.migrateTPlcrs(); err != nil {
log.Print("ERROR: ", utils.MetaTpLcrs, " ", err)
if err := m.migrateTpLCRRules(); err != nil {
log.Print("ERROR: ", utils.MetaTpLCRRules, " ", err)
}
if err := m.migrateTPfilters(); err != nil {
log.Print("ERROR: ", utils.MetaTpFilters, " ", err)
@@ -303,7 +301,7 @@ func (m *Migrator) Migrate(taskIDs []string) (err error, stats map[string]int) {
log.Print("ERROR: ", utils.MetaTpActions, " ", err)
}
if err := m.migrateTPderivedchargers(); err != nil {
log.Print("ERROR: ", utils.MetaTpDerivedCharges, " ", err)
log.Print("ERROR: ", utils.MetaTpDerivedChargers, " ", err)
}
if err := m.migrateTPthresholds(); err != nil {
log.Print("ERROR: ", utils.MetaTpThresholds, " ", err)

2025
migrator/migrator_it_test.go
View File

File diff suppressed because it is too large Load Diff

6
migrator/resource.go
View File

@@ -35,14 +35,14 @@ func (m *Migrator) migrateCurrentResource() (err error) {
return err
}
for _, id := range ids {
idg := strings.TrimPrefix(id, utils.ResourceProfilesPrefix)
res, err := m.dmIN.GetResource(tenant, idg, true, utils.NonTransactional)
idg := strings.TrimPrefix(id, utils.ResourceProfilesPrefix+tenant+":")
res, err := m.dmIN.GetResourceProfile(tenant, idg, true, utils.NonTransactional)
if err != nil {
return err
}
if res != nil {
if m.dryRun != true {
if err := m.dmOut.SetResource(res); err != nil {
if err := m.dmOut.SetResourceProfile(res); err != nil {
return err
}
m.stats[utils.Resource] += 1

18
migrator/thresholds.go
View File

@@ -167,8 +167,9 @@ func (m *Migrator) migrateThresholds() (err error) {
return
}
func (v2ATR v2ActionTrigger) AsThreshold() (thp *engine.ThresholdProfile, th *engine.Threshold, filter *engine.Filter, err error) {
var filterIDS []string
var filters []*engine.RequestFilter
if *v2ATR.Balance.ID != "" {
if v2ATR.Balance.ID != nil && *v2ATR.Balance.ID != "" {
if v2ATR.Balance.Directions != nil {
x, err := engine.NewRequestFilter(engine.MetaRSRFields, "Directions", v2ATR.Balance.Directions.Slice())
if err != nil {
@@ -226,22 +227,23 @@ func (v2ATR v2ActionTrigger) AsThreshold() (thp *engine.ThresholdProfile, th *en
}
filters = append(filters, x)
}
}
filter = &engine.Filter{Tenant: config.CgrConfig().DefaultTenant, ID: *v2ATR.Balance.ID, RequestFilters: filters}
th = &engine.Threshold{
Tenant: config.CgrConfig().DefaultTenant,
ID: v2ATR.ID,
}
filter = &engine.Filter{Tenant: config.CgrConfig().DefaultTenant, ID: *v2ATR.Balance.ID, RequestFilters: filters}
filterIDS = append(filterIDS, filter.ID)
}
thp = &engine.ThresholdProfile{
ID: v2ATR.ID,
Tenant: config.CgrConfig().DefaultTenant,
Weight: v2ATR.Weight,
ActivationInterval: &utils.ActivationInterval{ActivationTime: v2ATR.ActivationDate, ExpiryTime: v2ATR.ExpirationDate},
FilterIDs: []string{filter.ID},
FilterIDs: []string{},
MinSleep: v2ATR.MinSleep,
}
th = &engine.Threshold{
Tenant: config.CgrConfig().DefaultTenant,
ID: v2ATR.ID,
}
return thp, th, filter, nil
}

16
migrator/tp_account_actions.go
View File

@@ -25,8 +25,8 @@ import (
"github.com/cgrates/cgrates/utils"
)
func (m *Migrator) migrateCurrentTPaccountacction() (err error) {
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPActionTriggers)
func (m *Migrator) migrateCurrentTPaccountAcction() (err error) {
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPAccountActions)
if err != nil {
return err
}
@@ -40,7 +40,7 @@ func (m *Migrator) migrateCurrentTPaccountacction() (err error) {
if err := m.OutStorDB().SetTPAccountActions(dest); err != nil {
return err
}
m.stats[utils.TpAccountActions] += 1
m.stats[utils.TpAccountActionsV] += 1
}
}
}
@@ -49,8 +49,8 @@ func (m *Migrator) migrateCurrentTPaccountacction() (err error) {
func (m *Migrator) migrateTPaccountacction() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,
@@ -62,12 +62,12 @@ func (m *Migrator) migrateTPaccountacction() (err error) {
utils.UndefinedVersion,
"version number is not defined for ActionTriggers model")
}
switch vrs[utils.TpAccountActions] {
case current[utils.TpAccountActions]:
switch vrs[utils.TpAccountActionsV] {
case current[utils.TpAccountActionsV]:
if m.sameStorDB {
return
}
if err := m.migrateCurrentTPaccountacction(); err != nil {
if err := m.migrateCurrentTPaccountAcction(); err != nil {
return err
}
return

6
migrator/tp_action_plans.go
View File

@@ -31,7 +31,7 @@ func (m *Migrator) migrateCurrentTPactionplans() (err error) {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActionPlans, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActionPlans, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -55,8 +55,8 @@ func (m *Migrator) migrateCurrentTPactionplans() (err error) {
func (m *Migrator) migrateTPactionplans() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_action_triggers.go
View File

@@ -31,7 +31,7 @@ func (m *Migrator) migrateCurrentTPactiontriggers() (err error) {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActionTriggers, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActionTriggers, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -55,8 +55,8 @@ func (m *Migrator) migrateCurrentTPactiontriggers() (err error) {
func (m *Migrator) migrateTPactiontriggers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_actions.go
View File

@@ -31,7 +31,7 @@ func (m *Migrator) migrateCurrentTPactions() (err error) {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActions, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPActions, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -55,8 +55,8 @@ func (m *Migrator) migrateCurrentTPactions() (err error) {
func (m *Migrator) migrateTPactions() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

13
migrator/tp_aliases.go
View File

@@ -31,13 +31,16 @@ func (m *Migrator) migrateCurrentTPaliases() (err error) {
return err
}
for _, tpid := range tpids {
dest, err := m.InStorDB().GetTPAliases(&utils.TPAliases{TPid: tpid})
dests, err := m.InStorDB().GetTPAliases(&utils.TPAliases{TPid: tpid})
if err != nil {
return err
}
if dest != nil {
for _, dest := range dests {
dest.TPid = tpid
}
if dests != nil {
if m.dryRun != true {
if err := m.OutStorDB().SetTPAliases(dest); err != nil {
if err := m.OutStorDB().SetTPAliases(dests); err != nil {
return err
}
m.stats[utils.TpAliases] += 1
@@ -50,8 +53,8 @@ func (m *Migrator) migrateCurrentTPaliases() (err error) {
func (m *Migrator) migrateTPaliases() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_cdr_stats.go
View File

@@ -31,7 +31,7 @@ func (m *Migrator) migrateCurrentTPcdrstats() (err error) {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPCdrStats, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPCdrStats, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -55,8 +55,8 @@ func (m *Migrator) migrateCurrentTPcdrstats() (err error) {
func (m *Migrator) migrateTPcdrstats() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

4
migrator/tp_derived_chargers.go
View File

@@ -51,8 +51,8 @@ func (m *Migrator) migrateCurrentTPderivedchargers() (err error) {
func (m *Migrator) migrateTPderivedchargers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

9
migrator/tp_destination_rates.go
View File

@@ -26,13 +26,12 @@ import (
)
func (m *Migrator) migrateCurrentTPdestinationrates() (err error) {
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPRatingPlans)
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPDestinationRates)
if err != nil {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPRatingPlans, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPDestinationRates, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -56,8 +55,8 @@ func (m *Migrator) migrateCurrentTPdestinationrates() (err error) {
func (m *Migrator) migrateTPdestinationrates() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

7
migrator/tp_destinations.go
View File

@@ -30,9 +30,8 @@ func (m *Migrator) migrateCurrentTPDestinations() (err error) {
if err != nil {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPDestinations, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPDestinations, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -56,8 +55,8 @@ func (m *Migrator) migrateCurrentTPDestinations() (err error) {
func (m *Migrator) migrateTPDestinations() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_filters.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPfilters() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPFilters, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPFilters, utils.TPDistinctIds{"id"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -56,8 +56,8 @@ func (m *Migrator) migrateCurrentTPfilters() (err error) {
func (m *Migrator) migrateTPfilters() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

11
migrator/tp_lcrs.go → migrator/tp_lcr_rules.go
View File

@@ -25,12 +25,11 @@ import (
"github.com/cgrates/cgrates/utils"
)
func (m *Migrator) migrateCurrentTPlcrs() (err error) {
func (m *Migrator) migrateCurrentTpLCRRules() (err error) {
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPLcrs)
if err != nil {
return err
}
for _, tpid := range tpids {
dest, err := m.InStorDB().GetTPLCRs(&utils.TPLcrRules{TPid: tpid})
if err != nil {
@@ -48,10 +47,10 @@ func (m *Migrator) migrateCurrentTPlcrs() (err error) {
return
}
func (m *Migrator) migrateTPlcrs() (err error) {
func (m *Migrator) migrateTpLCRRules() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,
@@ -68,7 +67,7 @@ func (m *Migrator) migrateTPlcrs() (err error) {
if m.sameStorDB {
return
}
if err := m.migrateCurrentTPcdrstats(); err != nil {
if err := m.migrateCurrentTpLCRRules(); err != nil {
return err
}
return

9
migrator/tp_rates.go
View File

@@ -26,13 +26,12 @@ import (
)
func (m *Migrator) migrateCurrentTPrates() (err error) {
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPDestinations)
tpids, err := m.InStorDB().GetTpIds(utils.TBLTPRates)
if err != nil {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPDestinations, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPRates, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +56,8 @@ func (m *Migrator) migrateCurrentTPrates() (err error) {
func (m *Migrator) migrateTPrates() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

30
migrator/tp_rating_plans.go
View File

@@ -30,24 +30,24 @@ func (m *Migrator) migrateCurrentTPratingplans() (err error) {
if err != nil {
return err
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPRatingPlans, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPRatingPlans, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
for _, id := range ids {
rps, err := m.InStorDB().GetTPRatingPlans(tpid, id, nil)
if err != nil {
return err
}
if rps != nil {
if m.dryRun != true {
if err := m.InStorDB().SetTPRatingPlans(rps); err != nil {
return err
if len(ids) != 0 {
for _, id := range ids {
rps, err := m.InStorDB().GetTPRatingPlans(tpid, id, nil)
if err != nil {
return err
}
if rps != nil {
if m.dryRun != true {
if err := m.OutStorDB().SetTPRatingPlans(rps); err != nil {
return err
}
m.stats[utils.TpRatingPlans] += 1
}
m.stats[utils.TpRatingPlans] += 1
}
}
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPratingplans() (err error) {
func (m *Migrator) migrateTPratingplans() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

4
migrator/tp_rating_profiles.go
View File

@@ -51,8 +51,8 @@ func (m *Migrator) migrateCurrentTPratingprofiles() (err error) {
func (m *Migrator) migrateTPratingprofiles() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_resources.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPresources() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPResources, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPResources, utils.TPDistinctIds{"id"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPresources() (err error) {
func (m *Migrator) migrateTPresources() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_shared_groups.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPsharedgroups() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPSharedGroups, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPSharedGroups, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPsharedgroups() (err error) {
func (m *Migrator) migrateTPsharedgroups() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_stats.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPstats() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPStats, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPStats, utils.TPDistinctIds{"id"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPstats() (err error) {
func (m *Migrator) migrateTPstats() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

4
migrator/tp_suppliers.go
View File

@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPSuppliers() (err error) {
func (m *Migrator) migrateTPSuppliers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLTPSuppliers)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLTPSuppliers)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_thresholds.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPthresholds() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPThresholds, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPThresholds, utils.TPDistinctIds{"id"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPthresholds() (err error) {
func (m *Migrator) migrateTPthresholds() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

6
migrator/tp_timings.go
View File

@@ -32,7 +32,7 @@ func (m *Migrator) migrateCurrentTPTiming() (err error) {
}
for _, tpid := range tpids {
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPTimings, utils.TPDistinctIds{}, map[string]string{}, nil)
ids, err := m.InStorDB().GetTpTableIds(tpid, utils.TBLTPTimings, utils.TPDistinctIds{"tag"}, map[string]string{}, nil)
if err != nil {
return err
}
@@ -57,8 +57,8 @@ func (m *Migrator) migrateCurrentTPTiming() (err error) {
func (m *Migrator) migrateTpTimings() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

4
migrator/tp_users.go
View File

@@ -51,8 +51,8 @@ func (m *Migrator) migrateCurrentTPusers() (err error) {
func (m *Migrator) migrateTPusers() (err error) {
var vrs engine.Versions
current := engine.CurrentDataDBVersions()
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
current := engine.CurrentStorDBVersions()
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,

7
utils/consts.go
View File

@@ -512,7 +512,7 @@ const (
TpFilters = "TpFilters"
TpDestinationRates = "TpDestinationRates"
TpActionTriggers = "TpActionTriggers"
TpAccountActions = "TpAccountActions"
TpAccountActionsV = "TpAccountActions"
TpActionPlans = "TpActionPlans"
TpActions = "TpActions"
TpDerivedCharges = "TpDerivedCharges"
@@ -562,14 +562,14 @@ const (
MetaSubscribers = "*Subscribers"
MetaDerivedChargersV = "*DerivedChargers"
MetaTpRatingPlans = "*TpRatingPlans"
MetaTpLcrs = "*TpLcrs"
MetaTpLCRRules = "*TpLcrs"
MetaTpFilters = "*TpFilters"
MetaTpDestinationRates = "*TpDestinationRates"
MetaTpActionTriggers = "*TpActionTriggers"
MetaTpAccountActions = "*TpAccountActions"
MetaTpActionPlans = "*TpActionPlans"
MetaTpActions = "*TpActions"
MetaTpDerivedCharges = "*TpDerivedCharges"
MetaTpDerivedChargers = "*TpDerivedCharges"
MetaTpThresholds = "*TpThresholds"
MetaTpSuppliers = "*TpSuppliers"
MetaTpStats = "*TpStats"
@@ -584,7 +584,6 @@ const (
MetaTpDerivedChargersV = "*TpDerivedChargers"
MetaTpCdrStats = "*TpCdrStats"
MetaTpDestinations = "*TpDestinations"
MetaTpLCR = "*TpLCR"
MetaTpRatingPlan = "*TpRatingPlan"
MetaTpRatingProfile = "*TpRatingProfile"
MetaStorDB = "*stordb"