From c3e7337cdfe80e578f7a35d9393194a758dca38d Mon Sep 17 00:00:00 2001 From: andronache Date: Thu, 13 May 2021 09:52:55 +0300 Subject: [PATCH] Continue removing destination --- console/destination_set.go | 3 +- dispatchers/replicator.go | 34 -- engine/datamanager.go | 2 - engine/filters.go | 36 +- engine/libtest.go | 3 - engine/models.go | 4 - engine/storage_csv.go | 30 +- engine/storage_interface.go | 7 - engine/storage_internal_datadb.go | 69 +--- engine/storage_internal_stordb.go | 30 -- engine/storage_mongo_datadb.go | 16 +- engine/storage_mongo_stordb.go | 45 --- engine/storage_redis.go | 30 -- engine/storage_sql.go | 5 +- engine/tpexporter.go | 12 - engine/tpimporter_csv.go | 16 - engine/tpreader.go | 34 +- engine/version.go | 33 +- utils/apitpdata.go | 2 - utils/consts.go | 523 ++++++++++++++---------------- 20 files changed, 289 insertions(+), 645 deletions(-) diff --git a/console/destination_set.go b/console/destination_set.go index 88f457467..d769de936 100644 --- a/console/destination_set.go +++ b/console/destination_set.go @@ -22,8 +22,7 @@ import "github.com/cgrates/cgrates/utils" func init() { c := &CmdSetDestination{ - name: "destination_set", - rpcMethod: utils.APIerSv1SetDestination, + name: "destination_set", } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go index 7af956fe0..bf68ed1dd 100644 --- a/dispatchers/replicator.go +++ b/dispatchers/replicator.go @@ -39,23 +39,6 @@ func (dS *DispatcherService) ReplicatorSv1Ping(args *utils.CGREvent, rpl *string return dS.Dispatch(args, utils.MetaReplicator, utils.ReplicatorSv1Ping, args, rpl) } -func (dS *DispatcherService) ReplicatorSv1GetReverseDestination(args *utils.StringWithAPIOpts, rpl *[]string) (err error) { - if args == nil { - args = new(utils.StringWithAPIOpts) - } - args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) - if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1GetReverseDestination, args.Tenant, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { - return - } - } - return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - APIOpts: args.APIOpts, - }, utils.MetaReplicator, utils.ReplicatorSv1GetReverseDestination, args, rpl) -} - func (dS *DispatcherService) ReplicatorSv1GetStatQueue(args *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) (err error) { tnt := dS.cfg.GeneralCfg().DefaultTenant if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString { @@ -647,23 +630,6 @@ func (dS *DispatcherService) ReplicatorSv1RemoveThreshold(args *utils.TenantIDWi }, utils.MetaReplicator, utils.ReplicatorSv1RemoveThreshold, args, rpl) } -func (dS *DispatcherService) ReplicatorSv1RemoveDestination(args *utils.StringWithAPIOpts, rpl *string) (err error) { - if args == nil { - args = new(utils.StringWithAPIOpts) - } - args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) - if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { - if err = dS.authorize(utils.ReplicatorSv1RemoveDestination, args.Tenant, - utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { - return - } - } - return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - APIOpts: args.APIOpts, - }, utils.MetaReplicator, utils.ReplicatorSv1RemoveDestination, args, rpl) -} - func (dS *DispatcherService) ReplicatorSv1SetLoadIDs(args *utils.LoadIDsWithAPIOpts, rpl *string) (err error) { if args == nil { args = &utils.LoadIDsWithAPIOpts{} diff --git a/engine/datamanager.go b/engine/datamanager.go index d9c19e1f6..6cd70d5ce 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -43,8 +43,6 @@ var ( utils.AccountFilterIndexPrfx: {}, } cachePrefixMap = utils.StringSet{ - utils.DestinationPrefix: {}, - utils.ReverseDestinationPrefix: {}, utils.ResourceProfilesPrefix: {}, utils.TimingsPrefix: {}, utils.ResourcesPrefix: {}, diff --git a/engine/filters.go b/engine/filters.go index eee8742e0..9bcf3d080 100644 --- a/engine/filters.go +++ b/engine/filters.go @@ -223,19 +223,19 @@ func (fltr *Filter) Compile() (err error) { var supportedFiltersType utils.StringSet = utils.NewStringSet([]string{ utils.MetaString, utils.MetaPrefix, utils.MetaSuffix, - utils.MetaCronExp, utils.MetaRSR, utils.MetaDestinations, + utils.MetaCronExp, utils.MetaRSR, utils.MetaEmpty, utils.MetaExists, utils.MetaLessThan, utils.MetaLessOrEqual, utils.MetaGreaterThan, utils.MetaGreaterOrEqual, utils.MetaEqual, utils.MetaNotEqual, utils.MetaIPNet, utils.MetaAPIBan, utils.MetaActivationInterval}) var needsFieldName utils.StringSet = utils.NewStringSet([]string{ utils.MetaString, utils.MetaPrefix, utils.MetaSuffix, - utils.MetaCronExp, utils.MetaRSR, utils.MetaDestinations, utils.MetaLessThan, + utils.MetaCronExp, utils.MetaRSR, utils.MetaLessThan, utils.MetaEmpty, utils.MetaExists, utils.MetaLessOrEqual, utils.MetaGreaterThan, utils.MetaGreaterOrEqual, utils.MetaEqual, utils.MetaNotEqual, utils.MetaIPNet, utils.MetaAPIBan, utils.MetaActivationInterval}) var needsValues utils.StringSet = utils.NewStringSet([]string{utils.MetaString, utils.MetaPrefix, - utils.MetaSuffix, utils.MetaCronExp, utils.MetaRSR, utils.MetaDestinations, + utils.MetaSuffix, utils.MetaCronExp, utils.MetaRSR, utils.MetaLessThan, utils.MetaLessOrEqual, utils.MetaGreaterThan, utils.MetaGreaterOrEqual, utils.MetaEqual, utils.MetaNotEqual, utils.MetaIPNet, utils.MetaAPIBan, utils.MetaActivationInterval}) @@ -344,8 +344,6 @@ func (fltr *FilterRule) Pass(ctx *context.Context, dDP utils.DataProvider) (resu result, err = fltr.passStringSuffix(dDP) case utils.MetaCronExp, utils.MetaNotCronExp: result, err = fltr.passCronExp(ctx, dDP) - case utils.MetaDestinations, utils.MetaNotDestinations: - result, err = fltr.passDestinations(ctx, dDP) case utils.MetaRSR, utils.MetaNotRSR: result, err = fltr.passRSR(dDP) case utils.MetaLessThan, utils.MetaLessOrEqual, utils.MetaGreaterThan, utils.MetaGreaterOrEqual: @@ -507,34 +505,6 @@ func (fltr *FilterRule) passCronExp(ctx *context.Context, dDP utils.DataProvider return false, nil } -func (fltr *FilterRule) passDestinations(ctx *context.Context, dDP utils.DataProvider) (bool, error) { - dst, err := fltr.rsrElement.ParseDataProvider(dDP) - if err != nil { - if err == utils.ErrNotFound { - return false, nil - } - return false, err - } - for _, p := range utils.SplitPrefix(dst, utils.MIN_PREFIX_MATCH) { - var destIDs []string - if err = connMgr.Call(ctx, config.CgrConfig().FilterSCfg().AdminSConns, utils.APIerSv1GetReverseDestination, &p, &destIDs); err != nil { - continue - } - for _, dID := range destIDs { - for _, valDstIDVal := range fltr.rsrValues { - valDstID, err := valDstIDVal.ParseDataProvider(dDP) - if err != nil { - continue - } - if valDstID == dID { - return true, nil - } - } - } - } - return false, nil -} - func (fltr *FilterRule) passRSR(dDP utils.DataProvider) (bool, error) { fld, err := fltr.rsrElement.ParseDataProvider(dDP) if err != nil { diff --git a/engine/libtest.go b/engine/libtest.go index 1f0546809..47729fcd7 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -382,13 +382,11 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats { utils.CacheDispatcherRoutes: {}, utils.CacheDispatcherLoads: {}, utils.CacheDispatchers: {}, - utils.CacheDestinations: {}, utils.CacheEventResources: {}, utils.CacheFilters: {}, utils.CacheResourceFilterIndexes: {}, utils.CacheResourceProfiles: {}, utils.CacheResources: {}, - utils.CacheReverseDestinations: {}, utils.CacheRPCResponses: {}, utils.CacheStatFilterIndexes: {}, utils.CacheStatQueueProfiles: {}, @@ -421,7 +419,6 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats { utils.CacheVersions: {}, utils.CacheTBLTPTimings: {}, - utils.CacheTBLTPDestinations: {}, utils.CacheTBLTPResources: {}, utils.CacheTBLTPStats: {}, utils.CacheTBLTPThresholds: {}, diff --git a/engine/models.go b/engine/models.go index 781928d53..3130053e7 100644 --- a/engine/models.go +++ b/engine/models.go @@ -51,10 +51,6 @@ type DestinationMdl struct { CreatedAt time.Time } -func (DestinationMdl) TableName() string { - return utils.TBLTPDestinations -} - type ResourceMdl struct { PK uint `gorm:"primary_key"` Tpid string diff --git a/engine/storage_csv.go b/engine/storage_csv.go index 888c7972b..423b1e9ee 100644 --- a/engine/storage_csv.go +++ b/engine/storage_csv.go @@ -44,7 +44,6 @@ type CSVStorage struct { sep rune generator func() csvReaderCloser // file names - destinationsFn []string timingsFn []string resProfilesFn []string statsFn []string @@ -61,15 +60,13 @@ type CSVStorage struct { } // NewCSVStorage creates a CSV storege that takes the data from the paths specified -func NewCSVStorage(sep rune, - destinationsFn, timingsFn, +func NewCSVStorage(sep rune, timingsFn, resProfilesFn, statsFn, thresholdsFn, filterFn, routeProfilesFn, attributeProfilesFn, chargerProfilesFn, dispatcherProfilesFn, dispatcherHostsFn, rateProfilesFn, actionProfilesFn, accountsFn []string) *CSVStorage { return &CSVStorage{ sep: sep, generator: NewCsvFile, - destinationsFn: destinationsFn, timingsFn: timingsFn, resProfilesFn: resProfilesFn, statsFn: statsFn, @@ -92,7 +89,6 @@ func NewFileCSVStorage(sep rune, dataPath string) *CSVStorage { if err != nil { log.Fatal(err) } - destinationsPaths := appendName(allFoldersPath, utils.DestinationsCsv) timingsPaths := appendName(allFoldersPath, utils.TimingsCsv) resourcesPaths := appendName(allFoldersPath, utils.ResourcesCsv) statsPaths := appendName(allFoldersPath, utils.StatsCsv) @@ -107,7 +103,6 @@ func NewFileCSVStorage(sep rune, dataPath string) *CSVStorage { actionProfilesFn := appendName(allFoldersPath, utils.ActionProfilesCsv) accountsFn := appendName(allFoldersPath, utils.AccountsCsv) return NewCSVStorage(sep, - destinationsPaths, timingsPaths, resourcesPaths, statsPaths, @@ -125,12 +120,11 @@ func NewFileCSVStorage(sep rune, dataPath string) *CSVStorage { } // NewStringCSVStorage creates a csv storage from strings -func NewStringCSVStorage(sep rune, - destinationsFn, timingsFn, +func NewStringCSVStorage(sep rune, timingsFn, resProfilesFn, statsFn, thresholdsFn, filterFn, routeProfilesFn, attributeProfilesFn, chargerProfilesFn, dispatcherProfilesFn, dispatcherHostsFn, rateProfilesFn, actionProfilesFn, accountsFn string) *CSVStorage { - c := NewCSVStorage(sep, []string{destinationsFn}, []string{timingsFn}, + c := NewCSVStorage(sep, []string{timingsFn}, []string{resProfilesFn}, []string{statsFn}, []string{thresholdsFn}, []string{filterFn}, []string{routeProfilesFn}, []string{attributeProfilesFn}, []string{chargerProfilesFn}, []string{dispatcherProfilesFn}, []string{dispatcherHostsFn}, []string{rateProfilesFn}, @@ -156,7 +150,6 @@ func NewGoogleCSVStorage(sep rune, spreadsheetID string) (*CSVStorage, error) { return []string{} } c := NewCSVStorage(sep, - getIfExist(utils.Destinations), getIfExist(utils.Timings), getIfExist(utils.Resources), getIfExist(utils.Stats), @@ -181,7 +174,6 @@ func NewGoogleCSVStorage(sep rune, spreadsheetID string) (*CSVStorage, error) { // NewURLCSVStorage returns a CSVStorage that can parse URLs func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { - var destinationsPaths []string var timingsPaths []string var resourcesPaths []string var statsPaths []string @@ -198,7 +190,6 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { for _, baseURL := range strings.Split(dataPath, utils.InfieldSep) { if !strings.HasSuffix(baseURL, utils.CSVSuffix) { - destinationsPaths = append(destinationsPaths, joinURL(baseURL, utils.DestinationsCsv)) timingsPaths = append(timingsPaths, joinURL(baseURL, utils.TimingsCsv)) resourcesPaths = append(resourcesPaths, joinURL(baseURL, utils.ResourcesCsv)) statsPaths = append(statsPaths, joinURL(baseURL, utils.StatsCsv)) @@ -215,8 +206,6 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { continue } switch { - case strings.HasSuffix(baseURL, utils.DestinationsCsv): - destinationsPaths = append(destinationsPaths, baseURL) case strings.HasSuffix(baseURL, utils.TimingsCsv): timingsPaths = append(timingsPaths, baseURL) case strings.HasSuffix(baseURL, utils.ResourcesCsv): @@ -248,7 +237,6 @@ func NewURLCSVStorage(sep rune, dataPath string) *CSVStorage { } c := NewCSVStorage(sep, - destinationsPaths, timingsPaths, resourcesPaths, statsPaths, @@ -342,18 +330,6 @@ func (csvs *CSVStorage) GetTPTimings(tpid, id string) ([]*utils.ApierTPTiming, e return tpTimings.AsTPTimings(), nil } -func (csvs *CSVStorage) GetTPDestinations(tpid, id string) ([]*utils.TPDestination, error) { - var tpDests DestinationMdls - if err := csvs.proccesData(DestinationMdl{}, csvs.destinationsFn, func(tp interface{}) { - d := tp.(DestinationMdl) - d.Tpid = tpid - tpDests = append(tpDests, d) - }); err != nil { - return nil, err - } - return tpDests.AsTPDestinations(), nil -} - func (csvs *CSVStorage) GetTPResources(tpid, tenant, id string) ([]*utils.TPResourceProfile, error) { var tpResLimits ResourceMdls if err := csvs.proccesData(ResourceMdl{}, csvs.resProfilesFn, func(tp interface{}) { diff --git a/engine/storage_interface.go b/engine/storage_interface.go index 409d8f1c1..c63339d43 100644 --- a/engine/storage_interface.go +++ b/engine/storage_interface.go @@ -36,7 +36,6 @@ type Storage interface { Close() Flush(string) error GetKeysForPrefix(ctx *context.Context, prefix string) ([]string, error) - RemoveKeysForPrefix(string) error GetVersions(itm string) (vrs Versions, err error) SetVersions(vrs Versions, overwrite bool) (err error) RemoveVersions(vrs Versions) (err error) @@ -49,10 +48,6 @@ type Storage interface { type DataDB interface { Storage HasDataDrv(*context.Context, string, string, string) (bool, error) - RemoveDestinationDrv(string, string) error - RemoveReverseDestinationDrv(string, string, string) error - SetReverseDestinationDrv(string, []string, string) error - GetReverseDestinationDrv(string, string) ([]string, error) GetResourceProfileDrv(string, string) (*ResourceProfile, error) SetResourceProfileDrv(*ResourceProfile) error RemoveResourceProfileDrv(string, string) error @@ -142,7 +137,6 @@ type LoadReader interface { GetTpTableIds(string, string, []string, map[string]string, *utils.PaginatorWithSearch) ([]string, error) GetTPTimings(string, string) ([]*utils.ApierTPTiming, error) - GetTPDestinations(string, string) ([]*utils.TPDestination, error) GetTPResources(string, string, string) ([]*utils.TPResourceProfile, error) GetTPStats(string, string, string) ([]*utils.TPStatProfile, error) GetTPThresholds(string, string, string) ([]*utils.TPThresholdProfile, error) @@ -160,7 +154,6 @@ type LoadReader interface { type LoadWriter interface { RemTpData(string, string, map[string]string) error SetTPTimings([]*utils.ApierTPTiming) error - SetTPDestinations([]*utils.TPDestination) error SetTPResources([]*utils.TPResourceProfile) error SetTPStats([]*utils.TPStatProfile) error SetTPThresholds([]*utils.TPThresholdProfile) error diff --git a/engine/storage_internal_datadb.go b/engine/storage_internal_datadb.go index 48f87a99e..5d49ee228 100644 --- a/engine/storage_internal_datadb.go +++ b/engine/storage_internal_datadb.go @@ -82,7 +82,7 @@ func (iDB *InternalDB) SelectDatabase(string) (err error) { // GetKeysForPrefix returns the keys from cache that have the given prefix func (iDB *InternalDB) GetKeysForPrefix(ctx *context.Context, prefix string) (ids []string, err error) { - keyLen := len(utils.DestinationPrefix) + keyLen := len(utils.AccountPrefix) if len(prefix) < keyLen { err = fmt.Errorf("unsupported prefix in GetKeysForPrefix: %s", prefix) return @@ -96,18 +96,6 @@ func (iDB *InternalDB) GetKeysForPrefix(ctx *context.Context, prefix string) (id return } -func (iDB *InternalDB) RemoveKeysForPrefix(prefix string) (err error) { - var keys []string - if keys, err = iDB.GetKeysForPrefix(context.TODO(), prefix); err != nil { - return - } - for _, key := range keys { - Cache.RemoveWithoutReplicate(utils.CacheReverseDestinations, key, - cacheCommit(utils.NonTransactional), utils.NonTransactional) - } - return -} - func (iDB *InternalDB) GetVersions(itm string) (vrs Versions, err error) { x, ok := Cache.Get(utils.CacheVersions, utils.VersionName) if !ok || x == nil { @@ -182,8 +170,6 @@ func (iDB *InternalDB) IsDBEmpty() (isEmpty bool, err error) { func (iDB *InternalDB) HasDataDrv(ctx *context.Context, category, subject, tenant string) (bool, error) { switch category { - case utils.DestinationPrefix: - return Cache.HasItem(utils.CachePrefixToInstance[category], subject), nil case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, utils.StatQueueProfilePrefix, utils.ThresholdPrefix, utils.ThresholdProfilePrefix, utils.FilterPrefix, utils.RouteProfilePrefix, utils.AttributeProfilePrefix, @@ -193,59 +179,6 @@ func (iDB *InternalDB) HasDataDrv(ctx *context.Context, category, subject, tenan return false, errors.New("Unsupported HasData category") } -func (iDB *InternalDB) RemoveDestinationDrv(destID string, transactionID string) (err error) { - Cache.RemoveWithoutReplicate(utils.CacheDestinations, destID, - cacheCommit(transactionID), transactionID) - return -} - -func (iDB *InternalDB) RemoveReverseDestinationDrv(dstID, prfx, transactionID string) (err error) { - var revDst []string - if Cache.HasItem(utils.CacheReverseDestinations, prfx) { - x, ok := Cache.Get(utils.CacheReverseDestinations, prfx) - if !ok || x == nil { - return utils.ErrNotFound - } - revDst = x.([]string) - } - mpRevDst := utils.NewStringSet(revDst) - mpRevDst.Remove(dstID) - if mpRevDst.Size() != 0 { - Cache.SetWithoutReplicate(utils.CacheReverseDestinations, prfx, mpRevDst.AsSlice(), nil, - cacheCommit(transactionID), transactionID) - } else { - Cache.RemoveWithoutReplicate(utils.CacheReverseDestinations, prfx, - cacheCommit(transactionID), transactionID) - } - return -} - -func (iDB *InternalDB) SetReverseDestinationDrv(destID string, prefixes []string, transactionID string) (err error) { - for _, p := range prefixes { - var revDst []string - if Cache.HasItem(utils.CacheReverseDestinations, p) { - if x, ok := Cache.Get(utils.CacheReverseDestinations, p); ok && x != nil { - revDst = x.([]string) - } - } - mpRevDst := utils.NewStringSet(revDst) - mpRevDst.Add(destID) - // for ReverseDestination we will use Groups - Cache.SetWithoutReplicate(utils.CacheReverseDestinations, p, mpRevDst.AsSlice(), nil, - cacheCommit(utils.NonTransactional), utils.NonTransactional) - } - return -} - -func (iDB *InternalDB) GetReverseDestinationDrv(prefix, transactionID string) (ids []string, err error) { - if x, ok := Cache.Get(utils.CacheReverseDestinations, prefix); ok && x != nil { - if ids = x.([]string); len(ids) != 0 { - return - } - } - return nil, utils.ErrNotFound -} - func (iDB *InternalDB) GetResourceProfileDrv(tenant, id string) (rp *ResourceProfile, err error) { if x, ok := Cache.Get(utils.CacheResourceProfiles, utils.ConcatenatedKey(tenant, id)); ok && x != nil { return x.(*ResourceProfile), nil diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go index f4c075730..ffd1b5ea9 100644 --- a/engine/storage_internal_stordb.go +++ b/engine/storage_internal_stordb.go @@ -75,26 +75,6 @@ func (iDB *InternalDB) GetTPTimings(tpid, id string) (timings []*utils.ApierTPTi return } -func (iDB *InternalDB) GetTPDestinations(tpid, id string) (dsts []*utils.TPDestination, err error) { - key := tpid - if id != utils.EmptyString { - key += utils.ConcatenatedKeySep + id - } - ids := Cache.GetItemIDs(utils.CacheTBLTPDestinations, key) - for _, id := range ids { - x, ok := Cache.Get(utils.CacheTBLTPDestinations, id) - if !ok || x == nil { - return nil, utils.ErrNotFound - } - dsts = append(dsts, x.(*utils.TPDestination)) - } - - if len(dsts) == 0 { - return nil, utils.ErrNotFound - } - return -} - func (iDB *InternalDB) GetTPResources(tpid, tenant, id string) (resources []*utils.TPResourceProfile, err error) { key := tpid if tenant != utils.EmptyString { @@ -400,16 +380,6 @@ func (iDB *InternalDB) SetTPTimings(timings []*utils.ApierTPTiming) (err error) } return } -func (iDB *InternalDB) SetTPDestinations(dests []*utils.TPDestination) (err error) { - if len(dests) == 0 { - return nil - } - for _, destination := range dests { - Cache.SetWithoutReplicate(utils.CacheTBLTPDestinations, utils.ConcatenatedKey(destination.TPid, destination.ID), destination, nil, - cacheCommit(utils.NonTransactional), utils.NonTransactional) - } - return -} func (iDB *InternalDB) SetTPResources(resources []*utils.TPResourceProfile) (err error) { if len(resources) == 0 { diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index 1703162e2..69d26190c 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -318,7 +318,7 @@ func (ms *MongoStorage) ensureIndexesForCol(col string) (err error) { // exporte return } //StorDB - case utils.TBLTPTimings, utils.TBLTPDestinations, + case utils.TBLTPTimings, utils.TBLTPStats, utils.TBLTPResources, utils.TBLTPDispatchers, utils.TBLTPDispatcherHosts, utils.TBLTPChargers, utils.TBLTPRoutes, utils.TBLTPThresholds: @@ -373,7 +373,7 @@ func (ms *MongoStorage) EnsureIndexes(cols ...string) (err error) { } } if ms.storageType == utils.StorDB { - for _, col := range []string{utils.TBLTPTimings, utils.TBLTPDestinations, + for _, col := range []string{utils.TBLTPTimings, utils.TBLTPStats, utils.TBLTPResources, utils.CDRsTBL, utils.SessionCostsTBL} { if err = ms.ensureIndexesForCol(col); err != nil { @@ -415,10 +415,6 @@ func (ms *MongoStorage) SelectDatabase(dbName string) (err error) { func (ms *MongoStorage) RemoveKeysForPrefix(prefix string) (err error) { var colName string switch prefix { - case utils.DestinationPrefix: - colName = ColDst - case utils.ReverseDestinationPrefix: - colName = ColRds case utils.LoadInstKey: colName = ColLht case utils.VersionPrefix: @@ -546,7 +542,7 @@ func (ms *MongoStorage) getField3(sctx mongo.SessionContext, col, prefix, field // GetKeysForPrefix implementation func (ms *MongoStorage) GetKeysForPrefix(ctx *context.Context, prefix string) (result []string, err error) { var category, subject string - keyLen := len(utils.DestinationPrefix) + keyLen := len(utils.AccountPrefix) if len(prefix) < keyLen { return nil, fmt.Errorf("unsupported prefix in GetKeysForPrefix: %q", prefix) } @@ -555,10 +551,6 @@ func (ms *MongoStorage) GetKeysForPrefix(ctx *context.Context, prefix string) (r subject = fmt.Sprintf("^%s", prefix[keyLen:]) // old way, no tenant support err = ms.query(ctx, func(sctx mongo.SessionContext) (err error) { switch category { - case utils.DestinationPrefix: - result, err = ms.getField(sctx, ColDst, utils.DestinationPrefix, subject, "key") - case utils.ReverseDestinationPrefix: - result, err = ms.getField(sctx, ColRds, utils.ReverseDestinationPrefix, subject, "key") case utils.ResourceProfilesPrefix: result, err = ms.getField2(sctx, ColRsP, utils.ResourceProfilesPrefix, subject, tntID) case utils.ResourcesPrefix: @@ -629,8 +621,6 @@ func (ms *MongoStorage) HasDataDrv(ctx *context.Context, category, subject, tena err = ms.query(ctx, func(sctx mongo.SessionContext) (err error) { var count int64 switch category { - case utils.DestinationPrefix: - count, err = ms.getCol(ColDst).CountDocuments(sctx, bson.M{"key": subject}) case utils.ResourcesPrefix: count, err = ms.getCol(ColRes).CountDocuments(sctx, bson.M{"tenant": tenant, "id": subject}) case utils.ResourceProfilesPrefix: diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go index ece7aac68..707e060a6 100644 --- a/engine/storage_mongo_stordb.go +++ b/engine/storage_mongo_stordb.go @@ -180,33 +180,6 @@ func (ms *MongoStorage) GetTPTimings(tpid, id string) ([]*utils.ApierTPTiming, e return results, err } -func (ms *MongoStorage) GetTPDestinations(tpid, id string) ([]*utils.TPDestination, error) { - filter := bson.M{"tpid": tpid} - if id != "" { - filter["id"] = id - } - var results []*utils.TPDestination - err := ms.query(context.TODO(), func(sctx mongo.SessionContext) (err error) { - cur, err := ms.getCol(utils.TBLTPDestinations).Find(sctx, filter) - if err != nil { - return err - } - for cur.Next(sctx) { - var el utils.TPDestination - err := cur.Decode(&el) - if err != nil { - return err - } - results = append(results, &el) - } - if len(results) == 0 { - return utils.ErrNotFound - } - return cur.Close(sctx) - }) - return results, err -} - func (ms *MongoStorage) GetTPResources(tpid, tenant, id string) ([]*utils.TPResourceProfile, error) { filter := bson.M{"tpid": tpid} if id != "" { @@ -330,24 +303,6 @@ func (ms *MongoStorage) SetTPTimings(tps []*utils.ApierTPTiming) error { }) } -func (ms *MongoStorage) SetTPDestinations(tpDsts []*utils.TPDestination) (err error) { - if len(tpDsts) == 0 { - return nil - } - return ms.query(context.TODO(), func(sctx mongo.SessionContext) (err error) { - for _, tp := range tpDsts { - _, err = ms.getCol(utils.TBLTPDestinations).UpdateOne(sctx, bson.M{"tpid": tp.TPid, "id": tp.ID}, - bson.M{"$set": tp}, - options.Update().SetUpsert(true), - ) - if err != nil { - return err - } - } - return nil - }) -} - func (ms *MongoStorage) SetTPResources(tpRLs []*utils.TPResourceProfile) (err error) { if len(tpRLs) == 0 { return diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 318a11e25..b634a7512 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -242,9 +242,6 @@ func (rs *RedisStorage) GetKeysForPrefix(ctx *context.Context, prefix string) (k func (rs *RedisStorage) HasDataDrv(ctx *context.Context, category, subject, tenant string) (exists bool, err error) { var i int switch category { - case utils.DestinationPrefix: - err = rs.Cmd(&i, redisEXISTS, category+subject) - return i == 1, err case utils.ResourcesPrefix, utils.ResourceProfilesPrefix, utils.StatQueuePrefix, utils.StatQueueProfilePrefix, utils.ThresholdPrefix, utils.ThresholdProfilePrefix, utils.FilterPrefix, utils.RouteProfilePrefix, utils.AttributeProfilePrefix, @@ -256,33 +253,6 @@ func (rs *RedisStorage) HasDataDrv(ctx *context.Context, category, subject, tena return false, errors.New("unsupported HasData category") } -func (rs *RedisStorage) GetReverseDestinationDrv(key, transactionID string) (ids []string, err error) { - if err = rs.Cmd(&ids, redisSMEMBERS, utils.ReverseDestinationPrefix+key); err != nil { - return - } - if len(ids) == 0 { - err = utils.ErrNotFound - } - return -} - -func (rs *RedisStorage) SetReverseDestinationDrv(destID string, prefixes []string, transactionID string) (err error) { - for _, p := range prefixes { - if err = rs.Cmd(nil, redisSADD, utils.ReverseDestinationPrefix+p, destID); err != nil { - return - } - } - return -} - -func (rs *RedisStorage) RemoveDestinationDrv(destID, transactionID string) (err error) { - return rs.Cmd(nil, redisDEL, utils.DestinationPrefix+destID) -} - -func (rs *RedisStorage) RemoveReverseDestinationDrv(dstID, prfx, transactionID string) (err error) { - return rs.Cmd(nil, redisSREM, utils.ReverseDestinationPrefix+prfx, dstID) -} - // Limit will only retrieve the last n items out of history, newest first func (rs *RedisStorage) GetLoadHistory(limit int, skipCache bool, transactionID string) (loadInsts []*utils.LoadInstance, err error) { diff --git a/engine/storage_sql.go b/engine/storage_sql.go index ff581e252..1060c4d8e 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -99,7 +99,7 @@ func (sqls *SQLStorage) CreateTablesFromScript(scriptPath string) error { func (sqls *SQLStorage) IsDBEmpty() (resp bool, err error) { tbls := []string{ - utils.TBLTPTimings, utils.TBLTPDestinations, + utils.TBLTPTimings, utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds, utils.TBLTPFilters, utils.SessionCostsTBL, utils.CDRsTBL, utils.TBLVersions, utils.TBLTPRoutes, utils.TBLTPAttributes, utils.TBLTPChargers, @@ -123,7 +123,6 @@ func (sqls *SQLStorage) GetTpIds(colName string) ([]string, error) { if colName == "" { for _, clNm := range []string{ utils.TBLTPTimings, - utils.TBLTPDestinations, utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds, @@ -229,7 +228,7 @@ func (sqls *SQLStorage) RemTpData(table, tpid string, args map[string]string) er tx := sqls.db.Begin() if len(table) == 0 { // Remove tpid out of all tables - for _, tblName := range []string{utils.TBLTPTimings, utils.TBLTPDestinations, + for _, tblName := range []string{utils.TBLTPTimings, utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds, utils.TBLTPFilters, utils.TBLTPRoutes, utils.TBLTPAttributes, utils.TBLTPChargers, utils.TBLTPDispatchers, utils.TBLTPDispatcherHosts, utils.TBLTPAccounts, diff --git a/engine/tpexporter.go b/engine/tpexporter.go index cedb4a241..c5f2d5d55 100644 --- a/engine/tpexporter.go +++ b/engine/tpexporter.go @@ -96,18 +96,6 @@ func (tpExp *TPExporter) Run() error { toExportMap[utils.TimingsCsv][i] = sd } - storDataDestinations, err := tpExp.storDB.GetTPDestinations(tpExp.tpID, "") - if err != nil && err.Error() != utils.ErrNotFound.Error() { - utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.AdminS, err, utils.TpDestinations)) - withError = true - } - for _, sd := range storDataDestinations { - sdModels := APItoModelDestination(sd) - for _, sdModel := range sdModels { - toExportMap[utils.DestinationsCsv] = append(toExportMap[utils.DestinationsCsv], sdModel) - } - } - storDataResources, err := tpExp.storDB.GetTPResources(tpExp.tpID, "", "") if err != nil && err.Error() != utils.ErrNotFound.Error() { utils.Logger.Warning(fmt.Sprintf("<%s> error: %s, when getting %s from stordb for export", utils.AdminS, err, utils.TpResources)) diff --git a/engine/tpimporter_csv.go b/engine/tpimporter_csv.go index 3eb44a03d..c84b1208f 100644 --- a/engine/tpimporter_csv.go +++ b/engine/tpimporter_csv.go @@ -41,7 +41,6 @@ type TPCSVImporter struct { // Change it to func(string) error as soon as Travis updates. var fileHandlers = map[string]func(*TPCSVImporter, string) error{ utils.TimingsCsv: (*TPCSVImporter).importTimings, - utils.DestinationsCsv: (*TPCSVImporter).importDestinations, utils.ResourcesCsv: (*TPCSVImporter).importResources, utils.StatsCsv: (*TPCSVImporter).importStats, utils.ThresholdsCsv: (*TPCSVImporter).importThresholds, @@ -92,21 +91,6 @@ func (tpImp *TPCSVImporter) importTimings(fn string) error { return tpImp.StorDB.SetTPTimings(tps) } -func (tpImp *TPCSVImporter) importDestinations(fn string) error { - if tpImp.Verbose { - log.Printf("Processing file: <%s> ", fn) - } - tps, err := tpImp.csvr.GetTPDestinations(tpImp.TPid, "") - if err != nil { - return err - } - for i := 0; i < len(tps); i++ { - tps[i].TPid = tpImp.TPid - } - - return tpImp.StorDB.SetTPDestinations(tps) -} - func (tpImp *TPCSVImporter) importResources(fn string) error { if tpImp.Verbose { log.Printf("Processing file: <%s> ", fn) diff --git a/engine/tpreader.go b/engine/tpreader.go index 147931597..119a45a67 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -1149,8 +1149,6 @@ func (tpr *TpReader) ReloadCache(ctx *context.Context, caching string, verbose b return } // take IDs for each type - dstIds, _ := tpr.GetLoadedIds(utils.DestinationPrefix) - revDstIDs, _ := tpr.GetLoadedIds(utils.ReverseDestinationPrefix) tmgIds, _ := tpr.GetLoadedIds(utils.TimingsPrefix) rspIDs, _ := tpr.GetLoadedIds(utils.ResourceProfilesPrefix) resIDs, _ := tpr.GetLoadedIds(utils.ResourcesPrefix) @@ -1170,23 +1168,21 @@ func (tpr *TpReader) ReloadCache(ctx *context.Context, caching string, verbose b //compose Reload Cache argument cacheArgs := map[string][]string{ - utils.DestinationIDs: dstIds, - utils.ReverseDestinationIDs: revDstIDs, - utils.TimingIDs: tmgIds, - utils.ResourceProfileIDs: rspIDs, - utils.ResourceIDs: resIDs, - utils.StatsQueueIDs: stqIDs, - utils.StatsQueueProfileIDs: stqpIDs, - utils.ThresholdIDs: trsIDs, - utils.ThresholdProfileIDs: trspfIDs, - utils.FilterIDs: flrIDs, - utils.RouteProfileIDs: routeIDs, - utils.AttributeProfileIDs: apfIDs, - utils.ChargerProfileIDs: chargerIDs, - utils.DispatcherProfileIDs: dppIDs, - utils.DispatcherHostIDs: dphIDs, - utils.RateProfileIDs: ratePrfIDs, - utils.ActionProfileIDs: actionPrfIDs, + utils.TimingIDs: tmgIds, + utils.ResourceProfileIDs: rspIDs, + utils.ResourceIDs: resIDs, + utils.StatsQueueIDs: stqIDs, + utils.StatsQueueProfileIDs: stqpIDs, + utils.ThresholdIDs: trsIDs, + utils.ThresholdProfileIDs: trspfIDs, + utils.FilterIDs: flrIDs, + utils.RouteProfileIDs: routeIDs, + utils.AttributeProfileIDs: apfIDs, + utils.ChargerProfileIDs: chargerIDs, + utils.DispatcherProfileIDs: dppIDs, + utils.DispatcherHostIDs: dphIDs, + utils.RateProfileIDs: ratePrfIDs, + utils.ActionProfileIDs: actionPrfIDs, } // verify if we need to clear indexes diff --git a/engine/version.go b/engine/version.go index 3fae99d07..22b75133a 100644 --- a/engine/version.go +++ b/engine/version.go @@ -140,23 +140,21 @@ func (vers Versions) Compare(curent Versions, storType string, isDataDB bool) st // CurrentDataDBVersions returns the needed DataDB versions func CurrentDataDBVersions() Versions { return Versions{ - utils.StatS: 4, - utils.Accounts: 3, - utils.Actions: 2, - utils.Thresholds: 4, - utils.Routes: 2, - utils.Attributes: 7, - utils.Timing: 1, - utils.RQF: 5, - utils.Resource: 1, - utils.Subscribers: 1, - utils.Destinations: 1, - utils.ReverseDestinations: 1, - utils.Chargers: 2, - utils.Dispatchers: 2, - utils.LoadIDsVrs: 1, - utils.RateProfiles: 1, - utils.ActionProfiles: 1, + utils.StatS: 4, + utils.Accounts: 3, + utils.Actions: 2, + utils.Thresholds: 4, + utils.Routes: 2, + utils.Attributes: 7, + utils.Timing: 1, + utils.RQF: 5, + utils.Resource: 1, + utils.Subscribers: 1, + utils.Chargers: 2, + utils.Dispatchers: 2, + utils.LoadIDsVrs: 1, + utils.RateProfiles: 1, + utils.ActionProfiles: 1, } } @@ -173,7 +171,6 @@ func CurrentStorDBVersions() Versions { utils.TpResources: 1, utils.TpTiming: 1, utils.TpResource: 1, - utils.TpDestinations: 1, utils.TpChargers: 1, utils.TpDispatchers: 1, utils.TpRateProfiles: 1, diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 3479234e8..9bdc0c3f1 100644 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -803,8 +803,6 @@ type ArgsGetCacheItemWithAPIOpts struct { func NewAttrReloadCacheWithOpts() *AttrReloadCacheWithAPIOpts { return &AttrReloadCacheWithAPIOpts{ ArgsCache: map[string][]string{ - DestinationIDs: {MetaAny}, - ReverseDestinationIDs: {MetaAny}, ResourceProfileIDs: {MetaAny}, ResourceIDs: {MetaAny}, StatsQueueIDs: {MetaAny}, diff --git a/utils/consts.go b/utils/consts.go index 8fa0e7b82..7827de174 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -47,7 +47,7 @@ var ( CacheCDRIDs, CacheRPCConnections, CacheUCH, CacheSTIR, CacheEventCharges, MetaAPIBan, CacheCapsEvents, CacheVersions, CacheReplicationHosts}) - dataDBPartition = NewStringSet([]string{CacheDestinations, CacheReverseDestinations, CacheTimings, + dataDBPartition = NewStringSet([]string{CacheTimings, CacheResourceProfiles, CacheResources, CacheEventResources, CacheStatQueueProfiles, CacheStatQueues, CacheThresholdProfiles, CacheThresholds, CacheFilters, CacheRouteProfiles, CacheAttributeProfiles, CacheChargerProfiles, CacheActionProfiles, CacheDispatcherProfiles, CacheDispatcherHosts, @@ -57,7 +57,7 @@ var ( CacheActionProfilesFilterIndexes, CacheAccountsFilterIndexes, CacheReverseFilterIndexes, CacheAccounts}) - storDBPartition = NewStringSet([]string{CacheTBLTPTimings, CacheTBLTPDestinations, + storDBPartition = NewStringSet([]string{CacheTBLTPTimings, CacheTBLTPResources, CacheTBLTPStats, CacheTBLTPThresholds, CacheTBLTPFilters, CacheSessionCostsTBL, CacheCDRsTBL, CacheTBLTPRoutes, CacheTBLTPAttributes, CacheTBLTPChargers, CacheTBLTPDispatchers, CacheTBLTPDispatcherHosts, CacheTBLTPRateProfiles, CacheTBLTPActionProfiles, CacheTBLTPAccounts}) @@ -66,8 +66,6 @@ var ( CachePartitions = JoinStringSet(extraDBPartition, dataDBPartition, storDBPartition) CacheInstanceToPrefix = map[string]string{ - CacheDestinations: DestinationPrefix, - CacheReverseDestinations: ReverseDestinationPrefix, CacheResourceProfiles: ResourceProfilesPrefix, CacheResources: ResourcesPrefix, CacheTimings: TimingsPrefix, @@ -132,7 +130,6 @@ var ( CacheStorDBPartitions = map[string]string{ TBLTPTimings: CacheTBLTPTimings, - TBLTPDestinations: CacheTBLTPDestinations, TBLTPResources: CacheTBLTPResources, TBLTPStats: CacheTBLTPStats, TBLTPThresholds: CacheTBLTPThresholds, @@ -153,22 +150,20 @@ var ( ProtectedSFlds = NewStringSet([]string{CGRID, OriginHost, OriginID, Usage}) ArgCacheToPrefix = map[string]string{ - DestinationIDs: DestinationPrefix, - ReverseDestinationIDs: ReverseDestinationPrefix, - ResourceProfileIDs: ResourceProfilesPrefix, - ResourceIDs: ResourcesPrefix, - StatsQueueIDs: StatQueuePrefix, - StatsQueueProfileIDs: StatQueueProfilePrefix, - ThresholdIDs: ThresholdPrefix, - ThresholdProfileIDs: ThresholdProfilePrefix, - FilterIDs: FilterPrefix, - RouteProfileIDs: RouteProfilePrefix, - AttributeProfileIDs: AttributeProfilePrefix, - ChargerProfileIDs: ChargerProfilePrefix, - DispatcherProfileIDs: DispatcherProfilePrefix, - DispatcherHostIDs: DispatcherHostPrefix, - RateProfileIDs: RateProfilePrefix, - ActionProfileIDs: ActionProfilePrefix, + ResourceProfileIDs: ResourceProfilesPrefix, + ResourceIDs: ResourcesPrefix, + StatsQueueIDs: StatQueuePrefix, + StatsQueueProfileIDs: StatQueueProfilePrefix, + ThresholdIDs: ThresholdPrefix, + ThresholdProfileIDs: ThresholdProfilePrefix, + FilterIDs: FilterPrefix, + RouteProfileIDs: RouteProfilePrefix, + AttributeProfileIDs: AttributeProfilePrefix, + ChargerProfileIDs: ChargerProfilePrefix, + DispatcherProfileIDs: DispatcherProfilePrefix, + DispatcherHostIDs: DispatcherHostPrefix, + RateProfileIDs: RateProfilePrefix, + ActionProfileIDs: ActionProfilePrefix, TimingIDs: TimingsPrefix, AttributeFilterIndexIDs: AttributeFilterIndexes, @@ -186,22 +181,21 @@ var ( } CacheInstanceToArg map[string]string ArgCacheToInstance = map[string]string{ - DestinationIDs: CacheDestinations, - ReverseDestinationIDs: CacheReverseDestinations, - ResourceProfileIDs: CacheResourceProfiles, - ResourceIDs: CacheResources, - StatsQueueIDs: CacheStatQueues, - StatsQueueProfileIDs: CacheStatQueueProfiles, - ThresholdIDs: CacheThresholds, - ThresholdProfileIDs: CacheThresholdProfiles, - FilterIDs: CacheFilters, - RouteProfileIDs: CacheRouteProfiles, - AttributeProfileIDs: CacheAttributeProfiles, - ChargerProfileIDs: CacheChargerProfiles, - DispatcherProfileIDs: CacheDispatcherProfiles, - DispatcherHostIDs: CacheDispatcherHosts, - RateProfileIDs: CacheRateProfiles, - ActionProfileIDs: CacheActionProfiles, + + ResourceProfileIDs: CacheResourceProfiles, + ResourceIDs: CacheResources, + StatsQueueIDs: CacheStatQueues, + StatsQueueProfileIDs: CacheStatQueueProfiles, + ThresholdIDs: CacheThresholds, + ThresholdProfileIDs: CacheThresholdProfiles, + FilterIDs: CacheFilters, + RouteProfileIDs: CacheRouteProfiles, + AttributeProfileIDs: CacheAttributeProfiles, + ChargerProfileIDs: CacheChargerProfiles, + DispatcherProfileIDs: CacheDispatcherProfiles, + DispatcherHostIDs: CacheDispatcherHosts, + RateProfileIDs: CacheRateProfiles, + ActionProfileIDs: CacheActionProfiles, TimingIDs: CacheTimings, AttributeFilterIndexIDs: CacheAttributeFilterIndexes, @@ -340,8 +334,6 @@ const ( MetaVoice = "*voice" ACD = "ACD" - DestinationPrefix = "dst_" - ReverseDestinationPrefix = "rds_" ResourcesPrefix = "res_" ResourceProfilesPrefix = "rsp_" ThresholdPrefix = "thd_" @@ -490,81 +482,80 @@ const ( UpdateTime = "UpdateTime" Timings = "Timings" Rates = "Rates" - DestinationRates = "DestinationRates" - RatingPlans = "RatingPlans" - RatingProfiles = "RatingProfiles" - AccountActions = "AccountActions" - Resources = "Resources" - Stats = "Stats" - Filters = "Filters" - DispatcherProfiles = "DispatcherProfiles" - DispatcherHosts = "DispatcherHosts" - RateProfiles = "RateProfiles" - ActionProfiles = "ActionProfiles" - AccountsString = "Accounts" - MetaEveryMinute = "*every_minute" - MetaHourly = "*hourly" - ID = "ID" - Address = "Address" - Addresses = "Addresses" - Transport = "Transport" - TLS = "TLS" - Subsystems = "Subsystems" - Strategy = "Strategy" - StrategyParameters = "StrategyParameters" - ConnID = "ConnID" - ConnFilterIDs = "ConnFilterIDs" - ConnWeight = "ConnWeight" - ConnBlocker = "ConnBlocker" - ConnParameters = "ConnParameters" + //DestinationRates = "DestinationRates" + RatingPlans = "RatingPlans" + RatingProfiles = "RatingProfiles" + AccountActions = "AccountActions" + Resources = "Resources" + Stats = "Stats" + Filters = "Filters" + DispatcherProfiles = "DispatcherProfiles" + DispatcherHosts = "DispatcherHosts" + RateProfiles = "RateProfiles" + ActionProfiles = "ActionProfiles" + AccountsString = "Accounts" + MetaEveryMinute = "*every_minute" + MetaHourly = "*hourly" + ID = "ID" + Address = "Address" + Addresses = "Addresses" + Transport = "Transport" + TLS = "TLS" + Subsystems = "Subsystems" + Strategy = "Strategy" + StrategyParameters = "StrategyParameters" + ConnID = "ConnID" + ConnFilterIDs = "ConnFilterIDs" + ConnWeight = "ConnWeight" + ConnBlocker = "ConnBlocker" + ConnParameters = "ConnParameters" - Thresholds = "Thresholds" - Routes = "Routes" - Attributes = "Attributes" - Chargers = "Chargers" - Dispatchers = "Dispatchers" - StatS = "Stats" - LoadIDsVrs = "LoadIDs" - GlobalVarS = "GlobalVarS" - CostSource = "CostSource" - ExtraInfo = "ExtraInfo" - Meta = "*" - MetaSysLog = "*syslog" - MetaStdLog = "*stdout" - EventSource = "EventSource" - AccountID = "AccountID" - AccountIDs = "AccountIDs" - ResourceID = "ResourceID" - TotalUsage = "TotalUsage" - StatID = "StatID" - BalanceType = "BalanceType" - BalanceID = "BalanceID" - BalanceDestinationIds = "BalanceDestinationIds" - BalanceWeight = "BalanceWeight" - BalanceRatingSubject = "BalanceRatingSubject" - BalanceCategories = "BalanceCategories" - BalanceBlocker = "BalanceBlocker" - BalanceDisabled = "BalanceDisabled" - Units = "Units" - AccountUpdate = "AccountUpdate" - BalanceUpdate = "BalanceUpdate" - StatUpdate = "StatUpdate" - ResourceUpdate = "ResourceUpdate" - CDR = "CDR" - CDRs = "CDRs" - ExpiryTime = "ExpiryTime" - AllowNegative = "AllowNegative" - Disabled = "Disabled" - Action = "Action" + Thresholds = "Thresholds" + Routes = "Routes" + Attributes = "Attributes" + Chargers = "Chargers" + Dispatchers = "Dispatchers" + StatS = "Stats" + LoadIDsVrs = "LoadIDs" + GlobalVarS = "GlobalVarS" + CostSource = "CostSource" + ExtraInfo = "ExtraInfo" + Meta = "*" + MetaSysLog = "*syslog" + MetaStdLog = "*stdout" + EventSource = "EventSource" + AccountID = "AccountID" + AccountIDs = "AccountIDs" + ResourceID = "ResourceID" + TotalUsage = "TotalUsage" + StatID = "StatID" + BalanceType = "BalanceType" + BalanceID = "BalanceID" + //BalanceDestinationIds = "BalanceDestinationIds" + BalanceWeight = "BalanceWeight" + BalanceRatingSubject = "BalanceRatingSubject" + BalanceCategories = "BalanceCategories" + BalanceBlocker = "BalanceBlocker" + BalanceDisabled = "BalanceDisabled" + Units = "Units" + AccountUpdate = "AccountUpdate" + BalanceUpdate = "BalanceUpdate" + StatUpdate = "StatUpdate" + ResourceUpdate = "ResourceUpdate" + CDR = "CDR" + CDRs = "CDRs" + ExpiryTime = "ExpiryTime" + AllowNegative = "AllowNegative" + Disabled = "Disabled" + Action = "Action" - SessionSCosts = "SessionSCosts" - Timing = "Timing" - RQF = "RQF" - Resource = "Resource" - User = "User" - Subscribers = "Subscribers" - Destinations = "Destinations" - ReverseDestinations = "ReverseDestinations" + SessionSCosts = "SessionSCosts" + Timing = "Timing" + RQF = "RQF" + Resource = "Resource" + User = "User" + Subscribers = "Subscribers" + //Destinations = "Destinations" MetaSubscribers = "*subscribers" MetaStorDB = "*stordb" MetaDataDB = "*datadb" @@ -769,8 +760,6 @@ const ( UUID = "UUID" ActionsID = "ActionsID" MetaAct = "*act" - DestinationPrefixName = "DestinationPrefix" - DestinationID = "DestinationID" ExportTemplate = "ExportTemplate" Synchronous = "Synchronous" Attempts = "Attempts" @@ -890,25 +879,24 @@ const ( // Meta Items const ( - MetaAccounts = "*accounts" - MetaReverseDestinations = "*reverse_destinations" - MetaActions = "*actions" - MetaResourceProfile = "*resource_profiles" - MetaStatQueueProfiles = "*statqueue_profiles" - MetaStatQueues = "*statqueues" - MetaThresholdProfiles = "*threshold_profiles" - MetaRouteProfiles = "*route_profiles" - MetaAttributeProfiles = "*attribute_profiles" - MetaIndexes = "*indexes" - MetaDispatcherProfiles = "*dispatcher_profiles" - MetaRateProfiles = "*rate_profiles" - MetaRateProfileRates = "*rate_profile_rates" - MetaChargerProfiles = "*charger_profiles" - MetaThresholds = "*thresholds" - MetaRoutes = "*routes" - MetaAttributes = "*attributes" - MetaActionProfiles = "*action_profiles" - MetaLoadIDs = "*load_ids" + MetaAccounts = "*accounts" + MetaActions = "*actions" + MetaResourceProfile = "*resource_profiles" + MetaStatQueueProfiles = "*statqueue_profiles" + MetaStatQueues = "*statqueues" + MetaThresholdProfiles = "*threshold_profiles" + MetaRouteProfiles = "*route_profiles" + MetaAttributeProfiles = "*attribute_profiles" + MetaIndexes = "*indexes" + MetaDispatcherProfiles = "*dispatcher_profiles" + MetaRateProfiles = "*rate_profiles" + MetaRateProfileRates = "*rate_profile_rates" + MetaChargerProfiles = "*charger_profiles" + MetaThresholds = "*thresholds" + MetaRoutes = "*routes" + MetaAttributes = "*attributes" + MetaActionProfiles = "*action_profiles" + MetaLoadIDs = "*load_ids" ) // MetaMetrics @@ -976,7 +964,6 @@ const ( MetaDisableAccount = "*disable_account" MetaUnlimited = "*unlimited" CDRLog = "*cdrlog" - MetaSetDDestinations = "*set_ddestinations" MetaCgrRpc = "*cgr_rpc" MetaRemoveSessionCosts = "*remove_session_costs" MetaPostEvent = "*post_event" @@ -1008,7 +995,6 @@ const ( MetaTpRateProfiles = "*tp_rate_profiles" MetaTpResources = "*tp_resources" MetaTpTimings = "*tp_timings" - MetaTpDestinations = "*tp_destinations" MetaTpChargers = "*tp_chargers" MetaTpDispatchers = "*tp_dispatchers" MetaDurationSeconds = "*duration_seconds" @@ -1031,7 +1017,6 @@ const ( TpResources = "TpResources" TpTiming = "TpTiming" TpResource = "TpResource" - TpDestinations = "TpDestinations" TpChargers = "TpChargers" TpDispatchers = "TpDispatchers" TpDispatcherProfiles = "TpDispatcherProfiles" @@ -1071,7 +1056,6 @@ const ( MetaExists = "*exists" MetaCronExp = "*cronexp" MetaRSR = "*rsr" - MetaDestinations = "*destinations" MetaLessThan = "*lt" MetaLessOrEqual = "*lte" MetaGreaterThan = "*gt" @@ -1090,7 +1074,6 @@ const ( MetaNotCronExp = "*notcronexp" MetaNotRSR = "*notrsr" MetaNotStatS = "*notstats" - MetaNotDestinations = "*notdestinations" MetaNotResources = "*notresources" MetaNotEqual = "*noteq" MetaNotIPNet = "*notipnet" @@ -1102,50 +1085,46 @@ const ( // ReplicatorSv1 APIs const ( - ReplicatorSv1 = "ReplicatorSv1" - ReplicatorSv1Ping = "ReplicatorSv1.Ping" - ReplicatorSv1GetDestination = "ReplicatorSv1.GetDestination" - ReplicatorSv1GetReverseDestination = "ReplicatorSv1.GetReverseDestination" - ReplicatorSv1GetStatQueue = "ReplicatorSv1.GetStatQueue" - ReplicatorSv1GetFilter = "ReplicatorSv1.GetFilter" - ReplicatorSv1GetThreshold = "ReplicatorSv1.GetThreshold" - ReplicatorSv1GetThresholdProfile = "ReplicatorSv1.GetThresholdProfile" - ReplicatorSv1GetStatQueueProfile = "ReplicatorSv1.GetStatQueueProfile" - ReplicatorSv1GetTiming = "ReplicatorSv1.GetTiming" - ReplicatorSv1GetResource = "ReplicatorSv1.GetResource" - ReplicatorSv1GetResourceProfile = "ReplicatorSv1.GetResourceProfile" - ReplicatorSv1GetActions = "ReplicatorSv1.GetActions" - ReplicatorSv1GetRouteProfile = "ReplicatorSv1.GetRouteProfile" - ReplicatorSv1GetAttributeProfile = "ReplicatorSv1.GetAttributeProfile" - ReplicatorSv1GetChargerProfile = "ReplicatorSv1.GetChargerProfile" - ReplicatorSv1GetDispatcherProfile = "ReplicatorSv1.GetDispatcherProfile" - ReplicatorSv1GetRateProfile = "ReplicatorSv1.GetRateProfile" - ReplicatorSv1GetActionProfile = "ReplicatorSv1.GetActionProfile" - ReplicatorSv1GetDispatcherHost = "ReplicatorSv1.GetDispatcherHost" - ReplicatorSv1GetAccount = "ReplicatorSv1.GetAccount" - ReplicatorSv1GetItemLoadIDs = "ReplicatorSv1.GetItemLoadIDs" - ReplicatorSv1SetThresholdProfile = "ReplicatorSv1.SetThresholdProfile" - ReplicatorSv1SetThreshold = "ReplicatorSv1.SetThreshold" - ReplicatorSv1SetDestination = "ReplicatorSv1.SetDestination" - ReplicatorSv1SetReverseDestination = "ReplicatorSv1.SetReverseDestination" - ReplicatorSv1SetStatQueue = "ReplicatorSv1.SetStatQueue" - ReplicatorSv1SetFilter = "ReplicatorSv1.SetFilter" - ReplicatorSv1SetStatQueueProfile = "ReplicatorSv1.SetStatQueueProfile" - ReplicatorSv1SetTiming = "ReplicatorSv1.SetTiming" - ReplicatorSv1SetResource = "ReplicatorSv1.SetResource" - ReplicatorSv1SetResourceProfile = "ReplicatorSv1.SetResourceProfile" - ReplicatorSv1SetActions = "ReplicatorSv1.SetActions" - ReplicatorSv1SetRouteProfile = "ReplicatorSv1.SetRouteProfile" - ReplicatorSv1SetAttributeProfile = "ReplicatorSv1.SetAttributeProfile" - ReplicatorSv1SetChargerProfile = "ReplicatorSv1.SetChargerProfile" - ReplicatorSv1SetDispatcherProfile = "ReplicatorSv1.SetDispatcherProfile" - ReplicatorSv1SetRateProfile = "ReplicatorSv1.SetRateProfile" - ReplicatorSv1SetActionProfile = "ReplicatorSv1.SetActionProfile" - ReplicatorSv1SetAccount = "ReplicatorSv1.SetAccount" - ReplicatorSv1SetDispatcherHost = "ReplicatorSv1.SetDispatcherHost" - ReplicatorSv1SetLoadIDs = "ReplicatorSv1.SetLoadIDs" - ReplicatorSv1RemoveThreshold = "ReplicatorSv1.RemoveThreshold" - ReplicatorSv1RemoveDestination = "ReplicatorSv1.RemoveDestination" + ReplicatorSv1 = "ReplicatorSv1" + ReplicatorSv1Ping = "ReplicatorSv1.Ping" + ReplicatorSv1GetStatQueue = "ReplicatorSv1.GetStatQueue" + ReplicatorSv1GetFilter = "ReplicatorSv1.GetFilter" + ReplicatorSv1GetThreshold = "ReplicatorSv1.GetThreshold" + ReplicatorSv1GetThresholdProfile = "ReplicatorSv1.GetThresholdProfile" + ReplicatorSv1GetStatQueueProfile = "ReplicatorSv1.GetStatQueueProfile" + ReplicatorSv1GetTiming = "ReplicatorSv1.GetTiming" + ReplicatorSv1GetResource = "ReplicatorSv1.GetResource" + ReplicatorSv1GetResourceProfile = "ReplicatorSv1.GetResourceProfile" + ReplicatorSv1GetActions = "ReplicatorSv1.GetActions" + ReplicatorSv1GetRouteProfile = "ReplicatorSv1.GetRouteProfile" + ReplicatorSv1GetAttributeProfile = "ReplicatorSv1.GetAttributeProfile" + ReplicatorSv1GetChargerProfile = "ReplicatorSv1.GetChargerProfile" + ReplicatorSv1GetDispatcherProfile = "ReplicatorSv1.GetDispatcherProfile" + ReplicatorSv1GetRateProfile = "ReplicatorSv1.GetRateProfile" + ReplicatorSv1GetActionProfile = "ReplicatorSv1.GetActionProfile" + ReplicatorSv1GetDispatcherHost = "ReplicatorSv1.GetDispatcherHost" + ReplicatorSv1GetAccount = "ReplicatorSv1.GetAccount" + ReplicatorSv1GetItemLoadIDs = "ReplicatorSv1.GetItemLoadIDs" + ReplicatorSv1SetThresholdProfile = "ReplicatorSv1.SetThresholdProfile" + ReplicatorSv1SetThreshold = "ReplicatorSv1.SetThreshold" + ReplicatorSv1SetStatQueue = "ReplicatorSv1.SetStatQueue" + ReplicatorSv1SetFilter = "ReplicatorSv1.SetFilter" + ReplicatorSv1SetStatQueueProfile = "ReplicatorSv1.SetStatQueueProfile" + ReplicatorSv1SetTiming = "ReplicatorSv1.SetTiming" + ReplicatorSv1SetResource = "ReplicatorSv1.SetResource" + ReplicatorSv1SetResourceProfile = "ReplicatorSv1.SetResourceProfile" + ReplicatorSv1SetActions = "ReplicatorSv1.SetActions" + ReplicatorSv1SetRouteProfile = "ReplicatorSv1.SetRouteProfile" + ReplicatorSv1SetAttributeProfile = "ReplicatorSv1.SetAttributeProfile" + ReplicatorSv1SetChargerProfile = "ReplicatorSv1.SetChargerProfile" + ReplicatorSv1SetDispatcherProfile = "ReplicatorSv1.SetDispatcherProfile" + ReplicatorSv1SetRateProfile = "ReplicatorSv1.SetRateProfile" + ReplicatorSv1SetActionProfile = "ReplicatorSv1.SetActionProfile" + ReplicatorSv1SetAccount = "ReplicatorSv1.SetAccount" + ReplicatorSv1SetDispatcherHost = "ReplicatorSv1.SetDispatcherHost" + ReplicatorSv1SetLoadIDs = "ReplicatorSv1.SetLoadIDs" + ReplicatorSv1RemoveThreshold = "ReplicatorSv1.RemoveThreshold" + ReplicatorSv1RemoveStatQueue = "ReplicatorSv1.RemoveStatQueue" ReplicatorSv1RemoveFilter = "ReplicatorSv1.RemoveFilter" ReplicatorSv1RemoveThresholdProfile = "ReplicatorSv1.RemoveThresholdProfile" @@ -1169,91 +1148,85 @@ const ( // APIerSv1 APIs const ( - AdminSv1ComputeFilterIndexes = "AdminSv1.ComputeFilterIndexes" - AdminSv1ComputeFilterIndexIDs = "AdminSv1.ComputeFilterIndexIDs" - APIerSv1Ping = "APIerSv1.Ping" - APIerSv1SetDispatcherProfile = "APIerSv1.SetDispatcherProfile" - APIerSv1GetDispatcherProfile = "APIerSv1.GetDispatcherProfile" - APIerSv1GetDispatcherProfileIDs = "APIerSv1.GetDispatcherProfileIDs" - APIerSv1RemoveDispatcherProfile = "APIerSv1.RemoveDispatcherProfile" - APIerSv1SetBalances = "APIerSv1.SetBalances" - APIerSv1SetDispatcherHost = "APIerSv1.SetDispatcherHost" - APIerSv1GetDispatcherHost = "APIerSv1.GetDispatcherHost" - APIerSv1GetDispatcherHostIDs = "APIerSv1.GetDispatcherHostIDs" - APIerSv1RemoveDispatcherHost = "APIerSv1.RemoveDispatcherHost" - APIerSv1GetEventCost = "APIerSv1.GetEventCost" - APIerSv1LoadTariffPlanFromFolder = "APIerSv1.LoadTariffPlanFromFolder" - APIerSv1ExportToFolder = "APIerSv1.ExportToFolder" - APIerSv1GetCost = "APIerSv1.GetCost" - AdminSv1GetFilter = "AdminSv1.GetFilter" - AdminSv1GetFilterIndexes = "AdminSv1.GetFilterIndexes" - AdminSv1RemoveFilterIndexes = "AdminSv1.RemoveFilterIndexes" - AdminSv1RemoveFilter = "AdminSv1.RemoveFilter" - AdminSv1SetFilter = "AdminSv1.SetFilter" - AdminSv1GetFilterIDs = "AdminSv1.GetFilterIDs" - APIerSv1SetDataDBVersions = "APIerSv1.SetDataDBVersions" - APIerSv1SetStorDBVersions = "APIerSv1.SetStorDBVersions" - APIerSv1GetActions = "APIerSv1.GetActions" - APIerSv1GetDestination = "APIerSv1.GetDestination" - APIerSv1RemoveDestination = "APIerSv1.RemoveDestination" - APIerSv1GetReverseDestination = "APIerSv1.GetReverseDestination" - APIerSv1GetDataDBVersions = "APIerSv1.GetDataDBVersions" - APIerSv1GetStorDBVersions = "APIerSv1.GetStorDBVersions" - APIerSv1GetCDRs = "APIerSv1.GetCDRs" - APIerSv1GetTPActions = "APIerSv1.GetTPActions" - APIerSv1GetTPAttributeProfile = "APIerSv1.GetTPAttributeProfile" - APIerSv1SetTPAttributeProfile = "APIerSv1.SetTPAttributeProfile" - APIerSv1GetTPAttributeProfileIds = "APIerSv1.GetTPAttributeProfileIds" - APIerSv1RemoveTPAttributeProfile = "APIerSv1.RemoveTPAttributeProfile" - APIerSv1GetTPCharger = "APIerSv1.GetTPCharger" - APIerSv1SetTPCharger = "APIerSv1.SetTPCharger" - APIerSv1RemoveTPCharger = "APIerSv1.RemoveTPCharger" - APIerSv1GetTPChargerIDs = "APIerSv1.GetTPChargerIDs" - APIerSv1SetTPFilterProfile = "APIerSv1.SetTPFilterProfile" - APIerSv1GetTPFilterProfile = "APIerSv1.GetTPFilterProfile" - APIerSv1GetTPFilterProfileIds = "APIerSv1.GetTPFilterProfileIds" - APIerSv1RemoveTPFilterProfile = "APIerSv1.RemoveTPFilterProfile" - APIerSv1GetTPDestination = "APIerSv1.GetTPDestination" - APIerSv1SetTPDestination = "APIerSv1.SetTPDestination" - APIerSv1GetTPDestinationIDs = "APIerSv1.GetTPDestinationIDs" - APIerSv1RemoveTPDestination = "APIerSv1.RemoveTPDestination" - APIerSv1GetTPResource = "APIerSv1.GetTPResource" - APIerSv1SetTPResource = "APIerSv1.SetTPResource" - APIerSv1RemoveTPResource = "APIerSv1.RemoveTPResource" - APIerSv1SetTPRate = "APIerSv1.SetTPRate" - APIerSv1GetTPRate = "APIerSv1.GetTPRate" - APIerSv1RemoveTPRate = "APIerSv1.RemoveTPRate" - APIerSv1GetTPRateIds = "APIerSv1.GetTPRateIds" - APIerSv1SetTPThreshold = "APIerSv1.SetTPThreshold" - APIerSv1GetTPThreshold = "APIerSv1.GetTPThreshold" - APIerSv1GetTPThresholdIDs = "APIerSv1.GetTPThresholdIDs" - APIerSv1RemoveTPThreshold = "APIerSv1.RemoveTPThreshold" - APIerSv1SetTPStat = "APIerSv1.SetTPStat" - APIerSv1GetTPStat = "APIerSv1.GetTPStat" - APIerSv1RemoveTPStat = "APIerSv1.RemoveTPStat" - APIerSv1SetTPRouteProfile = "APIerSv1.SetTPRouteProfile" - APIerSv1GetTPRouteProfile = "APIerSv1.GetTPRouteProfile" - APIerSv1GetTPRouteProfileIDs = "APIerSv1.GetTPRouteProfileIDs" - APIerSv1RemoveTPRouteProfile = "APIerSv1.RemoveTPRouteProfile" - APIerSv1GetTPDispatcherProfile = "APIerSv1.GetTPDispatcherProfile" - APIerSv1SetTPDispatcherProfile = "APIerSv1.SetTPDispatcherProfile" - APIerSv1RemoveTPDispatcherProfile = "APIerSv1.RemoveTPDispatcherProfile" - APIerSv1GetTPDispatcherProfileIDs = "APIerSv1.GetTPDispatcherProfileIDs" - APIerSv1ExportCDRs = "APIerSv1.ExportCDRs" - APIerSv1SetTPRatingPlan = "APIerSv1.SetTPRatingPlan" - APIerSv1SetTPActions = "APIerSv1.SetTPActions" - APIerSv1GetTPActionIds = "APIerSv1.GetTPActionIds" - APIerSv1RemoveTPActions = "APIerSv1.RemoveTPActions" - APIerSv1SetActionPlan = "APIerSv1.SetActionPlan" - APIerSv1ExecuteAction = "APIerSv1.ExecuteAction" - APIerSv1SetTPRatingProfile = "APIerSv1.SetTPRatingProfile" - APIerSv1GetTPRatingProfile = "APIerSv1.GetTPRatingProfile" - APIerSv1SetTPDestinationRate = "APIerSv1.SetTPDestinationRate" - APIerSv1ImportTariffPlanFromFolder = "APIerSv1.ImportTariffPlanFromFolder" - APIerSv1ExportTPToFolder = "APIerSv1.ExportTPToFolder" - APIerSv1SetActions = "APIerSv1.SetActions" - APIerSv1ComputeReverseDestinations = "APIerSv1.ComputeReverseDestinations" - APIerSv1SetDestination = "APIerSv1.SetDestination" + AdminSv1ComputeFilterIndexes = "AdminSv1.ComputeFilterIndexes" + AdminSv1ComputeFilterIndexIDs = "AdminSv1.ComputeFilterIndexIDs" + APIerSv1Ping = "APIerSv1.Ping" + APIerSv1SetDispatcherProfile = "APIerSv1.SetDispatcherProfile" + APIerSv1GetDispatcherProfile = "APIerSv1.GetDispatcherProfile" + APIerSv1GetDispatcherProfileIDs = "APIerSv1.GetDispatcherProfileIDs" + APIerSv1RemoveDispatcherProfile = "APIerSv1.RemoveDispatcherProfile" + APIerSv1SetBalances = "APIerSv1.SetBalances" + APIerSv1SetDispatcherHost = "APIerSv1.SetDispatcherHost" + APIerSv1GetDispatcherHost = "APIerSv1.GetDispatcherHost" + APIerSv1GetDispatcherHostIDs = "APIerSv1.GetDispatcherHostIDs" + APIerSv1RemoveDispatcherHost = "APIerSv1.RemoveDispatcherHost" + APIerSv1GetEventCost = "APIerSv1.GetEventCost" + APIerSv1LoadTariffPlanFromFolder = "APIerSv1.LoadTariffPlanFromFolder" + APIerSv1ExportToFolder = "APIerSv1.ExportToFolder" + APIerSv1GetCost = "APIerSv1.GetCost" + AdminSv1GetFilter = "AdminSv1.GetFilter" + AdminSv1GetFilterIndexes = "AdminSv1.GetFilterIndexes" + AdminSv1RemoveFilterIndexes = "AdminSv1.RemoveFilterIndexes" + AdminSv1RemoveFilter = "AdminSv1.RemoveFilter" + AdminSv1SetFilter = "AdminSv1.SetFilter" + AdminSv1GetFilterIDs = "AdminSv1.GetFilterIDs" + APIerSv1SetDataDBVersions = "APIerSv1.SetDataDBVersions" + APIerSv1SetStorDBVersions = "APIerSv1.SetStorDBVersions" + APIerSv1GetActions = "APIerSv1.GetActions" + + APIerSv1GetDataDBVersions = "APIerSv1.GetDataDBVersions" + APIerSv1GetStorDBVersions = "APIerSv1.GetStorDBVersions" + APIerSv1GetCDRs = "APIerSv1.GetCDRs" + APIerSv1GetTPActions = "APIerSv1.GetTPActions" + APIerSv1GetTPAttributeProfile = "APIerSv1.GetTPAttributeProfile" + APIerSv1SetTPAttributeProfile = "APIerSv1.SetTPAttributeProfile" + APIerSv1GetTPAttributeProfileIds = "APIerSv1.GetTPAttributeProfileIds" + APIerSv1RemoveTPAttributeProfile = "APIerSv1.RemoveTPAttributeProfile" + APIerSv1GetTPCharger = "APIerSv1.GetTPCharger" + APIerSv1SetTPCharger = "APIerSv1.SetTPCharger" + APIerSv1RemoveTPCharger = "APIerSv1.RemoveTPCharger" + APIerSv1GetTPChargerIDs = "APIerSv1.GetTPChargerIDs" + APIerSv1SetTPFilterProfile = "APIerSv1.SetTPFilterProfile" + APIerSv1GetTPFilterProfile = "APIerSv1.GetTPFilterProfile" + APIerSv1GetTPFilterProfileIds = "APIerSv1.GetTPFilterProfileIds" + APIerSv1RemoveTPFilterProfile = "APIerSv1.RemoveTPFilterProfile" + + APIerSv1GetTPResource = "APIerSv1.GetTPResource" + APIerSv1SetTPResource = "APIerSv1.SetTPResource" + APIerSv1RemoveTPResource = "APIerSv1.RemoveTPResource" + APIerSv1SetTPRate = "APIerSv1.SetTPRate" + APIerSv1GetTPRate = "APIerSv1.GetTPRate" + APIerSv1RemoveTPRate = "APIerSv1.RemoveTPRate" + APIerSv1GetTPRateIds = "APIerSv1.GetTPRateIds" + APIerSv1SetTPThreshold = "APIerSv1.SetTPThreshold" + APIerSv1GetTPThreshold = "APIerSv1.GetTPThreshold" + APIerSv1GetTPThresholdIDs = "APIerSv1.GetTPThresholdIDs" + APIerSv1RemoveTPThreshold = "APIerSv1.RemoveTPThreshold" + APIerSv1SetTPStat = "APIerSv1.SetTPStat" + APIerSv1GetTPStat = "APIerSv1.GetTPStat" + APIerSv1RemoveTPStat = "APIerSv1.RemoveTPStat" + APIerSv1SetTPRouteProfile = "APIerSv1.SetTPRouteProfile" + APIerSv1GetTPRouteProfile = "APIerSv1.GetTPRouteProfile" + APIerSv1GetTPRouteProfileIDs = "APIerSv1.GetTPRouteProfileIDs" + APIerSv1RemoveTPRouteProfile = "APIerSv1.RemoveTPRouteProfile" + APIerSv1GetTPDispatcherProfile = "APIerSv1.GetTPDispatcherProfile" + APIerSv1SetTPDispatcherProfile = "APIerSv1.SetTPDispatcherProfile" + APIerSv1RemoveTPDispatcherProfile = "APIerSv1.RemoveTPDispatcherProfile" + APIerSv1GetTPDispatcherProfileIDs = "APIerSv1.GetTPDispatcherProfileIDs" + APIerSv1ExportCDRs = "APIerSv1.ExportCDRs" + APIerSv1SetTPRatingPlan = "APIerSv1.SetTPRatingPlan" + APIerSv1SetTPActions = "APIerSv1.SetTPActions" + APIerSv1GetTPActionIds = "APIerSv1.GetTPActionIds" + APIerSv1RemoveTPActions = "APIerSv1.RemoveTPActions" + APIerSv1SetActionPlan = "APIerSv1.SetActionPlan" + APIerSv1ExecuteAction = "APIerSv1.ExecuteAction" + APIerSv1SetTPRatingProfile = "APIerSv1.SetTPRatingProfile" + APIerSv1GetTPRatingProfile = "APIerSv1.GetTPRatingProfile" + + APIerSv1ImportTariffPlanFromFolder = "APIerSv1.ImportTariffPlanFromFolder" + APIerSv1ExportTPToFolder = "APIerSv1.ExportTPToFolder" + APIerSv1SetActions = "APIerSv1.SetActions" + APIerSv1GetDataCost = "APIerSv1.GetDataCost" APIerSv1ReplayFailedPosts = "APIerSv1.ReplayFailedPosts" APIerSv1GetCacheStats = "APIerSv1.GetCacheStats" @@ -1579,8 +1552,8 @@ const ( //CSV file name const ( - TimingsCsv = "Timings.csv" - DestinationsCsv = "Destinations.csv" + TimingsCsv = "Timings.csv" + ResourcesCsv = "Resources.csv" StatsCsv = "Stats.csv" ThresholdsCsv = "Thresholds.csv" @@ -1597,8 +1570,8 @@ const ( // Table Name const ( - TBLTPTimings = "tp_timings" - TBLTPDestinations = "tp_destinations" + TBLTPTimings = "tp_timings" + TBLTPResources = "tp_resources" TBLTPStats = "tp_stats" TBLTPThresholds = "tp_thresholds" @@ -1619,8 +1592,6 @@ const ( // Cache Name const ( - CacheDestinations = "*destinations" - CacheReverseDestinations = "*reverse_destinations" CacheResources = "*resources" CacheResourceProfiles = "*resource_profiles" CacheTimings = "*timings" @@ -1669,8 +1640,8 @@ const ( CacheReplicationHosts = "*replication_hosts" // storDB - CacheTBLTPTimings = "*tp_timings" - CacheTBLTPDestinations = "*tp_destinations" + CacheTBLTPTimings = "*tp_timings" + CacheTBLTPResources = "*tp_resources" CacheTBLTPStats = "*tp_stats" CacheTBLTPThresholds = "*tp_thresholds" @@ -2278,8 +2249,6 @@ const ( // ArgCache constats const ( - DestinationIDs = "DestinationIDs" - ReverseDestinationIDs = "ReverseDestinationIDs" ResourceProfileIDs = "ResourceProfileIDs" ResourceIDs = "ResourceIDs" StatsQueueIDs = "StatsQueueIDs"