uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 10:06:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Updated tests after remove

Browse Source
This commit is contained in:
Trial97
2021-04-01 09:35:23 +03:00
committed by Dan Christian Bogos
parent 21d4dd16fa
commit 1d67bca260
50 changed files with 77 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
migrator/accounts.go
View File

@@ -232,13 +232,12 @@ type v1UnitsCounter struct {
}
type v2Account struct {
ID string
BalanceMap map[string]engine.Balances
UnitCounters engine.UnitCounters
ActionTriggers engine.ActionTriggers
AllowNegative bool
Disabled bool
executingTriggers bool
ID string
BalanceMap map[string]engine.Balances
UnitCounters engine.UnitCounters
ActionTriggers engine.ActionTriggers
AllowNegative bool
Disabled bool
}
func (b *v1Balance) IsDefault() bool {
@@ -248,7 +247,7 @@ func (b *v1Balance) IsDefault() bool {
b.ExpirationDate.IsZero() &&
b.SharedGroup == "" &&
b.Weight == 0 &&
b.Disabled == false
!b.Disabled
}
func (v1Acc v1Account) V1toV3Account() (ac *engine.Account) {
@@ -331,7 +330,7 @@ func (v1Acc v1Account) V1toV3Account() (ac *engine.Account) {
if oldUcBal.TimingIDs != "" {
bf.TimingIDs = utils.StringMapPointer(utils.ParseStringMap(oldUcBal.TimingIDs))
}
if oldUcBal.Disabled != false {
if oldUcBal.Disabled {
bf.Disabled = utils.BoolPointer(oldUcBal.Disabled)
}
bf.Timings = oldUcBal.Timings

17
migrator/action.go
View File

@@ -62,21 +62,6 @@ func (m *Migrator) migrateCurrentActions() (err error) {
return
}
func (m *Migrator) removeV1Actions() (err error) {
var v1 *v1Actions
for {
if v1, err = m.dmIN.getV1Actions(); err != nil && err != utils.ErrNoMoreData {
return err
}
if v1 == nil {
return nil
}
if err = m.dmIN.remV1Actions(*v1); err != nil {
return err
}
}
}
func (m *Migrator) migrateV1Actions() (acts engine.Actions, err error) {
var v1ACs *v1Actions
@@ -191,7 +176,7 @@ func (v1Act v1Action) AsAction() (act *engine.Action) {
if v1Act.Balance.Weight != 0 {
bf.Weight = utils.Float64Pointer(v1Act.Balance.Weight)
}
if v1Act.Balance.Disabled != false {
if v1Act.Balance.Disabled {
bf.Disabled = utils.BoolPointer(v1Act.Balance.Disabled)
}
if !v1Act.Balance.ExpirationDate.IsZero() {

3
migrator/action_plan.go
View File

@@ -21,7 +21,6 @@ package migrator
import (
"fmt"
"strings"
"time"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
@@ -34,8 +33,6 @@ type v1ActionPlan struct {
Timing *engine.RateInterval
Weight float64
ActionsId string
actions v1Actions
stCache time.Time // cached time of the next start
}
type v1ActionPlans []*v1ActionPlan

1
migrator/action_trigger.go
View File

@@ -47,7 +47,6 @@ type v1ActionTrigger struct {
ActionsId string
MinQueuedItems int // Trigger actions only if this number is hit (stats only)
Executed bool
lastExecutionTime time.Time
}
type v1ActionTriggers []*v1ActionTrigger

24
migrator/attributes.go
View File

@@ -75,26 +75,6 @@ func (m *Migrator) migrateCurrentAttributeProfile() (err error) {
return
}
// migrateV1ToV2Attributes migrates attributeProfile from v1 to v2
// for the moment the system in using the shortcut from v1 to v4
func (m *Migrator) migrateV1ToV2Attributes() (v2Attr *v2AttributeProfile, err error) {
var v1Attr *v1AttributeProfile
v1Attr, err = m.dmIN.getV1AttributeProfile()
if err != nil {
return nil, err
} else if v1Attr == nil {
return nil, errors.New("Attribute NIL")
}
v2Attr, err = v1Attr.AsAttributeProfile()
if err != nil {
return nil, err
}
return
}
func (m *Migrator) migrateV1ToV4AttributeProfile() (v4Attr *v4AttributeProfile, err error) {
var v1Attr *v1AttributeProfile
v1Attr, err = m.dmIN.getV1AttributeProfile()
@@ -306,7 +286,7 @@ func (v2AttrPrf v2AttributeProfile) AsAttributeProfile() (attrPrf *v3AttributePr
for _, attr := range v2AttrPrf.Attributes {
filterIDs := make([]string, 0)
//append false translate to if FieldName exist do stuff
if attr.Append == false {
if !attr.Append {
filterIDs = append(filterIDs, utils.MetaExists+utils.InInFieldSep+attr.FieldName+utils.InInFieldSep)
}
//Initial not *any translate to if value of fieldName = initial do stuff
@@ -339,7 +319,7 @@ func (v1AttrPrf v1AttributeProfile) AsAttributeProfileV1To4() (attrPrf *v4Attrib
// Create FilterIDs []string
filterIDs := make([]string, 0)
//append false translate to if FieldName exist do stuff
if attr.Append == false {
if !attr.Append {
filterIDs = append(filterIDs, utils.MetaExists+utils.ConcatenatedKeySep+attr.FieldName+utils.ConcatenatedKeySep)
}
//Initial not *any translate to if value of fieldName = initial do stuff

14
migrator/cdrs.go
View File

@@ -95,20 +95,6 @@ func (m *Migrator) migrateCDRs() (err error) {
return m.ensureIndexesStorDB(engine.ColCDRs)
}
func (m *Migrator) removeV1CDRs() (err error) {
var v1CDR *v1Cdrs
if v1CDR, err = m.storDBIn.getV1CDR(); err != nil {
return err
}
if v1CDR == nil {
return
}
if err = m.storDBIn.remV1CDRs(v1CDR); err != nil {
return
}
return
}
func (m *Migrator) migrateV1CDRs() (cdr *engine.CDR, err error) {
var v1CDR *v1Cdrs
if v1CDR, err = m.storDBIn.getV1CDR(); err != nil {

12
migrator/derived_chargers.go
View File

@@ -74,9 +74,7 @@ func fieldinfo2Attribute(attr []*engine.Attribute, fieldName, fieldInfo string)
if fieldInfo == utils.MetaDefault || len(fieldInfo) == 0 {
return attr
}
if strings.HasPrefix(fieldInfo, utils.StaticValuePrefix) {
fieldInfo = fieldInfo[1:]
}
fieldInfo = strings.TrimPrefix(fieldInfo, utils.StaticValuePrefix)
var err error
if rp, err = config.NewRSRParsers(fieldInfo, utils.InfieldSep); err != nil {
utils.Logger.Err(fmt.Sprintf("On Migrating rule: <%s>, error: %s", fieldInfo, err.Error()))
@@ -136,12 +134,8 @@ func derivedChargers2Charger(dc *v1DerivedCharger, tenant string, key string, fi
filter := dc.RunFilters
if len(filter) != 0 {
if strings.HasPrefix(filter, utils.StaticValuePrefix) {
filter = filter[1:]
}
if strings.HasPrefix(filter, utils.DynamicDataPrefix) {
filter = filter[1:]
}
filter = strings.TrimPrefix(filter, utils.StaticValuePrefix)
filter = strings.TrimPrefix(filter, utils.DynamicDataPrefix)
flt, err := migrateInlineFilterV4([]string{"*rsr::" + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + filter})
if err != nil {
return

14
migrator/filters.go
View File

@@ -23,7 +23,6 @@ import (
"regexp"
"strings"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -115,10 +114,7 @@ func migrateFilterV2(fl *v1Filter) (fltr *engine.Filter) {
fltr.Rules[i].Element = utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + rule.FieldName
} else {
for idx, val := range rule.Values {
if strings.HasPrefix(val, utils.DynamicDataPrefix) {
// remove dynamic data prefix from fieldName
val = val[1:]
}
val = strings.TrimPrefix(val, utils.DynamicDataPrefix) // remove dynamic data prefix from fieldName
fltr.Rules[i].Values[idx] = utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + val
}
}
@@ -803,11 +799,9 @@ type v1Filter struct {
}
type v1FilterRule struct {
Type string // Filter type (*string, *timing, *rsr_filters, *stats, *lt, *lte, *gt, *gte)
FieldName string // Name of the field providing us the Values to check (used in case of some )
Values []string // Filter definition
rsrFields config.RSRParsers // Cache here the RSRFilter Values
negative *bool
Type string // Filter type (*string, *timing, *rsr_filters, *stats, *lt, *lte, *gt, *gte)
FieldName string // Name of the field providing us the Values to check (used in case of some )
Values []string // Filter definition
}
func (m *Migrator) migrateRequestFilterV4(v4Fltr *engine.Filter) (fltr *engine.Filter, err error) {

42
migrator/migrator_utils.go
View File

@@ -34,56 +34,48 @@ var (
func NewMigratorDataDB(db_type, host, port, name, user, pass,
marshaler string, cacheCfg *config.CacheCfg,
opts map[string]interface{}) (db MigratorDataDB, err error) {
dbCon, err := engine.NewDataDBConn(db_type, host,
port, name, user, pass, marshaler, opts)
if err != nil {
return nil, err
var dbCon engine.DataDB
if dbCon, err = engine.NewDataDBConn(db_type, host,
port, name, user, pass, marshaler, opts); err != nil {
return
}
dm := engine.NewDataManager(dbCon, cacheCfg, nil)
var d MigratorDataDB
switch db_type {
case utils.Redis:
d = newRedisMigrator(dm)
db = newRedisMigrator(dm)
case utils.Mongo:
d = newMongoMigrator(dm)
db = d.(MigratorDataDB)
db = newMongoMigrator(dm)
case utils.INTERNAL:
d = newInternalMigrator(dm)
db = d.(MigratorDataDB)
db = newInternalMigrator(dm)
default:
err = fmt.Errorf("unknown db '%s' valid options are '%s' or '%s or '%s'",
db_type, utils.Redis, utils.Mongo, utils.INTERNAL)
}
return d, nil
return
}
func NewMigratorStorDB(db_type, host, port, name, user, pass, marshaler string,
stringIndexedFields, prefixIndexedFields []string,
opts map[string]interface{}) (db MigratorStorDB, err error) {
var d MigratorStorDB
storDb, err := engine.NewStorDBConn(db_type, host, port, name, user,
pass, marshaler, stringIndexedFields, prefixIndexedFields, opts)
if err != nil {
return nil, err
var storDb engine.StorDB
if storDb, err = engine.NewStorDBConn(db_type, host, port, name, user,
pass, marshaler, stringIndexedFields, prefixIndexedFields, opts); err != nil {
return
}
switch db_type {
case utils.Mongo:
d = newMongoStorDBMigrator(storDb)
db = d.(MigratorStorDB)
db = newMongoStorDBMigrator(storDb)
case utils.MySQL:
d = newMigratorSQL(storDb)
db = d.(MigratorStorDB)
db = newMigratorSQL(storDb)
case utils.Postgres:
d = newMigratorSQL(storDb)
db = d.(MigratorStorDB)
db = newMigratorSQL(storDb)
case utils.INTERNAL:
d = newInternalStorDBMigrator(storDb)
db = d.(MigratorStorDB)
db = newInternalStorDBMigrator(storDb)
default:
err = fmt.Errorf("Unknown db '%s' valid options are [%s, %s, %s, %s]",
db_type, utils.MySQL, utils.Mongo, utils.Postgres, utils.INTERNAL)
}
return d, nil
return
}
func (m *Migrator) getVersions(str string) (vrs engine.Versions, err error) {
if str == utils.CDRs || str == utils.SessionSCosts || strings.HasPrefix(str, "Tp") {

2
migrator/stats.go
View File

@@ -58,8 +58,6 @@ type v1Stat struct {
Triggers engine.ActionTriggers
}
type v1Stats []*v1Stat
func (m *Migrator) moveStatQueueProfile() (err error) {
//StatQueueProfile
var ids []string

6
migrator/storage_map_datadb.go
View File

@@ -24,10 +24,8 @@ import (
)
type internalMigrator struct {
dm *engine.DataManager
iDB *engine.InternalDB
dataKeys []string
qryIdx *int
dm *engine.DataManager
iDB *engine.InternalDB
}
func newInternalMigrator(dm *engine.DataManager) (iDBMig *internalMigrator) {

6
migrator/storage_map_stordb.go
View File

@@ -31,10 +31,8 @@ func newInternalStorDBMigrator(stor engine.StorDB) (iDBMig *internalStorDBMigrat
}
type internalStorDBMigrator struct {
storDB *engine.StorDB
iDB *engine.InternalDB
dataKeys []string
qryIdx *int
storDB *engine.StorDB
iDB *engine.InternalDB
}
func (iDBMig *internalStorDBMigrator) close() {}

3
migrator/storage_sql.go
View File

@@ -20,7 +20,6 @@ package migrator
import (
"database/sql"
"fmt"
"time"
"github.com/cgrates/cgrates/engine"
@@ -108,7 +107,7 @@ func (mgSQL *migratorSQL) renameV1SMCosts() (err error) {
}
func (mgSQL *migratorSQL) createV1SMCosts() (err error) {
qry := fmt.Sprint("CREATE TABLE sm_costs ( id int(11) NOT NULL AUTO_INCREMENT, cgrid varchar(40) NOT NULL, run_id varchar(64) NOT NULL, origin_host varchar(64) NOT NULL, origin_id varchar(128) NOT NULL, cost_source varchar(64) NOT NULL, `usage` BIGINT NOT NULL, cost_details MEDIUMTEXT, created_at TIMESTAMP NULL,deleted_at TIMESTAMP NULL, PRIMARY KEY (`id`),UNIQUE KEY costid (cgrid, run_id),KEY origin_idx (origin_host, origin_id),KEY run_origin_idx (run_id, origin_id),KEY deleted_at_idx (deleted_at));")
qry := "CREATE TABLE sm_costs ( id int(11) NOT NULL AUTO_INCREMENT, cgrid varchar(40) NOT NULL, run_id varchar(64) NOT NULL, origin_host varchar(64) NOT NULL, origin_id varchar(128) NOT NULL, cost_source varchar(64) NOT NULL, `usage` BIGINT NOT NULL, cost_details MEDIUMTEXT, created_at TIMESTAMP NULL,deleted_at TIMESTAMP NULL, PRIMARY KEY (`id`),UNIQUE KEY costid (cgrid, run_id),KEY origin_idx (origin_host, origin_id),KEY run_origin_idx (run_id, origin_id),KEY deleted_at_idx (deleted_at));"
if mgSQL.StorDB().GetStorageType() == utils.Postgres {
qry = `
CREATE TABLE sm_costs (

2
migrator/thresholds.go
View File

@@ -45,8 +45,6 @@ type v2ActionTrigger struct {
LastExecutionTime time.Time
}
type v2ActionTriggers []*v2ActionTrigger
func (m *Migrator) migrateCurrentThresholds() (err error) {
var ids []string
//Thresholds

2
migrator/tp_shared_groups.go
View File

@@ -41,7 +41,7 @@ func (m *Migrator) migrateCurrentTPsharedgroups() (err error) {
return err
}
if sharedGroup != nil {
if m.dryRun != true {
if !m.dryRun {
if err := m.storDBOut.StorDB().SetTPSharedGroups(sharedGroup); err != nil {
return err
}

2
migrator/tp_timings.go
View File

@@ -41,7 +41,7 @@ func (m *Migrator) migrateCurrentTPTiming() (err error) {
return err
}
if tm != nil {
if m.dryRun != true {
if !m.dryRun {
if err := m.storDBOut.StorDB().SetTPTimings(tm); err != nil {
return err
}