From 78cbb5932b81e565a48775ac3c55b879d652c81d Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 9 Mar 2021 17:08:59 +0200 Subject: [PATCH] Added replication filtering --- apier/v1/api_interfaces.go | 2 +- apier/v1/api_interfaces_test.go | 2 +- apier/v1/dispatcher.go | 2 +- apier/v1/full_remote_it_test.go | 35 +- apier/v1/libapier.go | 58 +- apier/v1/remote_it_test.go | 38 +- apier/v1/replicator.go | 1411 ++++++++++------- cmd/cgr-engine/cgr-engine.go | 2 +- config/config_defaults.go | 11 +- config/config_json_test.go | 3 +- config/config_test.go | 7 +- config/configsanity.go | 22 + config/datadbcfg.go | 16 +- config/libconfig_json.go | 5 +- data/conf/cgrates/cgrates.json | 10 +- .../engine1_mongo/cgrates.json | 11 +- .../engine1_redis/cgrates.json | 11 +- .../engine2_mongo/cgrates.json | 10 +- .../engine2_redis/cgrates.json | 10 +- .../internal/cgrates.json | 16 +- .../samples/full_remote/internal/cgrates.json | 2 +- data/conf/samples/gocs/au_site/cgrates.json | 2 +- data/conf/samples/gocs/us_site/cgrates.json | 2 +- .../remote_replication/internal/cgrates.json | 6 +- .../samples/replication/internal/cgrates.json | 4 +- dispatchers/replicator.go | 4 +- dispatchers/replicator_it_test.go | 4 +- engine/caches.go | 5 - engine/datamanager.go | 591 +++---- engine/libstats.go | 4 +- engine/storage_mongo_datadb.go | 5 + engine/storage_redis.go | 5 + general_tests/filtered_replication_it_test.go | 317 +++- packages/debian/changelog | 1 + registrarc/libregistrarc_test.go | 12 +- services/apierv1.go | 2 +- sessions/sessionscover_test.go | 28 +- utils/consts.go | 7 +- utils/coreutils.go | 19 + 39 files changed, 1588 insertions(+), 1114 deletions(-) diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go index 5b3903d61..ab400aa78 100644 --- a/apier/v1/api_interfaces.go +++ b/apier/v1/api_interfaces.go @@ -223,7 +223,7 @@ type ReplicatorSv1Interface interface { SetAccount(acc *engine.AccountWithOpts, reply *string) error SetDestination(dst *engine.DestinationWithOpts, reply *string) error SetReverseDestination(dst *engine.DestinationWithOpts, reply *string) error - SetStatQueue(ssq *engine.StoredStatQueueWithOpts, reply *string) error + SetStatQueue(ssq *engine.StatQueueWithOpts, reply *string) error SetFilter(fltr *engine.FilterWithOpts, reply *string) error SetStatQueueProfile(sq *engine.StatQueueProfileWithOpts, reply *string) error SetTiming(tm *utils.TPTimingWithOpts, reply *string) error diff --git a/apier/v1/api_interfaces_test.go b/apier/v1/api_interfaces_test.go index f8926ed34..3abd44b35 100644 --- a/apier/v1/api_interfaces_test.go +++ b/apier/v1/api_interfaces_test.go @@ -111,7 +111,7 @@ func TestCoreSv1Interface(t *testing.T) { func TestReplicatorSv1Interface(t *testing.T) { _ = ReplicatorSv1Interface(NewDispatcherReplicatorSv1(nil)) - _ = ReplicatorSv1Interface(NewReplicatorSv1(nil)) + _ = ReplicatorSv1Interface(NewReplicatorSv1(nil, nil)) } func TestRateSv1Interface(t *testing.T) { diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index c2bea902a..1dfcc0308 100755 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -1066,7 +1066,7 @@ func (dS *DispatcherReplicatorSv1) SetReverseDestination(args *engine.Destinatio } // SetStatQueue -func (dS *DispatcherReplicatorSv1) SetStatQueue(args *engine.StoredStatQueueWithOpts, reply *string) error { +func (dS *DispatcherReplicatorSv1) SetStatQueue(args *engine.StatQueueWithOpts, reply *string) error { return dS.dS.ReplicatorSv1SetStatQueue(args, reply) } diff --git a/apier/v1/full_remote_it_test.go b/apier/v1/full_remote_it_test.go index 34f32efee..25c77c699 100644 --- a/apier/v1/full_remote_it_test.go +++ b/apier/v1/full_remote_it_test.go @@ -137,15 +137,11 @@ func testFullRemoteITAttribute(t *testing.T) { ID: "ATTR_1001_SIMPLEAUTH", Contexts: []string{"simpleauth"}, FilterIDs: []string{"*string:~*req.Account:1001"}, - - Attributes: []*engine.Attribute{ - { - Path: utils.MetaReq + utils.NestingSep + "Password", - FilterIDs: []string{}, - Type: utils.MetaConstant, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), - }, - }, + Attributes: []*engine.Attribute{{ + Path: utils.MetaReq + utils.NestingSep + "Password", + Type: utils.MetaConstant, + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), + }}, Weight: 20, }, } @@ -385,18 +381,14 @@ func testFullRemoteITRoute(t *testing.T) { ActivationInterval: &utils.ActivationInterval{ ActivationTime: time.Date(2017, 11, 27, 0, 0, 0, 0, time.UTC), }, - Sorting: utils.MetaWeight, - SortingParameters: []string{}, - Routes: []*engine.Route{ - { - ID: "route1", - Weight: 10, - }, - { - ID: "route2", - Weight: 20, - }, - }, + Sorting: utils.MetaWeight, + Routes: []*engine.Route{{ + ID: "route1", + Weight: 10, + }, { + ID: "route2", + Weight: 20, + }}, Weight: 20, } // add a threshold profile in engine1 and verify it internal @@ -509,7 +501,6 @@ func testFullRemoteITCharger(t *testing.T) { chargerProfile := &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "DEFAULT", - FilterIDs: []string{}, RunID: utils.MetaDefault, AttributeIDs: []string{utils.MetaNone}, Weight: 0, diff --git a/apier/v1/libapier.go b/apier/v1/libapier.go index 348377038..9c78f30c4 100644 --- a/apier/v1/libapier.go +++ b/apier/v1/libapier.go @@ -54,12 +54,19 @@ func (apierSv1 *APIerSv1) CallCache(cacheopt *string, tnt, cacheID, itemID strin return } case utils.MetaClear: + cacheIDs := make([]string, 1, 2) + cacheIDs[0] = cacheID + // do not send a EmptyString if the item doesn't have indexes + if cIdx, has := utils.CacheInstanceToCacheIndex[cacheID]; has { + cacheIDs = append(cacheIDs, cIdx) + } method = utils.CacheSv1Clear args = &utils.AttrCacheIDsWithOpts{ Tenant: tnt, - CacheIDs: []string{cacheID, utils.CacheInstanceToCacheIndex[cacheID]}, + CacheIDs: cacheIDs, Opts: opts, } + } return apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, method, args, &reply) @@ -132,3 +139,52 @@ func (apierSv1 *APIerSv1) composeArgsReload(tnt, cacheID, itemID string, filterI } return } + +// callCacheRevDestinations used for reverse destination, loadIDs and indexes replication +func (apierSv1 *APIerSv1) callCacheMultiple(cacheopt, tnt, cacheID string, itemIDs []string, opts map[string]interface{}) (err error) { + if len(itemIDs) == 0 { + return + } + var reply, method string + var args interface{} + switch utils.FirstNonEmpty(cacheopt, apierSv1.Config.GeneralCfg().DefaultCaching) { + case utils.MetaNone: + return + case utils.MetaReload: + method = utils.CacheSv1ReloadCache + args = utils.AttrReloadCacheWithOpts{ + Tenant: tnt, + ArgsCache: map[string][]string{ + utils.CacheInstanceToArg[cacheID]: itemIDs, + }, + Opts: opts, + } + case utils.MetaLoad: + method = utils.CacheSv1LoadCache + args = utils.AttrReloadCacheWithOpts{ + Tenant: tnt, + ArgsCache: map[string][]string{ + utils.CacheInstanceToArg[cacheID]: itemIDs, + }, + Opts: opts, + } + case utils.MetaRemove: + method = utils.CacheSv1RemoveItems + args = utils.AttrReloadCacheWithOpts{ + Tenant: tnt, + ArgsCache: map[string][]string{ + utils.CacheInstanceToArg[cacheID]: itemIDs, + }, + Opts: opts, + } + case utils.MetaClear: + method = utils.CacheSv1Clear + args = &utils.AttrCacheIDsWithOpts{ + Tenant: tnt, + CacheIDs: []string{cacheID}, + Opts: opts, + } + } + return apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().CachesConns, nil, + method, args, &reply) +} diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 8ec00a0f4..305d494ce 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -238,15 +238,11 @@ func testInternalRemoteITGetAttribute(t *testing.T) { ID: "ATTR_1001_SIMPLEAUTH", Contexts: []string{"simpleauth"}, FilterIDs: []string{"*string:~*req.Account:1001"}, - - Attributes: []*engine.Attribute{ - { - Path: utils.MetaReq + utils.NestingSep + "Password", - FilterIDs: []string{}, - Type: utils.MetaConstant, - Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), - }, - }, + Attributes: []*engine.Attribute{{ + Path: utils.MetaReq + utils.NestingSep + "Password", + Type: utils.MetaConstant, + Value: config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep), + }}, Weight: 20, }, } @@ -417,8 +413,7 @@ func testInternalRemoteITGetRoute(t *testing.T) { ActivationInterval: &utils.ActivationInterval{ ActivationTime: time.Date(2017, 11, 27, 0, 0, 0, 0, time.UTC), }, - Sorting: utils.MetaWeight, - SortingParameters: []string{}, + Sorting: utils.MetaWeight, Routes: []*engine.Route{ { ID: "route1", @@ -439,18 +434,14 @@ func testInternalRemoteITGetRoute(t *testing.T) { ActivationInterval: &utils.ActivationInterval{ ActivationTime: time.Date(2017, 11, 27, 0, 0, 0, 0, time.UTC), }, - Sorting: utils.MetaWeight, - SortingParameters: []string{}, - Routes: []*engine.Route{ - { - ID: "route2", - Weight: 20, - }, - { - ID: "route1", - Weight: 10, - }, - }, + Sorting: utils.MetaWeight, + Routes: []*engine.Route{{ + ID: "route2", + Weight: 20, + }, { + ID: "route1", + Weight: 10, + }}, Weight: 20, } if *encoding == utils.MetaGOB { // in gob emtpty slice is encoded as nil @@ -584,7 +575,6 @@ func testInternalRemoteITGetChargerProfile(t *testing.T) { chargerProfile := &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "DEFAULT", - FilterIDs: []string{}, RunID: utils.MetaDefault, AttributeIDs: []string{utils.MetaNone}, Weight: 0, diff --git a/apier/v1/replicator.go b/apier/v1/replicator.go index 98ee7d44f..bc717642d 100644 --- a/apier/v1/replicator.go +++ b/apier/v1/replicator.go @@ -23,13 +23,18 @@ import ( "github.com/cgrates/cgrates/utils" ) -func NewReplicatorSv1(dm *engine.DataManager) *ReplicatorSv1 { - return &ReplicatorSv1{dm: dm} +// NewReplicatorSv1 constructs the ReplicatorSv1 object +func NewReplicatorSv1(dm *engine.DataManager, v1 *APIerSv1) *ReplicatorSv1 { + return &ReplicatorSv1{ + dm: dm, + v1: v1, + } } -// Exports RPC +// ReplicatorSv1 exports the DataDB methods to RPC type ReplicatorSv1 struct { dm *engine.DataManager + v1 *APIerSv1 // needed for CallCache only } // Call implements rpcclient.ClientConnector interface for internal RPC @@ -37,771 +42,319 @@ func (rplSv1 *ReplicatorSv1) Call(serviceMethod string, args interface{}, reply return utils.APIerRPCCall(rplSv1, serviceMethod, args, reply) } -//GetAccount +// GetAccount is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetAccount(args *utils.StringWithOpts, reply *engine.Account) error { engine.SetReplicateHost(utils.AccountPrefix, args.Arg, utils.IfaceAsString(args.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.GetAccount(args.Arg); err != nil { + rcv, err := rplSv1.dm.GetAccount(args.Arg) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetDestination +// GetDestination is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetDestination(key *utils.StringWithOpts, reply *engine.Destination) error { engine.SetReplicateHost(utils.DestinationPrefix, key.Arg, utils.IfaceAsString(key.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetDestinationDrv(key.Arg, utils.NonTransactional); err != nil { + rcv, err := rplSv1.dm.DataDB().GetDestinationDrv(key.Arg, utils.NonTransactional) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetDestination +// GetReverseDestination is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetReverseDestination(key *utils.StringWithOpts, reply *[]string) error { - if rcv, err := rplSv1.dm.DataDB().GetReverseDestinationDrv(key.Arg, utils.NonTransactional); err != nil { + rcv, err := rplSv1.dm.DataDB().GetReverseDestinationDrv(key.Arg, utils.NonTransactional) + if err != nil { return err - } else { - for _, dstID := range rcv { - engine.SetReplicateHost(utils.ReverseDestinationPrefix, dstID, utils.IfaceAsString(key.Opts[utils.RemoteHostOpt])) - } - *reply = rcv } + for _, dstID := range rcv { + engine.SetReplicateHost(utils.DestinationPrefix, dstID, utils.IfaceAsString(key.Opts[utils.RemoteHostOpt])) + } + *reply = rcv return nil } -//GetStatQueue +// GetStatQueue is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithOpts, reply *engine.StatQueue) error { engine.SetReplicateHost(utils.StatQueuePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetStatQueueDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetStatQueueDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetFilter +// GetFilter is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetFilter(tntID *utils.TenantIDWithOpts, reply *engine.Filter) error { engine.SetReplicateHost(utils.FilterPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetFilterDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetFilterDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetThreshold +// GetThreshold is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithOpts, reply *engine.Threshold) error { engine.SetReplicateHost(utils.ThresholdPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetThresholdDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetThresholdDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetThresholdProfile +// GetThresholdProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithOpts, reply *engine.ThresholdProfile) error { engine.SetReplicateHost(utils.ThresholdProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetThresholdProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetThresholdProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetStatQueueProfile +// GetStatQueueProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetStatQueueProfile(tntID *utils.TenantIDWithOpts, reply *engine.StatQueueProfile) error { engine.SetReplicateHost(utils.StatQueueProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetStatQueueProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetStatQueueProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetTiming +// GetTiming is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetTiming(id *utils.StringWithOpts, reply *utils.TPTiming) error { engine.SetReplicateHost(utils.TimingsPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetTimingDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetTimingDrv(id.Arg) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResource +// GetResource is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetResource(tntID *utils.TenantIDWithOpts, reply *engine.Resource) error { engine.SetReplicateHost(utils.ResourcesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetResourceDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetResourceDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetResourceProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetResourceProfile(tntID *utils.TenantIDWithOpts, reply *engine.ResourceProfile) error { engine.SetReplicateHost(utils.ResourceProfilesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetResourceProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetResourceProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetActionTriggers +// GetActionTriggers is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetActionTriggers(id *utils.StringWithOpts, reply *engine.ActionTriggers) error { engine.SetReplicateHost(utils.ActionTriggerPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetActionTriggersDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetActionTriggersDrv(id.Arg) + if err != nil { return err - } else { - *reply = rcv } + *reply = rcv return nil } -//GetSharedGroup +// GetSharedGroup is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetSharedGroup(id *utils.StringWithOpts, reply *engine.SharedGroup) error { engine.SetReplicateHost(utils.SharedGroupPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetSharedGroupDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetSharedGroupDrv(id.Arg) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetActions +// GetActions is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetActions(id *utils.StringWithOpts, reply *engine.Actions) error { engine.SetReplicateHost(utils.ActionPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetActionsDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetActionsDrv(id.Arg) + if err != nil { return err - } else { - *reply = rcv } + *reply = rcv return nil } -//GetActions +// GetActionPlan is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetActionPlan(id *utils.StringWithOpts, reply *engine.ActionPlan) error { engine.SetReplicateHost(utils.ActionPlanPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetActionPlanDrv(id.Arg, true, utils.NonTransactional); err != nil { + rcv, err := rplSv1.dm.DataDB().GetActionPlanDrv(id.Arg, true, utils.NonTransactional) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetAllActionPlans +// GetAllActionPlans is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetAllActionPlans(id *utils.StringWithOpts, reply *map[string]*engine.ActionPlan) error { - if rcv, err := rplSv1.dm.DataDB().GetAllActionPlansDrv(); err != nil { + rcv, err := rplSv1.dm.DataDB().GetAllActionPlansDrv() + if err != nil { return err - } else { - for _, ap := range rcv { - engine.SetReplicateHost(utils.ActionPlanPrefix, ap.Id, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - } - *reply = rcv } + for _, ap := range rcv { + engine.SetReplicateHost(utils.ActionPlanPrefix, ap.Id, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) + } + *reply = rcv return nil } -//GetAccountActionPlans +// GetAccountActionPlans is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetAccountActionPlans(id *utils.StringWithOpts, reply *[]string) error { engine.SetReplicateHost(utils.AccountActionPlansPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetAccountActionPlansDrv(id.Arg, false, utils.NonTransactional); err != nil { + rcv, err := rplSv1.dm.DataDB().GetAccountActionPlansDrv(id.Arg, false, utils.NonTransactional) + if err != nil { return err - } else { - *reply = rcv } + *reply = rcv return nil } -//GetAllActionPlans +// GetRatingPlan is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetRatingPlan(id *utils.StringWithOpts, reply *engine.RatingPlan) error { engine.SetReplicateHost(utils.RatingPlanPrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetRatingPlanDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetRatingPlanDrv(id.Arg) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetAllActionPlans +// GetRatingProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetRatingProfile(id *utils.StringWithOpts, reply *engine.RatingProfile) error { engine.SetReplicateHost(utils.RatingProfilePrefix, id.Arg, utils.IfaceAsString(id.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetRatingProfileDrv(id.Arg); err != nil { + rcv, err := rplSv1.dm.DataDB().GetRatingProfileDrv(id.Arg) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetRouteProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithOpts, reply *engine.RouteProfile) error { engine.SetReplicateHost(utils.RouteProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetRouteProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetRouteProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetAttributeProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithOpts, reply *engine.AttributeProfile) error { engine.SetReplicateHost(utils.AttributeProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetAttributeProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetAttributeProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetChargerProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithOpts, reply *engine.ChargerProfile) error { engine.SetReplicateHost(utils.ChargerProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetChargerProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetChargerProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetDispatcherProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherProfile) error { engine.SetReplicateHost(utils.DispatcherProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetDispatcherProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetDispatcherProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetDispatcherHost is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherHost) error { engine.SetReplicateHost(utils.DispatcherHostPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetDispatcherHostDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetDispatcherHostDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } +// GetRateProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithOpts, reply *engine.RateProfile) error { engine.SetReplicateHost(utils.RateProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetRateProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetRateProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } +// GetActionProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithOpts, reply *engine.ActionProfile) error { engine.SetReplicateHost(utils.ActionProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetActionProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetActionProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } +// GetAccountProfile is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetAccountProfile(tntID *utils.TenantIDWithOpts, reply *utils.AccountProfile) error { engine.SetReplicateHost(utils.AccountProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetAccountProfileDrv(tntID.Tenant, tntID.ID); err != nil { + rcv, err := rplSv1.dm.DataDB().GetAccountProfileDrv(tntID.Tenant, tntID.ID) + if err != nil { return err - } else { - *reply = *rcv } + *reply = *rcv return nil } -//GetResourceProfile +// GetItemLoadIDs is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetItemLoadIDs(itemID *utils.StringWithOpts, reply *map[string]int64) error { engine.SetReplicateHost(utils.LoadIDPrefix, itemID.Arg, utils.IfaceAsString(itemID.Opts[utils.RemoteHostOpt])) - if rcv, err := rplSv1.dm.DataDB().GetItemLoadIDsDrv(itemID.Arg); err != nil { - return err - } else { - *reply = rcv - } - return nil -} - -// SetThresholdProfile alters/creates a ThresholdProfile -func (rplSv1 *ReplicatorSv1) SetThresholdProfile(th *engine.ThresholdProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetThresholdProfileDrv(th.ThresholdProfile); err != nil { + rcv, err := rplSv1.dm.DataDB().GetItemLoadIDsDrv(itemID.Arg) + if err != nil { return err } - *reply = utils.OK + *reply = rcv return nil } -// SetThreshold -func (rplSv1 *ReplicatorSv1) SetThreshold(th *engine.ThresholdWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetThresholdDrv(th.Threshold); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetAccount -func (rplSv1 *ReplicatorSv1) SetAccount(acc *engine.AccountWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetAccountDrv(acc.Account); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetDestination -func (rplSv1 *ReplicatorSv1) SetDestination(dst *engine.DestinationWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetDestinationDrv(dst.Destination, utils.NonTransactional); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetReverseDestination -func (rplSv1 *ReplicatorSv1) SetReverseDestination(dst *engine.DestinationWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetReverseDestinationDrv(dst.Destination.Id, dst.Destination.Prefixes, utils.NonTransactional); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetStatQueue -func (rplSv1 *ReplicatorSv1) SetStatQueue(ssq *engine.StoredStatQueueWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetStatQueueDrv(ssq.StoredStatQueue, nil); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetFilter -func (rplSv1 *ReplicatorSv1) SetFilter(fltr *engine.FilterWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetFilterDrv(fltr.Filter); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetStatQueueProfile -func (rplSv1 *ReplicatorSv1) SetStatQueueProfile(sq *engine.StatQueueProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetStatQueueProfileDrv(sq.StatQueueProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetTiming -func (rplSv1 *ReplicatorSv1) SetTiming(tm *utils.TPTimingWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetTimingDrv(tm.TPTiming); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetResource -func (rplSv1 *ReplicatorSv1) SetResource(rs *engine.ResourceWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetResourceDrv(rs.Resource); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetResourceProfile -func (rplSv1 *ReplicatorSv1) SetResourceProfile(rs *engine.ResourceProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetResourceProfileDrv(rs.ResourceProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetActionTriggers -func (rplSv1 *ReplicatorSv1) SetActionTriggers(args *engine.SetActionTriggersArgWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetActionTriggersDrv(args.Key, args.Attrs); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetSharedGroup -func (rplSv1 *ReplicatorSv1) SetSharedGroup(shg *engine.SharedGroupWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetSharedGroupDrv(shg.SharedGroup); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetActions -func (rplSv1 *ReplicatorSv1) SetActions(args *engine.SetActionsArgsWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetActionsDrv(args.Key, args.Acs); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetRatingPlan -func (rplSv1 *ReplicatorSv1) SetRatingPlan(rp *engine.RatingPlanWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetRatingPlanDrv(rp.RatingPlan); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetRatingProfile -func (rplSv1 *ReplicatorSv1) SetRatingProfile(rp *engine.RatingProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetRatingProfileDrv(rp.RatingProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetRouteProfile -func (rplSv1 *ReplicatorSv1) SetRouteProfile(sp *engine.RouteProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetRouteProfileDrv(sp.RouteProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetAttributeProfile -func (rplSv1 *ReplicatorSv1) SetAttributeProfile(ap *engine.AttributeProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetAttributeProfileDrv(ap.AttributeProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetChargerProfile -func (rplSv1 *ReplicatorSv1) SetChargerProfile(cp *engine.ChargerProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetChargerProfileDrv(cp.ChargerProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetDispatcherProfile -func (rplSv1 *ReplicatorSv1) SetDispatcherProfile(dpp *engine.DispatcherProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetDispatcherProfileDrv(dpp.DispatcherProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetActionPlan -func (rplSv1 *ReplicatorSv1) SetActionPlan(args *engine.SetActionPlanArgWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetActionPlanDrv(args.Key, args.Ats, args.Overwrite, utils.NonTransactional); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetAccountActionPlans -func (rplSv1 *ReplicatorSv1) SetAccountActionPlans(args *engine.SetAccountActionPlansArgWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetAccountActionPlansDrv(args.AcntID, args.AplIDs, args.Overwrite); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetDispatcherHost -func (rplSv1 *ReplicatorSv1) SetDispatcherHost(dpp *engine.DispatcherHostWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetDispatcherHostDrv(dpp.DispatcherHost); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) SetRateProfile(dpp *engine.RateProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetRateProfileDrv(dpp.RateProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) SetActionProfile(acp *engine.ActionProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetActionProfileDrv(acp.ActionProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) SetAccountProfile(acp *utils.AccountProfileWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetAccountProfileDrv(acp.AccountProfile); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveThreshold -func (rplSv1 *ReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveThresholdDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// SetLoadIDs -func (rplSv1 *ReplicatorSv1) SetLoadIDs(args *utils.LoadIDsWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().SetLoadIDsDrv(args.LoadIDs); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveDestination -func (rplSv1 *ReplicatorSv1) RemoveDestination(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveDestinationDrv(id.Arg, utils.NonTransactional); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveAccount -func (rplSv1 *ReplicatorSv1) RemoveAccount(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveAccountDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveStatQueue -func (rplSv1 *ReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemStatQueueDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveFilter -func (rplSv1 *ReplicatorSv1) RemoveFilter(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveFilterDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveThresholdProfile -func (rplSv1 *ReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemThresholdProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveStatQueueProfile -func (rplSv1 *ReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemStatQueueProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveTiming -func (rplSv1 *ReplicatorSv1) RemoveTiming(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveTimingDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveResource -func (rplSv1 *ReplicatorSv1) RemoveResource(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveResourceDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -// RemoveResourceProfile -func (rplSv1 *ReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveResourceProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveActionTriggers(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveActionTriggersDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveSharedGroup(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveSharedGroupDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveActions(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveActionsDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveActionPlan(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveActionPlanDrv(id.Arg, utils.NonTransactional); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemAccountActionPlansDrv(args.AcntID, args.ApIDs); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveRatingPlan(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveRatingPlanDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveRatingProfile(id *utils.StringWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveRatingProfileDrv(id.Arg); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveRouteProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveAttributeProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveChargerProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveDispatcherProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveRateProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveActionProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveAccountProfileDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithOpts, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveDispatcherHostDrv(args.Tenant, args.ID); err != nil { - return err - } - *reply = utils.OK - return nil -} - -func (rplSv1 *ReplicatorSv1) Ping(ign *utils.CGREvent, reply *string) error { - *reply = utils.Pong - return nil -} - -// GetIndexes . +// GetIndexes is the remote method coresponding to the dataDb driver method func (rplSv1 *ReplicatorSv1) GetIndexes(args *utils.GetIndexesArg, reply *map[string]utils.StringSet) error { engine.SetReplicateHost(utils.CacheInstanceToPrefix[args.IdxItmType], args.TntCtx, utils.IfaceAsString(args.Opts[utils.RemoteHostOpt])) indx, err := rplSv1.dm.DataDB().GetIndexesDrv(args.IdxItmType, args.TntCtx, args.IdxKey) @@ -812,20 +365,712 @@ func (rplSv1 *ReplicatorSv1) GetIndexes(args *utils.GetIndexesArg, reply *map[st return nil } -// SetIndexes . -func (rplSv1 *ReplicatorSv1) SetIndexes(args *utils.SetIndexesArg, reply *string) error { - if err := rplSv1.dm.DataDB().SetIndexesDrv(args.IdxItmType, args.TntCtx, args.Indexes, true, utils.NonTransactional); err != nil { - return err +// SetAccount is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetAccount(acc *engine.AccountWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetAccountDrv(acc.Account); err != nil { + return } + // the account doesn't have cache *reply = utils.OK - return nil + return } -// RemoveIndexes . -func (rplSv1 *ReplicatorSv1) RemoveIndexes(args *utils.GetIndexesArg, reply *string) error { - if err := rplSv1.dm.DataDB().RemoveIndexesDrv(args.IdxItmType, args.TntCtx, args.IdxKey); err != nil { - return err +// SetDestination is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetDestination(dst *engine.DestinationWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetDestinationDrv(dst.Destination, utils.NonTransactional); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(dst.Opts[utils.CacheOpt])), + dst.Tenant, utils.CacheDestinations, dst.Id, nil, nil, dst.Opts); err != nil { + return } *reply = utils.OK + return +} + +// SetReverseDestination is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetReverseDestination(dst *engine.DestinationWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetReverseDestinationDrv(dst.Destination.Id, dst.Destination.Prefixes, utils.NonTransactional); err != nil { + return + } + if err = rplSv1.v1.callCacheMultiple(utils.IfaceAsString(dst.Opts[utils.CacheOpt]), + dst.Tenant, utils.CacheReverseDestinations, dst.Prefixes, dst.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetThresholdProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetThresholdProfile(th *engine.ThresholdProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetThresholdProfileDrv(th.ThresholdProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(th.Opts[utils.CacheOpt])), + th.Tenant, utils.CacheThresholdProfiles, th.TenantID(), &th.FilterIDs, nil, th.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetThreshold is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetThreshold(th *engine.ThresholdWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetThresholdDrv(th.Threshold); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(th.Opts[utils.CacheOpt])), + th.Tenant, utils.CacheThresholds, th.TenantID(), nil, nil, th.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetStatQueueProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetStatQueueProfile(sq *engine.StatQueueProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetStatQueueProfileDrv(sq.StatQueueProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(sq.Opts[utils.CacheOpt])), + sq.Tenant, utils.CacheStatQueueProfiles, sq.TenantID(), &sq.FilterIDs, nil, sq.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetStatQueue is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetStatQueue(sq *engine.StatQueueWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetStatQueueDrv(nil, sq.StatQueue); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(sq.Opts[utils.CacheOpt])), + sq.Tenant, utils.CacheStatQueues, sq.TenantID(), nil, nil, sq.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetFilter is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetFilter(fltr *engine.FilterWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetFilterDrv(fltr.Filter); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(fltr.Opts[utils.CacheOpt])), + fltr.Tenant, utils.CacheFilters, fltr.TenantID(), nil, nil, fltr.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetTiming is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetTiming(tm *utils.TPTimingWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetTimingDrv(tm.TPTiming); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(tm.Opts[utils.CacheOpt])), + tm.Tenant, utils.CacheTimings, tm.ID, nil, nil, tm.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetResourceProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetResourceProfile(rs *engine.ResourceProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetResourceProfileDrv(rs.ResourceProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(rs.Opts[utils.CacheOpt])), + rs.Tenant, utils.CacheResourceProfiles, rs.TenantID(), &rs.FilterIDs, nil, rs.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetResource is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetResource(rs *engine.ResourceWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetResourceDrv(rs.Resource); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(rs.Opts[utils.CacheOpt])), + rs.Tenant, utils.CacheResources, rs.TenantID(), nil, nil, rs.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetActionTriggers is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetActionTriggers(args *engine.SetActionTriggersArgWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetActionTriggersDrv(args.Key, args.Attrs); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheActionTriggers, args.Key, nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetSharedGroup is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetSharedGroup(shg *engine.SharedGroupWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetSharedGroupDrv(shg.SharedGroup); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(shg.Opts[utils.CacheOpt])), + shg.Tenant, utils.CacheSharedGroups, shg.Id, nil, nil, shg.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetActions is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetActions(args *engine.SetActionsArgsWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetActionsDrv(args.Key, args.Acs); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheActions, args.Key, nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetRatingPlan is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetRatingPlan(rp *engine.RatingPlanWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetRatingPlanDrv(rp.RatingPlan); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(rp.Opts[utils.CacheOpt])), + rp.Tenant, utils.CacheRatingPlans, rp.Id, nil, nil, rp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetRatingProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetRatingProfile(rp *engine.RatingProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetRatingProfileDrv(rp.RatingProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(rp.Opts[utils.CacheOpt])), + rp.Tenant, utils.CacheRatingProfiles, rp.Id, nil, nil, rp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetRouteProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetRouteProfile(sp *engine.RouteProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetRouteProfileDrv(sp.RouteProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(sp.Opts[utils.CacheOpt])), + sp.Tenant, utils.CacheRouteProfiles, sp.TenantID(), &sp.FilterIDs, nil, sp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetAttributeProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetAttributeProfile(ap *engine.AttributeProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetAttributeProfileDrv(ap.AttributeProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(ap.Opts[utils.CacheOpt])), + ap.Tenant, utils.CacheAttributeProfiles, ap.TenantID(), &ap.FilterIDs, ap.Contexts, ap.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetChargerProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetChargerProfile(cp *engine.ChargerProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetChargerProfileDrv(cp.ChargerProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(cp.Opts[utils.CacheOpt])), + cp.Tenant, utils.CacheChargerProfiles, cp.TenantID(), &cp.FilterIDs, nil, cp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetDispatcherProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetDispatcherProfile(dpp *engine.DispatcherProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetDispatcherProfileDrv(dpp.DispatcherProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(dpp.Opts[utils.CacheOpt])), + dpp.Tenant, utils.CacheDispatcherProfiles, dpp.TenantID(), &dpp.FilterIDs, dpp.Subsystems, dpp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetActionPlan is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetActionPlan(args *engine.SetActionPlanArgWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetActionPlanDrv(args.Key, args.Ats, args.Overwrite, utils.NonTransactional); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheActionPlans, args.Key, nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetAccountActionPlans is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetAccountActionPlans(args *engine.SetAccountActionPlansArgWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetAccountActionPlansDrv(args.AcntID, args.AplIDs, args.Overwrite); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheAccountActionPlans, args.AcntID, nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetDispatcherHost is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetDispatcherHost(dpp *engine.DispatcherHostWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetDispatcherHostDrv(dpp.DispatcherHost); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(dpp.Opts[utils.CacheOpt])), + dpp.Tenant, utils.CacheDispatcherHosts, dpp.TenantID(), nil, nil, dpp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetRateProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetRateProfile(dpp *engine.RateProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetRateProfileDrv(dpp.RateProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(dpp.Opts[utils.CacheOpt])), + dpp.Tenant, utils.CacheRateProfiles, dpp.TenantID(), &dpp.FilterIDs, nil, dpp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetActionProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetActionProfile(acp *engine.ActionProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetActionProfileDrv(acp.ActionProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(acp.Opts[utils.CacheOpt])), + acp.Tenant, utils.CacheActionProfiles, acp.TenantID(), &acp.FilterIDs, nil, acp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetAccountProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetAccountProfile(acp *utils.AccountProfileWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetAccountProfileDrv(acp.AccountProfile); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(acp.Opts[utils.CacheOpt])), + acp.Tenant, utils.CacheAccountProfiles, acp.TenantID(), &acp.FilterIDs, nil, acp.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetLoadIDs is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetLoadIDs(args *utils.LoadIDsWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetLoadIDsDrv(args.LoadIDs); err != nil { + return + } + lIDs := make([]string, 0, len(args.LoadIDs)) + for lID := range args.LoadIDs { + lIDs = append(lIDs, lID) + } + if err = rplSv1.v1.callCacheMultiple(utils.IfaceAsString(args.Opts[utils.CacheOpt]), + args.Tenant, utils.CacheLoadIDs, lIDs, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// SetIndexes is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) SetIndexes(args *utils.SetIndexesArg, reply *string) (err error) { + if err = rplSv1.dm.DataDB().SetIndexesDrv(args.IdxItmType, args.TntCtx, args.Indexes, true, utils.NonTransactional); err != nil { + return + } + cIDs := make([]string, 0, len(args.Indexes)) + for idxKey := range args.Indexes { + cIDs = append(cIDs, utils.ConcatenatedKey(args.TntCtx, idxKey)) + } + if err = rplSv1.v1.callCacheMultiple(utils.IfaceAsString(args.Opts[utils.CacheOpt]), + args.Tenant, args.IdxItmType, cIDs, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveThreshold is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveThresholdDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheThresholds, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveDestination is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveDestination(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveDestinationDrv(id.Arg, utils.NonTransactional); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheDestinations, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveAccount is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveAccount(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveAccountDrv(id.Arg); err != nil { + return + } + // the account doesn't have cache + *reply = utils.OK + return +} + +// RemoveStatQueue is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemStatQueueDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheStatQueues, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveFilter is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveFilter(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveFilterDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheFilters, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveThresholdProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemThresholdProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheThresholdProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveStatQueueProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemStatQueueProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheStatQueueProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveTiming is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveTiming(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveTimingDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheTimings, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveResource is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveResource(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveResourceDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheResources, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveResourceProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveResourceProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheResourceProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveActionTriggers is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveActionTriggers(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveActionTriggersDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheActionTriggers, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveSharedGroup is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveSharedGroup(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveSharedGroupDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheSharedGroups, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveActions is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveActions(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveActionsDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheActions, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveActionPlan is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveActionPlan(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveActionPlanDrv(id.Arg, utils.NonTransactional); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheActionPlans, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemAccountActionPlans is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemAccountActionPlansDrv(args.AcntID, args.ApIDs); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheAccountActionPlans, args.AcntID, nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveRatingPlan is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveRatingPlan(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveRatingPlanDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheRatingPlans, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveRatingProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveRatingProfile(id *utils.StringWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveRatingProfileDrv(id.Arg); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(id.Opts[utils.CacheOpt])), + id.Tenant, utils.CacheRatingProfiles, id.Arg, nil, nil, id.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveRouteProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveRouteProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheRouteProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveAttributeProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveAttributeProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheAttributeProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveChargerProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveChargerProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheChargerProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveDispatcherProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveDispatcherProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheDispatcherProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveRateProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveRateProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheRateProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveActionProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveActionProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheActionProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveAccountProfile is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveAccountProfileDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheAccountProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveDispatcherHost is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithOpts, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveDispatcherHostDrv(args.Tenant, args.ID); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, utils.CacheDispatcherHosts, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// RemoveIndexes is the replication method coresponding to the dataDb driver method +func (rplSv1 *ReplicatorSv1) RemoveIndexes(args *utils.GetIndexesArg, reply *string) (err error) { + if err = rplSv1.dm.DataDB().RemoveIndexesDrv(args.IdxItmType, args.TntCtx, args.IdxKey); err != nil { + return + } + if err = rplSv1.v1.CallCache(utils.StringPointer(utils.IfaceAsString(args.Opts[utils.CacheOpt])), + args.Tenant, args.IdxItmType, utils.ConcatenatedKey(args.TntCtx, args.IdxKey), nil, nil, args.Opts); err != nil { + return + } + *reply = utils.OK + return +} + +// Ping used to determine if the RPC is active +func (rplSv1 *ReplicatorSv1) Ping(ign *utils.CGREvent, reply *string) error { + *reply = utils.Pong return nil } diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 494a75535..0f072904f 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -624,7 +624,7 @@ func main() { // init CacheS cacheS := initCacheS(internalCacheSChan, server, dmService.GetDM(), shdChan, anz, coreS.GetCoreS().CapsStats) - engine.SetCache(cacheS) + engine.Cache = cacheS // init GuardianSv1 initGuardianSv1(internalGuardianSChan, server, anz) diff --git a/config/config_defaults.go b/config/config_defaults.go index 055e245fe..69bd3429b 100644 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -41,7 +41,7 @@ const CGRATES_CFG_JSON = ` "default_category": "call", // default category to consider when missing from requests "default_tenant": "cgrates.org", // default tenant to consider when missing from requests "default_timezone": "Local", // default timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB> - "default_caching":"*reload", // default actions to do when caching items + "default_caching": "*reload", // default actions to do when caching items "min_call_duration": "0s", // only authorize calls with allowed duration higher than this "max_call_duration": "3h", // maximum call duration a prepaid call can last "connect_attempts": 5, // initial server connect attempts @@ -78,10 +78,11 @@ const CGRATES_CFG_JSON = ` "db_name": "10", // data_db database name to connect to "db_user": "cgrates", // username to use when connecting to data_db "db_password": "", // password to use when connecting to data_db - "remote_conns":[], - "replication_conns":[], - "filtered_replication": false, // if this is enabled the replication will be made only to the conns that received a get + "remote_conns":[], // the conns that are queried when the items are not found in local DB "remote_conn_id": "", // the ID to be sent to remote_conns to identify the connection + "replication_conns":[], // the conns the items are replicated + "replication_filtered": false, // if this is enabled the replication will be made only to the conns that received a get + "replication_cache": "", // the caching action that is executed on the replication_conns when the items are replicated "items":{ "*accounts":{"remote":false, "replicate":false}, "*reverse_destinations": {"remote":false, "replicate":false}, @@ -287,7 +288,7 @@ const CGRATES_CFG_JSON = ` "*stir": {"limit": -1, "ttl": "3h", "static_ttl": false, "replicate": false}, // stirShaken cache keys "*apiban":{"limit": -1, "ttl": "2m", "static_ttl": false, "replicate": false}, "*caps_events": {"limit": -1, "ttl": "", "static_ttl": false, "replicate": false}, // caps cached samples - "*replication_hosts": {"limit": 0, "ttl": "", "static_ttl": false, "replicate": false}, // the replication hosts cache(used when filtered_replication is enbled) + "*replication_hosts": {"limit": 0, "ttl": "", "static_ttl": false, "replicate": false}, // the replication hosts cache(used when replication_filtered is enbled) // only for *internal database "*versions": {"limit": -1, "ttl": "", "static_ttl": false, "replicate": false}, // for version storing diff --git a/config/config_json_test.go b/config/config_json_test.go index cd642bd83..f1c835709 100644 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -373,8 +373,9 @@ func TestDfDataDbJsonCfg(t *testing.T) { Db_password: utils.StringPointer(""), Replication_conns: &[]string{}, Remote_conns: &[]string{}, - Filtered_replication: utils.BoolPointer(false), + Replication_filtered: utils.BoolPointer(false), Remote_conn_id: utils.StringPointer(""), + Replication_cache: utils.StringPointer(""), Opts: map[string]interface{}{ utils.RedisSentinelNameCfg: "", utils.QueryTimeoutCfg: "10s", diff --git a/config/config_test.go b/config/config_test.go index 6bb3c51a4..16a7a90c2 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -3941,8 +3941,9 @@ func TestV1GetConfigDataDB(t *testing.T) { utils.DataDbNameCfg: "10", utils.DataDbUserCfg: "cgrates", utils.DataDbPassCfg: "", - utils.FilteredReplicationCfg: false, + utils.ReplicationFilteredCfg: false, utils.RemoteConnIDCfg: "", + utils.ReplicationCache: "", utils.OptsCfg: map[string]interface{}{}, utils.RemoteConnsCfg: []string{}, utils.ReplicationConnsCfg: []string{}, @@ -5111,7 +5112,7 @@ func TestV1GetConfigAsJSONGeneral(t *testing.T) { func TestV1GetConfigAsJSONDataDB(t *testing.T) { var reply string - expected := `{"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","filtered_replication":false,"items":{"*account_action_plans":{"remote":false,"replicate":false},"*account_profiles":{"remote":false,"replicate":false},"*accounts":{"remote":false,"replicate":false},"*action_plans":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*action_triggers":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*destinations":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*rating_plans":{"remote":false,"replicate":false},"*rating_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*reverse_destinations":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*shared_groups":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false},"*timings":{"remote":false,"replicate":false}},"opts":{"query_timeout":"10s","redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"remote_conn_id":"","remote_conns":[],"replication_conns":[]}}` + expected := `{"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*account_action_plans":{"remote":false,"replicate":false},"*account_profiles":{"remote":false,"replicate":false},"*accounts":{"remote":false,"replicate":false},"*action_plans":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*action_triggers":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*destinations":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*rating_plans":{"remote":false,"replicate":false},"*rating_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*reverse_destinations":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*shared_groups":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false},"*timings":{"remote":false,"replicate":false}},"opts":{"query_timeout":"10s","redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false}}` cfgCgr := NewDefaultCGRConfig() if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DATADB_JSN}, &reply); err != nil { t.Error(err) @@ -5644,7 +5645,7 @@ func TestV1GetConfigAsJSONAllConfig(t *testing.T) { } }` var reply string - expected := `{"accounts":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"max_iterations":1000,"max_usage":259200000000000,"nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"suffix_indexed_fields":[],"thresholds_conns":[]},"actions":{"accounts_conns":[],"cdrs_conns":[],"ees_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"stats_conns":[],"suffix_indexed_fields":[],"tenants":[],"thresholds_conns":[]},"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"apiers":{"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false,"scheduler_conns":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"apiers_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"process_runs":1,"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*account_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*account_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*cdrs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*event_charges":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*session_costs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_account_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_account_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_attributes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_chargers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destination_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_stats":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*versions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""}},"replication_conns":[]},"cdrs":{"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rals_conns":[],"scheduler_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","filtered_replication":false,"items":{"*account_action_plans":{"remote":false,"replicate":false},"*account_profiles":{"remote":false,"replicate":false},"*accounts":{"remote":false,"replicate":false},"*action_plans":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*action_triggers":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*destinations":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*rating_plans":{"remote":false,"replicate":false},"*rating_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*reverse_destinations":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*shared_groups":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false},"*timings":{"remote":false,"replicate":false}},"opts":{"query_timeout":"10s","redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"remote_conn_id":"","remote_conns":[],"replication_conns":[]},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*file_csv":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"export_path":"/var/spool/cgrates/ees","field_separator":",","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"tenant":"","timezone":"","type":"*none"}]},"ers":{"enabled":false,"readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"failed_calls_prefix":"","field_separator":",","fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"header_define_character":":","id":"*default","opts":{},"partial_cache_expiry_action":"","partial_record_cache":"0","processed_path":"/var/spool/cgrates/ers/out","row_length":0,"run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none","xml_root_path":[""]}],"sessions_conns":["*internal"]},"filters":{"apiers_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":"","low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","scheduler_conns":["*localhost"],"tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.5"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.6"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.7"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.10"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.5"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.9"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.10"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.11"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.12"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.8"},{"path":"ActionIDs","tag":"ActionIDs","type":"*variable","value":"~*req.9"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.10"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRatingPlanIDs","tag":"RouteRatingPlanIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.15"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.6"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.5"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.6"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.7"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.9"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.10"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.11"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.12"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.4"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.5"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.6"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.7"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.8"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.9"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.10"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.11"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.12"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.13"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.14"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.15"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.16"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.17"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.5"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.6"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.7"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.8"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.9"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.10"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.11"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.12"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.13"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.14"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.15"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.5"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.6"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.7"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.8"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.9"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.10"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.11"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.13"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.14"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.15"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.16"}],"file_name":"AccountProfiles.csv","flags":null,"type":"*account_profiles"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"mailer":{"auth_password":"CGRateS.org","auth_user":"cgrates","from_address":"cgr-mailer@localhost.localdomain","server":"localhost"},"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rals":{"balance_rating_subject":{"*any":"*zero1ns","*voice":"*zero1s"},"caches_conns":["*internal"],"dynaprepaid_actionplans":[],"enabled":false,"max_computed_usage":{"*any":"189h0m0s","*data":"107374182400","*mms":"10000","*sms":"10000","*voice":"72h0m0s"},"max_increments":1000000,"remove_expired":true,"rp_subject_prefix_matching":false,"stats_conns":[],"thresholds_conns":[]},"rates":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rate_indexed_selects":true,"rate_nested_fields":false,"rate_prefix_indexed_fields":[],"rate_suffix_indexed_fields":[],"suffix_indexed_fields":[],"verbosity":1000},"registrarc":{"dispatcher":{"enabled":false,"hosts":{},"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"enabled":false,"hosts":{},"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rals_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"schedulers":{"cdrs_conns":[],"enabled":false,"filters":[],"stats_conns":[],"thresholds_conns":[]},"sessions":{"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","rals_conns":[],"replication_conns":[],"resources_conns":[],"routes_conns":[],"scheduler_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":1000000000,"sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"remote":false,"replicate":false},"*session_costs":{"remote":false,"replicate":false},"*tp_account_actions":{"remote":false,"replicate":false},"*tp_account_profiles":{"remote":false,"replicate":false},"*tp_action_plans":{"remote":false,"replicate":false},"*tp_action_profiles":{"remote":false,"replicate":false},"*tp_action_triggers":{"remote":false,"replicate":false},"*tp_actions":{"remote":false,"replicate":false},"*tp_attributes":{"remote":false,"replicate":false},"*tp_chargers":{"remote":false,"replicate":false},"*tp_destination_rates":{"remote":false,"replicate":false},"*tp_destinations":{"remote":false,"replicate":false},"*tp_dispatcher_hosts":{"remote":false,"replicate":false},"*tp_dispatcher_profiles":{"remote":false,"replicate":false},"*tp_filters":{"remote":false,"replicate":false},"*tp_rate_profiles":{"remote":false,"replicate":false},"*tp_rates":{"remote":false,"replicate":false},"*tp_rating_plans":{"remote":false,"replicate":false},"*tp_rating_profiles":{"remote":false,"replicate":false},"*tp_resources":{"remote":false,"replicate":false},"*tp_routes":{"remote":false,"replicate":false},"*tp_shared_groups":{"remote":false,"replicate":false},"*tp_stats":{"remote":false,"replicate":false},"*tp_thresholds":{"remote":false,"replicate":false},"*tp_timings":{"remote":false,"replicate":false},"*versions":{"remote":false,"replicate":false}},"opts":{"conn_max_lifetime":0,"max_idle_conns":10,"max_open_conns":100,"mysql_location":"Local","query_timeout":"10s","sslmode":"disable"},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}` + expected := `{"accounts":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"max_iterations":1000,"max_usage":259200000000000,"nested_fields":false,"prefix_indexed_fields":[],"rates_conns":[],"suffix_indexed_fields":[],"thresholds_conns":[]},"actions":{"accounts_conns":[],"cdrs_conns":[],"ees_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"stats_conns":[],"suffix_indexed_fields":[],"tenants":[],"thresholds_conns":[]},"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"},"apiban":{"enabled":false,"keys":[]},"apiers":{"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false,"scheduler_conns":[]},"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*birpc_internal"]},"attributes":{"apiers_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"process_runs":1,"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"caches":{"partitions":{"*account_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*account_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*account_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*cdrs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*event_charges":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*replication_hosts":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*session_costs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_account_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_account_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_attributes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_chargers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destination_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_stats":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*versions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""}},"replication_conns":[]},"cdrs":{"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rals_conns":[],"scheduler_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]},"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"},"cores":{"caps":0,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"},"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*account_action_plans":{"remote":false,"replicate":false},"*account_profiles":{"remote":false,"replicate":false},"*accounts":{"remote":false,"replicate":false},"*action_plans":{"remote":false,"replicate":false},"*action_profiles":{"remote":false,"replicate":false},"*action_triggers":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*destinations":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*rating_plans":{"remote":false,"replicate":false},"*rating_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*reverse_destinations":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*shared_groups":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false},"*timings":{"remote":false,"replicate":false}},"opts":{"query_timeout":"10s","redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"remote_conn_id":"","remote_conns":[],"replication_cache":"","replication_conns":[],"replication_filtered":false},"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*birpc_internal"],"synced_conn_requests":false,"vendor_id":0},"dispatchers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]},"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""},"ees":{"attributes_conns":[],"cache":{"*file_csv":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"export_path":"/var/spool/cgrates/ees","field_separator":",","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"tenant":"","timezone":"","type":"*none"}]},"ers":{"enabled":false,"readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"failed_calls_prefix":"","field_separator":",","fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"header_define_character":":","id":"*default","opts":{},"partial_cache_expiry_action":"","partial_record_cache":"0","processed_path":"/var/spool/cgrates/ers/out","row_length":0,"run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none","xml_root_path":[""]}],"sessions_conns":["*internal"]},"filters":{"apiers_conns":[],"resources_conns":[],"stats_conns":[]},"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":"","low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*birpc_internal"],"subscribe_park":true},"general":{"connect_attempts":5,"connect_timeout":"1s","dbdata_encoding":"*msgpack","default_caching":"*reload","default_category":"call","default_request_type":"*rated","default_tenant":"cgrates.org","default_timezone":"Local","digest_equal":":","digest_separator":",","failed_posts_dir":"/var/spool/cgrates/failed_posts","failed_posts_ttl":"5s","locking_timeout":"0","log_level":6,"logger":"*syslog","max_parallel_conns":100,"node_id":"ENGINE1","poster_attempts":3,"reconnects":-1,"reply_timeout":"2s","rounding_decimals":5,"rsr_separator":";","tpexport_dir":"/var/spool/cgrates/tpe"},"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","registrars_url":"/registrar","use_basic_auth":false,"ws_url":"/ws"},"http_agent":[],"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*birpc_internal"],"timezone":""},"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"},"loader":{"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","scheduler_conns":["*localhost"],"tpid":""},"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.5"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.6"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.7"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.10"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.5"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.9"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.10"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.11"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.12"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.8"},{"path":"ActionIDs","tag":"ActionIDs","type":"*variable","value":"~*req.9"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.10"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRatingPlanIDs","tag":"RouteRatingPlanIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.15"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.6"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.5"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.6"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.7"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.9"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.10"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.11"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.12"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.4"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.5"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.6"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.7"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.8"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.9"},{"path":"RateActivationTimes","tag":"RateActivationTimes","type":"*variable","value":"~*req.10"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.11"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.12"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.13"},{"path":"RateFixedFee","tag":"RateFixedFee","type":"*variable","value":"~*req.14"},{"path":"RateRecurrentFee","tag":"RateRecurrentFee","type":"*variable","value":"~*req.15"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.16"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.17"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"Schedule","tag":"Schedule","type":"*variable","value":"~*req.5"},{"path":"TargetType","tag":"TargetType","type":"*variable","value":"~*req.6"},{"path":"TargetIDs","tag":"TargetIDs","type":"*variable","value":"~*req.7"},{"path":"ActionID","tag":"ActionID","type":"*variable","value":"~*req.8"},{"path":"ActionFilterIDs","tag":"ActionFilterIDs","type":"*variable","value":"~*req.9"},{"path":"ActionBlocker","tag":"ActionBlocker","type":"*variable","value":"~*req.10"},{"path":"ActionTTL","tag":"ActionTTL","type":"*variable","value":"~*req.11"},{"path":"ActionType","tag":"ActionType","type":"*variable","value":"~*req.12"},{"path":"ActionOpts","tag":"ActionOpts","type":"*variable","value":"~*req.13"},{"path":"ActionPath","tag":"ActionPath","type":"*variable","value":"~*req.14"},{"path":"ActionValue","tag":"ActionValue","type":"*variable","value":"~*req.15"}],"file_name":"ActionProfiles.csv","flags":null,"type":"*action_profiles"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"BalanceID","tag":"BalanceID","type":"*variable","value":"~*req.5"},{"path":"BalanceFilterIDs","tag":"BalanceFilterIDs","type":"*variable","value":"~*req.6"},{"path":"BalanceWeight","tag":"BalanceWeight","type":"*variable","value":"~*req.7"},{"path":"BalanceBlocker","tag":"BalanceBlocker","type":"*variable","value":"~*req.8"},{"path":"BalanceType","tag":"BalanceType","type":"*variable","value":"~*req.9"},{"path":"BalanceOpts","tag":"BalanceOpts","type":"*variable","value":"~*req.10"},{"path":"BalanceCostIncrements","tag":"BalanceCostIncrements","type":"*variable","value":"~*req.11"},{"path":"BalanceAttributeIDs","tag":"BalanceAttributeIDs","type":"*variable","value":"~*req.12"},{"path":"BalanceRateProfileIDs","tag":"BalanceRateProfileIDs","type":"*variable","value":"~*req.13"},{"path":"BalanceUnitFactors","tag":"BalanceUnitFactors","type":"*variable","value":"~*req.14"},{"path":"BalanceUnits","tag":"BalanceUnits","type":"*variable","value":"~*req.15"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.16"}],"file_name":"AccountProfiles.csv","flags":null,"type":"*account_profiles"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}],"mailer":{"auth_password":"CGRateS.org","auth_user":"cgrates","from_address":"cgr-mailer@localhost.localdomain","server":"localhost"},"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]},"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]},"rals":{"balance_rating_subject":{"*any":"*zero1ns","*voice":"*zero1s"},"caches_conns":["*internal"],"dynaprepaid_actionplans":[],"enabled":false,"max_computed_usage":{"*any":"189h0m0s","*data":"107374182400","*mms":"10000","*sms":"10000","*voice":"72h0m0s"},"max_increments":1000000,"remove_expired":true,"rp_subject_prefix_matching":false,"stats_conns":[],"thresholds_conns":[]},"rates":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rate_indexed_selects":true,"rate_nested_fields":false,"rate_prefix_indexed_fields":[],"rate_suffix_indexed_fields":[],"suffix_indexed_fields":[],"verbosity":1000},"registrarc":{"dispatcher":{"enabled":false,"hosts":{},"refresh_interval":"5m0s","registrars_conns":[]},"rpc":{"enabled":false,"hosts":{},"refresh_interval":"5m0s","registrars_conns":[]}},"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]},"routes":{"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rals_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]},"rpc_conns":{"*birpc_internal":{"conns":[{"address":"*birpc_internal","transport":""}],"poolSize":0,"strategy":"*first"},"*internal":{"conns":[{"address":"*internal","transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"address":"127.0.0.1:2012","transport":"*json"}],"poolSize":0,"strategy":"*first"}},"schedulers":{"cdrs_conns":[],"enabled":false,"filters":[],"stats_conns":[],"thresholds_conns":[]},"sessions":{"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":false,"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","rals_conns":[],"replication_conns":[],"resources_conns":[],"routes_conns":[],"scheduler_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]},"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":1000000000,"sessions_conns":["*internal"],"timezone":""},"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]},"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"remote":false,"replicate":false},"*session_costs":{"remote":false,"replicate":false},"*tp_account_actions":{"remote":false,"replicate":false},"*tp_account_profiles":{"remote":false,"replicate":false},"*tp_action_plans":{"remote":false,"replicate":false},"*tp_action_profiles":{"remote":false,"replicate":false},"*tp_action_triggers":{"remote":false,"replicate":false},"*tp_actions":{"remote":false,"replicate":false},"*tp_attributes":{"remote":false,"replicate":false},"*tp_chargers":{"remote":false,"replicate":false},"*tp_destination_rates":{"remote":false,"replicate":false},"*tp_destinations":{"remote":false,"replicate":false},"*tp_dispatcher_hosts":{"remote":false,"replicate":false},"*tp_dispatcher_profiles":{"remote":false,"replicate":false},"*tp_filters":{"remote":false,"replicate":false},"*tp_rate_profiles":{"remote":false,"replicate":false},"*tp_rates":{"remote":false,"replicate":false},"*tp_rating_plans":{"remote":false,"replicate":false},"*tp_rating_profiles":{"remote":false,"replicate":false},"*tp_resources":{"remote":false,"replicate":false},"*tp_routes":{"remote":false,"replicate":false},"*tp_shared_groups":{"remote":false,"replicate":false},"*tp_stats":{"remote":false,"replicate":false},"*tp_thresholds":{"remote":false,"replicate":false},"*tp_timings":{"remote":false,"replicate":false},"*versions":{"remote":false,"replicate":false}},"opts":{"conn_max_lifetime":0,"max_idle_conns":10,"max_open_conns":100,"mysql_location":"Local","query_timeout":"10s","sslmode":"disable"},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]},"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""},"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*cdrLog":[{"mandatory":true,"path":"*cdr.ToR","tag":"ToR","type":"*variable","value":"~*req.BalanceType"},{"mandatory":true,"path":"*cdr.OriginHost","tag":"OriginHost","type":"*constant","value":"127.0.0.1"},{"mandatory":true,"path":"*cdr.RequestType","tag":"RequestType","type":"*constant","value":"*none"},{"mandatory":true,"path":"*cdr.Tenant","tag":"Tenant","type":"*variable","value":"~*req.Tenant"},{"mandatory":true,"path":"*cdr.Account","tag":"Account","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Subject","tag":"Subject","type":"*variable","value":"~*req.Account"},{"mandatory":true,"path":"*cdr.Cost","tag":"Cost","type":"*variable","value":"~*req.Cost"},{"mandatory":true,"path":"*cdr.Source","tag":"Source","type":"*constant","value":"*cdrLog"},{"mandatory":true,"path":"*cdr.Usage","tag":"Usage","type":"*constant","value":"1"},{"mandatory":true,"path":"*cdr.RunID","tag":"RunID","type":"*variable","value":"~*req.ActionType"},{"mandatory":true,"path":"*cdr.SetupTime","tag":"SetupTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.AnswerTime","tag":"AnswerTime","type":"*constant","value":"*now"},{"mandatory":true,"path":"*cdr.PreRated","tag":"PreRated","type":"*constant","value":"true"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]},"thresholds":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]},"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}` cgrCfg, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSON) if err != nil { t.Fatal(err) diff --git a/config/configsanity.go b/config/configsanity.go index e4aa4b47d..0775b231c 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -647,6 +647,28 @@ func (cfg *CGRConfig) checkConfigSanity() error { return fmt.Errorf("replicate connections required by: <%s>", item) } } + for _, connID := range cfg.dataDbCfg.RplConns { + conn, has := cfg.rpcConns[connID] + if !has { + return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.DataDB, connID) + } + for _, rpc := range conn.Conns { + if rpc.Transport != utils.MetaGOB { + return fmt.Errorf("<%s> unsuported transport <%s> for connection with ID: <%s>", utils.DataDB, rpc.Transport, connID) + } + } + } + for _, connID := range cfg.dataDbCfg.RmtConns { + conn, has := cfg.rpcConns[connID] + if !has { + return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.DataDB, connID) + } + for _, rpc := range conn.Conns { + if rpc.Transport != utils.MetaGOB { + return fmt.Errorf("<%s> unsuported transport <%s> for connection with ID: <%s>", utils.DataDB, rpc.Transport, connID) + } + } + } // APIer sanity checks for _, connID := range cfg.apier.AttributeSConns { if strings.HasPrefix(connID, utils.MetaInternal) && !cfg.attributeSCfg.Enabled { diff --git a/config/datadbcfg.go b/config/datadbcfg.go index 685dc05fb..c07a061dc 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -35,9 +35,10 @@ type DataDbCfg struct { User string // The user to sign in as. Password string // The user's password. RmtConns []string // Remote DataDB connIDs + RmtConnID string RplConns []string // Replication connIDs RplFiltered bool - RmtConnID string + RplCache string Items map[string]*ItemOpt Opts map[string]interface{} } @@ -104,12 +105,15 @@ func (dbcfg *DataDbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) { dbcfg.Opts[k] = v } } - if jsnDbCfg.Filtered_replication != nil { - dbcfg.RplFiltered = *jsnDbCfg.Filtered_replication + if jsnDbCfg.Replication_filtered != nil { + dbcfg.RplFiltered = *jsnDbCfg.Replication_filtered } if jsnDbCfg.Remote_conn_id != nil { dbcfg.RmtConnID = *jsnDbCfg.Remote_conn_id } + if jsnDbCfg.Replication_cache != nil { + dbcfg.RplCache = *jsnDbCfg.Replication_cache + } return } @@ -123,6 +127,7 @@ func (dbcfg *DataDbCfg) Clone() (cln *DataDbCfg) { User: dbcfg.User, Password: dbcfg.Password, RplFiltered: dbcfg.RplFiltered, + RplCache: dbcfg.RplCache, RmtConnID: dbcfg.RmtConnID, Items: make(map[string]*ItemOpt), Opts: make(map[string]interface{}), @@ -158,9 +163,10 @@ func (dbcfg *DataDbCfg) AsMapInterface() (initialMP map[string]interface{}) { utils.DataDbUserCfg: dbcfg.User, utils.DataDbPassCfg: dbcfg.Password, utils.RemoteConnsCfg: dbcfg.RmtConns, - utils.ReplicationConnsCfg: dbcfg.RplConns, - utils.FilteredReplicationCfg: dbcfg.RplFiltered, utils.RemoteConnIDCfg: dbcfg.RmtConnID, + utils.ReplicationConnsCfg: dbcfg.RplConns, + utils.ReplicationFilteredCfg: dbcfg.RplFiltered, + utils.ReplicationCache: dbcfg.RplCache, } opts := make(map[string]interface{}) for k, v := range dbcfg.Opts { diff --git a/config/libconfig_json.go b/config/libconfig_json.go index 28502cc23..2b9910885 100644 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -92,9 +92,10 @@ type DbJsonCfg struct { String_indexed_fields *[]string Prefix_indexed_fields *[]string Remote_conns *[]string - Replication_conns *[]string - Filtered_replication *bool Remote_conn_id *string + Replication_conns *[]string + Replication_filtered *bool + Replication_cache *string Items *map[string]*ItemOptJson Opts map[string]interface{} } diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index b823abe06..67ac1166f 100755 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -20,7 +20,7 @@ // "default_category": "call", // default category to consider when missing from requests // "default_tenant": "cgrates.org", // default tenant to consider when missing from requests // "default_timezone": "Local", // default timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB> -// "default_caching":"*reload", // default actions to do when caching items +// "default_caching": "*reload", // default actions to do when caching items // "min_call_duration": "0s", // only authorize calls with allowed duration higher than this // "max_call_duration": "3h", // maximum call duration a prepaid call can last // "connect_attempts": 5, // initial server connect attempts @@ -57,8 +57,11 @@ // "db_name": "10", // data_db database name to connect to // "db_user": "cgrates", // username to use when connecting to data_db // "db_password": "", // password to use when connecting to data_db -// "remote_conns":[], -// "replication_conns":[], +// "remote_conns":[], // the conns that are queried when the items are not found in local DB +// "remote_conn_id": "", // the ID to be sent to remote_conns to identify the connection +// "replication_conns":[], // the conns the items are replicated +// "replication_filtered": false, // if this is enabled the replication will be made only to the conns that received a get +// "replication_cache": "", // the caching action that is executed on the replication_conns when the items are replicated // "items":{ // "*accounts":{"remote":false, "replicate":false}, // "*reverse_destinations": {"remote":false, "replicate":false}, @@ -264,6 +267,7 @@ // "*stir": {"limit": -1, "ttl": "3h", "static_ttl": false, "replicate": false}, // stirShaken cache keys // "*apiban":{"limit": -1, "ttl": "2m", "static_ttl": false, "replicate": false}, // "*caps_events": {"limit": -1, "ttl": "", "static_ttl": false, "replicate": false}, // caps cached samples +// "*replication_hosts": {"limit": 0, "ttl": "", "static_ttl": false, "replicate": false}, // the replication hosts cache(used when replication_filtered is enbled) // // only for *internal database // "*versions": {"limit": -1, "ttl": "", "static_ttl": false, "replicate": false}, // for version storing diff --git a/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json b/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json index 37feaac7c..45180fc0e 100644 --- a/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json +++ b/data/conf/samples/filtered_replication/engine1_mongo/cgrates.json @@ -15,7 +15,7 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], }, }, @@ -80,8 +80,17 @@ "enabled": true, "scheduler_conns": ["*internal"], }, + "thresholds": { "enabled": true, }, +"stats": { + "enabled": true, +}, + +"resources": { + "enabled": true, +}, + } diff --git a/data/conf/samples/filtered_replication/engine1_redis/cgrates.json b/data/conf/samples/filtered_replication/engine1_redis/cgrates.json index c0b5aca4a..3f95c6e19 100644 --- a/data/conf/samples/filtered_replication/engine1_redis/cgrates.json +++ b/data/conf/samples/filtered_replication/engine1_redis/cgrates.json @@ -15,7 +15,7 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], }, }, @@ -76,8 +76,17 @@ "enabled": true, "scheduler_conns": ["*internal"], }, + "thresholds": { "enabled": true, }, +"stats": { + "enabled": true, +}, + +"resources": { + "enabled": true, +}, + } diff --git a/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json b/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json index fd631740e..8393c3adf 100644 --- a/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json +++ b/data/conf/samples/filtered_replication/engine2_mongo/cgrates.json @@ -15,7 +15,7 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], }, }, @@ -84,4 +84,12 @@ "enabled": true, }, +"stats": { + "enabled": true, +}, + +"resources": { + "enabled": true, +}, + } diff --git a/data/conf/samples/filtered_replication/engine2_redis/cgrates.json b/data/conf/samples/filtered_replication/engine2_redis/cgrates.json index 3f3b45bb8..f9443cb57 100644 --- a/data/conf/samples/filtered_replication/engine2_redis/cgrates.json +++ b/data/conf/samples/filtered_replication/engine2_redis/cgrates.json @@ -15,7 +15,7 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], }, }, @@ -82,4 +82,12 @@ "enabled": true, }, +"stats": { + "enabled": true, +}, + +"resources": { + "enabled": true, +}, + } diff --git a/data/conf/samples/filtered_replication/internal/cgrates.json b/data/conf/samples/filtered_replication/internal/cgrates.json index 746f464c9..e23ddd041 100644 --- a/data/conf/samples/filtered_replication/internal/cgrates.json +++ b/data/conf/samples/filtered_replication/internal/cgrates.json @@ -16,8 +16,8 @@ "conn2": { "strategy": "*broadcast_sync", "conns": [ - {"id": "engine1", "address": "127.0.0.1:2022", "transport":"*json"}, - {"id": "engine2", "address": "127.0.0.1:2032", "transport":"*json"} + {"id": "engine1", "address": "127.0.0.1:2023", "transport":"*gob"}, + {"id": "engine2", "address": "127.0.0.1:2033", "transport":"*gob"} ], }, }, @@ -26,7 +26,7 @@ "data_db": { "db_type": "*internal", "replication_conns": ["conn2"], - "filtered_replication": true, + "replication_filtered": true, "items":{ "*accounts":{"remote":false,"replicate":true}, "*reverse_destinations": {"remote":false,"replicate":true}, @@ -100,4 +100,14 @@ "scheduler_conns": ["*internal"], }, +"stats": { + "enabled": true, + "store_interval": "-1", +}, + +"resources": { + "enabled": true, + "store_interval": "-1", +}, + } diff --git a/data/conf/samples/full_remote/internal/cgrates.json b/data/conf/samples/full_remote/internal/cgrates.json index 0a21f1d53..13ff7baa5 100644 --- a/data/conf/samples/full_remote/internal/cgrates.json +++ b/data/conf/samples/full_remote/internal/cgrates.json @@ -15,7 +15,7 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2022", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2023", "transport":"*gob"}], }, }, diff --git a/data/conf/samples/gocs/au_site/cgrates.json b/data/conf/samples/gocs/au_site/cgrates.json index e86eb6e70..a1a134d32 100644 --- a/data/conf/samples/gocs/au_site/cgrates.json +++ b/data/conf/samples/gocs/au_site/cgrates.json @@ -19,7 +19,7 @@ }, "rmtConn": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:4012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:4013", "transport":"*gob"}], }, "*internal": { "strategy": "*first", diff --git a/data/conf/samples/gocs/us_site/cgrates.json b/data/conf/samples/gocs/us_site/cgrates.json index a74242109..5dc5648c2 100644 --- a/data/conf/samples/gocs/us_site/cgrates.json +++ b/data/conf/samples/gocs/us_site/cgrates.json @@ -18,7 +18,7 @@ }, "rplConn": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:3012", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:3013", "transport":"*gob"}], }, "*internal": { "strategy": "*first", diff --git a/data/conf/samples/remote_replication/internal/cgrates.json b/data/conf/samples/remote_replication/internal/cgrates.json index 0c3ac7cad..c7a540862 100644 --- a/data/conf/samples/remote_replication/internal/cgrates.json +++ b/data/conf/samples/remote_replication/internal/cgrates.json @@ -15,13 +15,13 @@ "rpc_conns": { "conn1": { "strategy": "*first", - "conns": [{"address": "127.0.0.1:2032", "transport":"*json"}], + "conns": [{"address": "127.0.0.1:2033", "transport":"*gob"}], }, "conn2": { "strategy": "*broadcast_sync", "conns": [ - {"address": "127.0.0.1:2022", "transport":"*json"}, - {"address": "127.0.0.1:2032", "transport":"*json"} + {"address": "127.0.0.1:2023", "transport":"*gob"}, + {"address": "127.0.0.1:2033", "transport":"*gob"} ], }, "connCache": { diff --git a/data/conf/samples/replication/internal/cgrates.json b/data/conf/samples/replication/internal/cgrates.json index 65fb9a23c..1381a02fd 100644 --- a/data/conf/samples/replication/internal/cgrates.json +++ b/data/conf/samples/replication/internal/cgrates.json @@ -16,8 +16,8 @@ "conn2": { "strategy": "*broadcast_sync", "conns": [ - {"address": "127.0.0.1:2022", "transport":"*json"}, - {"address": "127.0.0.1:2032", "transport":"*json"} + {"address": "127.0.0.1:2023", "transport":"*gob"}, + {"address": "127.0.0.1:2033", "transport":"*gob"} ], }, "connCache": { diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go index e686ff707..c17819f83 100644 --- a/dispatchers/replicator.go +++ b/dispatchers/replicator.go @@ -597,9 +597,9 @@ func (dS *DispatcherService) ReplicatorSv1SetReverseDestination(args *engine.Des }, utils.MetaReplicator, utils.ReplicatorSv1SetReverseDestination, args, rpl) } -func (dS *DispatcherService) ReplicatorSv1SetStatQueue(args *engine.StoredStatQueueWithOpts, rpl *string) (err error) { +func (dS *DispatcherService) ReplicatorSv1SetStatQueue(args *engine.StatQueueWithOpts, rpl *string) (err error) { if args == nil { - args = &engine.StoredStatQueueWithOpts{} + args = &engine.StatQueueWithOpts{} } args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index 5d7935f2b..c6f2ebc81 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -673,8 +673,8 @@ func testDspRplThresholdProfile(t *testing.T) { func testDspRplStatQueue(t *testing.T) { // Set StatQueue var replyStr string - setStatQueue := &engine.StoredStatQueueWithOpts{ - StoredStatQueue: &engine.StoredStatQueue{ + setStatQueue := &engine.StatQueueWithOpts{ + StatQueue: &engine.StatQueue{ Tenant: "cgrates.org", ID: "ID", }, diff --git a/engine/caches.go b/engine/caches.go index 28e4c83b8..c4b7b4c2d 100644 --- a/engine/caches.go +++ b/engine/caches.go @@ -105,11 +105,6 @@ func init() { gob.Register(utils.StringSet{}) } -//SetCache shared the cache from other subsystems -func SetCache(chS *CacheS) { - Cache = chS -} - // NewCacheS initializes the Cache service and executes the precaching func NewCacheS(cfg *config.CGRConfig, dm *DataManager, cpS *CapsStats) (c *CacheS) { cfg.CacheCfg().AddTmpCaches() diff --git a/engine/datamanager.go b/engine/datamanager.go index 89cb2a08f..1921bb59e 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -387,11 +387,9 @@ func (dm *DataManager) GetDestination(key string, cacheRead, cacheWrite bool, tr utils.ReplicatorSv1GetDestination, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &dest); err == nil { err = dm.dataDB.SetDestinationDrv(dest, utils.NonTransactional) } @@ -431,10 +429,8 @@ func (dm *DataManager) SetDestination(dest *Destination, transactionID string) ( &DestinationWithOpts{ Destination: dest, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -475,10 +471,8 @@ func (dm *DataManager) RemoveDestination(destID string, transactionID string) (e &utils.StringWithOpts{ Arg: destID, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -493,9 +487,9 @@ func (dm *DataManager) SetReverseDestination(destID string, prefixes []string, t if config.CgrConfig().DataDbCfg().Items[utils.MetaReverseDestinations].Replicate { err = replicate(dm.connMgr, config.CgrConfig().DataDbCfg().RplConns, config.CgrConfig().DataDbCfg().RplFiltered, - utils.ReverseDestinationPrefix, destID, // this are used to get the host IDs from cache + utils.DestinationPrefix, destID, // this are used to get the host IDs from cache utils.ReplicatorSv1SetReverseDestination, - &Destination{Id: destID, Prefixes: prefixes}) + &DestinationWithOpts{Destination: &Destination{Id: destID, Prefixes: prefixes}}) } return } @@ -521,11 +515,9 @@ func (dm *DataManager) GetReverseDestination(prefix string, utils.ReplicatorSv1GetReverseDestination, &utils.StringWithOpts{ Arg: prefix, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &ids); err == nil { err = dm.dataDB.SetReverseDestinationDrv(prefix, ids, transactionID) } @@ -610,11 +602,9 @@ func (dm *DataManager) GetAccount(id string) (acc *Account, err error) { utils.ReplicatorSv1GetAccount, &utils.StringWithOpts{ Arg: id, Tenant: tenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &acc); err == nil { err = dm.dataDB.SetAccountDrv(acc) } @@ -641,10 +631,8 @@ func (dm *DataManager) SetAccount(acc *Account) (err error) { utils.ReplicatorSv1SetAccount, &AccountWithOpts{ Account: acc, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + utils.EmptyString, utils.EmptyString)}) // the account doesn't have cache } return } @@ -664,10 +652,8 @@ func (dm *DataManager) RemoveAccount(id string) (err error) { &utils.StringWithOpts{ Arg: id, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + utils.EmptyString, utils.EmptyString)}) } return } @@ -695,11 +681,10 @@ func (dm *DataManager) GetStatQueue(tenant, id string, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetStatQueue, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &sq); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &sq); err == nil { var ssq *StoredStatQueue if dm.dataDB.GetStorageType() != utils.MetaInternal { // in case of internal we don't marshal @@ -795,8 +780,7 @@ func (dm *DataManager) SetStatQueue(sq *StatQueue, metrics []*MetricWithFilters, } var ssq *StoredStatQueue - if dm.dataDB.GetStorageType() != utils.MetaInternal || - config.CgrConfig().DataDbCfg().Items[utils.MetaStatQueues].Replicate { + if dm.dataDB.GetStorageType() != utils.MetaInternal { // in case of internal we don't marshal if ssq, err = NewStoredStatQueue(sq, dm.ms); err != nil { return @@ -810,12 +794,10 @@ func (dm *DataManager) SetStatQueue(sq *StatQueue, metrics []*MetricWithFilters, config.CgrConfig().DataDbCfg().RplFiltered, utils.StatQueuePrefix, sq.TenantID(), // this are used to get the host IDs from cache utils.ReplicatorSv1SetStatQueue, - &StoredStatQueueWithOpts{ - StoredStatQueue: ssq, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + &StatQueueWithOpts{ + StatQueue: sq, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -835,10 +817,8 @@ func (dm *DataManager) RemoveStatQueue(tenant, id string, transactionID string) utils.ReplicatorSv1RemoveStatQueue, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -869,11 +849,10 @@ func (dm *DataManager) GetFilter(tenant, id string, cacheRead, cacheWrite bool, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &fltr); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &fltr); err == nil { err = dm.dataDB.SetFilterDrv(fltr) } } @@ -925,10 +904,8 @@ func (dm *DataManager) SetFilter(fltr *Filter, withIndex bool) (err error) { utils.ReplicatorSv1SetFilter, &FilterWithOpts{ Filter: fltr, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -970,10 +947,8 @@ func (dm *DataManager) RemoveFilter(tenant, id, transactionID string, withIndex utils.ReplicatorSv1RemoveFilter, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -999,11 +974,10 @@ func (dm *DataManager) GetThreshold(tenant, id string, if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &th); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &th); err == nil { err = dm.dataDB.SetThresholdDrv(th) } } @@ -1059,10 +1033,8 @@ func (dm *DataManager) SetThreshold(th *Threshold, snooze time.Duration, simpleS utils.ReplicatorSv1SetThreshold, &ThresholdWithOpts{ Threshold: th, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1081,10 +1053,8 @@ func (dm *DataManager) RemoveThreshold(tenant, id, transactionID string) (err er utils.ReplicatorSv1RemoveThreshold, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1111,11 +1081,10 @@ func (dm *DataManager) GetThresholdProfile(tenant, id string, cacheRead, cacheWr utils.ReplicatorSv1GetThresholdProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &th); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &th); err == nil { err = dm.dataDB.SetThresholdProfileDrv(th) } } @@ -1175,10 +1144,8 @@ func (dm *DataManager) SetThresholdProfile(th *ThresholdProfile, withIndex bool) utils.ReplicatorSv1SetThresholdProfile, &ThresholdProfileWithOpts{ ThresholdProfile: th, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1214,10 +1181,8 @@ func (dm *DataManager) RemoveThresholdProfile(tenant, id, utils.ReplicatorSv1RemoveThresholdProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1244,11 +1209,10 @@ func (dm *DataManager) GetStatQueueProfile(tenant, id string, cacheRead, cacheWr utils.ReplicatorSv1GetStatQueueProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &sqp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &sqp); err == nil { err = dm.dataDB.SetStatQueueProfileDrv(sqp) } } @@ -1308,10 +1272,8 @@ func (dm *DataManager) SetStatQueueProfile(sqp *StatQueueProfile, withIndex bool utils.ReplicatorSv1SetStatQueueProfile, &StatQueueProfileWithOpts{ StatQueueProfile: sqp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1347,10 +1309,8 @@ func (dm *DataManager) RemoveStatQueueProfile(tenant, id, utils.ReplicatorSv1RemoveStatQueueProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1376,11 +1336,9 @@ func (dm *DataManager) GetTiming(id string, skipCache bool, &utils.StringWithOpts{ Arg: id, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &t); err == nil { err = dm.dataDB.SetTimingDrv(t) } @@ -1421,10 +1379,8 @@ func (dm *DataManager) SetTiming(t *utils.TPTiming) (err error) { utils.ReplicatorSv1SetTiming, &utils.TPTimingWithOpts{ TPTiming: t, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1472,11 +1428,10 @@ func (dm *DataManager) GetResource(tenant, id string, cacheRead, cacheWrite bool utils.ReplicatorSv1GetResource, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &rs); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &rs); err == nil { err = dm.dataDB.SetResourceDrv(rs) } } @@ -1541,10 +1496,8 @@ func (dm *DataManager) SetResource(rs *Resource, ttl *time.Duration, usageLimit utils.ReplicatorSv1SetResource, &ResourceWithOpts{ Resource: rs, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1563,10 +1516,8 @@ func (dm *DataManager) RemoveResource(tenant, id, transactionID string) (err err utils.ReplicatorSv1RemoveResource, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1592,11 +1543,10 @@ func (dm *DataManager) GetResourceProfile(tenant, id string, cacheRead, cacheWri if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &rp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &rp); err == nil { err = dm.dataDB.SetResourceProfileDrv(rp) } } @@ -1657,10 +1607,8 @@ func (dm *DataManager) SetResourceProfile(rp *ResourceProfile, withIndex bool) ( utils.ReplicatorSv1SetResourceProfile, &ResourceProfileWithOpts{ ResourceProfile: rp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1695,10 +1643,8 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, w utils.ReplicatorSv1RemoveResourceProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1724,11 +1670,9 @@ func (dm *DataManager) GetActionTriggers(id string, skipCache bool, &utils.StringWithOpts{ Arg: id, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, attrs); err == nil { err = dm.dataDB.SetActionTriggersDrv(id, attrs) } @@ -1770,10 +1714,8 @@ func (dm *DataManager) RemoveActionTriggers(id, transactionID string) (err error &utils.StringWithOpts{ Arg: id, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1806,10 +1748,8 @@ func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, Attrs: attr, Key: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1835,11 +1775,9 @@ func (dm *DataManager) GetSharedGroup(key string, skipCache bool, utils.ReplicatorSv1GetSharedGroup, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &sg); err == nil { err = dm.dataDB.SetSharedGroupDrv(sg) } @@ -1882,10 +1820,8 @@ func (dm *DataManager) SetSharedGroup(sg *SharedGroup, &SharedGroupWithOpts{ SharedGroup: sg, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1909,10 +1845,8 @@ func (dm *DataManager) RemoveSharedGroup(id, transactionID string) (err error) { &utils.StringWithOpts{ Arg: id, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -1940,11 +1874,9 @@ func (dm *DataManager) GetActions(key string, skipCache bool, transactionID stri utils.ReplicatorSv1GetActions, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &as); err == nil { err = dm.dataDB.SetActionsDrv(key, as) } @@ -1991,10 +1923,8 @@ func (dm *DataManager) SetActions(key string, as Actions, transactionID string) Key: key, Acs: as, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2014,10 +1944,8 @@ func (dm *DataManager) RemoveActions(key, transactionID string) (err error) { &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2033,11 +1961,9 @@ func (dm *DataManager) GetActionPlan(key string, skipCache bool, transactionID s utils.ReplicatorSv1GetActionPlan, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &ats); err == nil { err = dm.dataDB.SetActionPlanDrv(key, ats, true, utils.NonTransactional) } @@ -2076,10 +2002,8 @@ func (dm *DataManager) SetActionPlan(key string, ats *ActionPlan, Ats: ats, Overwrite: overwrite, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2096,11 +2020,9 @@ func (dm *DataManager) GetAllActionPlans() (ats map[string]*ActionPlan, err erro &utils.StringWithOpts{ Arg: utils.EmptyString, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &ats) } if err != nil { @@ -2125,10 +2047,8 @@ func (dm *DataManager) RemoveActionPlan(key string, transactionID string) (err e &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2145,11 +2065,9 @@ func (dm *DataManager) GetAccountActionPlans(acntID string, &utils.StringWithOpts{ Arg: acntID, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &apIDs); err == nil { err = dm.dataDB.SetAccountActionPlansDrv(acntID, apIDs, true) } @@ -2187,10 +2105,8 @@ func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, ove AplIDs: aPlIDs, Overwrite: overwrite, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2219,10 +2135,8 @@ func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err AcntID: acntID, ApIDs: apIDs, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2249,11 +2163,9 @@ func (dm *DataManager) GetRatingPlan(key string, skipCache bool, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &rp); err == nil { err = dm.dataDB.SetRatingPlanDrv(rp) } @@ -2294,10 +2206,8 @@ func (dm *DataManager) SetRatingPlan(rp *RatingPlan, transactionID string) (err &RatingPlanWithOpts{ RatingPlan: rp, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2321,10 +2231,8 @@ func (dm *DataManager) RemoveRatingPlan(key string, transactionID string) (err e &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2354,11 +2262,9 @@ func (dm *DataManager) GetRatingProfile(key string, skipCache bool, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &rpf); err == nil { err = dm.dataDB.SetRatingProfileDrv(rpf) } @@ -2397,10 +2303,8 @@ func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, &RatingProfileWithOpts{ RatingProfile: rpf, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2421,10 +2325,8 @@ func (dm *DataManager) RemoveRatingProfile(key string, &utils.StringWithOpts{ Arg: key, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2458,11 +2360,10 @@ func (dm *DataManager) GetRouteProfile(tenant, id string, cacheRead, cacheWrite if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetRouteProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &rpp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &rpp); err == nil { err = dm.dataDB.SetRouteProfileDrv(rpp) } } @@ -2526,10 +2427,8 @@ func (dm *DataManager) SetRouteProfile(rpp *RouteProfile, withIndex bool) (err e utils.ReplicatorSv1SetRouteProfile, &RouteProfileWithOpts{ RouteProfile: rpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2564,10 +2463,8 @@ func (dm *DataManager) RemoveRouteProfile(tenant, id, transactionID string, with utils.ReplicatorSv1RemoveRouteProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2597,11 +2494,10 @@ func (dm *DataManager) GetAttributeProfile(tenant, id string, cacheRead, cacheWr utils.ReplicatorSv1GetAttributeProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &attrPrfl); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &attrPrfl); err == nil { err = dm.dataDB.SetAttributeProfileDrv(attrPrfl) } } @@ -2667,10 +2563,8 @@ func (dm *DataManager) SetAttributeProfile(ap *AttributeProfile, withIndex bool) utils.ReplicatorSv1SetAttributeProfile, &AttributeProfileWithOpts{ AttributeProfile: ap, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2707,10 +2601,8 @@ func (dm *DataManager) RemoveAttributeProfile(tenant, id string, transactionID s utils.ReplicatorSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2737,11 +2629,10 @@ func (dm *DataManager) GetChargerProfile(tenant, id string, cacheRead, cacheWrit utils.ReplicatorSv1GetChargerProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &cpp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &cpp); err == nil { err = dm.dataDB.SetChargerProfileDrv(cpp) } } @@ -2801,10 +2692,8 @@ func (dm *DataManager) SetChargerProfile(cpp *ChargerProfile, withIndex bool) (e utils.ReplicatorSv1SetChargerProfile, &ChargerProfileWithOpts{ ChargerProfile: cpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2840,10 +2729,8 @@ func (dm *DataManager) RemoveChargerProfile(tenant, id string, utils.ReplicatorSv1RemoveChargerProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2870,11 +2757,10 @@ func (dm *DataManager) GetDispatcherProfile(tenant, id string, cacheRead, cacheW utils.ReplicatorSv1GetDispatcherProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &dpp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &dpp); err == nil { err = dm.dataDB.SetDispatcherProfileDrv(dpp) } } @@ -2936,10 +2822,8 @@ func (dm *DataManager) SetDispatcherProfile(dpp *DispatcherProfile, withIndex bo utils.ReplicatorSv1SetDispatcherProfile, &DispatcherProfileWithOpts{ DispatcherProfile: dpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -2977,10 +2861,8 @@ func (dm *DataManager) RemoveDispatcherProfile(tenant, id string, utils.ReplicatorSv1RemoveDispatcherProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3007,11 +2889,10 @@ func (dm *DataManager) GetDispatcherHost(tenant, id string, cacheRead, cacheWrit utils.ReplicatorSv1GetDispatcherHost, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &dH); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &dH); err == nil { err = dm.dataDB.SetDispatcherHostDrv(dH) } } @@ -3050,10 +2931,8 @@ func (dm *DataManager) SetDispatcherHost(dpp *DispatcherHost) (err error) { utils.ReplicatorSv1SetDispatcherHost, &DispatcherHostWithOpts{ DispatcherHost: dpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3080,10 +2959,8 @@ func (dm *DataManager) RemoveDispatcherHost(tenant, id string, utils.ReplicatorSv1RemoveDispatcherHost, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3101,11 +2978,9 @@ func (dm *DataManager) GetItemLoadIDs(itemIDPrefix string, cacheWrite bool) (loa &utils.StringWithOpts{ Arg: itemIDPrefix, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &loadIDs); err == nil { err = dm.dataDB.SetLoadIDsDrv(loadIDs) } @@ -3155,10 +3030,8 @@ func (dm *DataManager) SetLoadIDs(loadIDs map[string]int64) (err error) { &utils.LoadIDsWithOpts{ LoadIDs: loadIDs, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3185,11 +3058,10 @@ func (dm *DataManager) GetRateProfile(tenant, id string, cacheRead, cacheWrite b utils.ReplicatorSv1GetRateProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &rpp); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &rpp); err == nil { rpp.Sort() err = dm.dataDB.SetRateProfileDrv(rpp) } @@ -3281,10 +3153,8 @@ func (dm *DataManager) SetRateProfile(rpp *RateProfile, withIndex bool) (err err utils.ReplicatorSv1SetRateProfile, &RateProfileWithOpts{ RateProfile: rpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3323,10 +3193,8 @@ func (dm *DataManager) RemoveRateProfile(tenant, id string, utils.ReplicatorSv1RemoveRateProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3375,10 +3243,8 @@ func (dm *DataManager) RemoveRateProfileRates(tenant, id string, rateIDs []strin utils.ReplicatorSv1SetRateProfile, &RateProfileWithOpts{ RateProfile: oldRpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3427,10 +3293,8 @@ func (dm *DataManager) SetRateProfileRates(rpp *RateProfile, withIndex bool) (er utils.ReplicatorSv1SetRateProfile, &RateProfileWithOpts{ RateProfile: oldRpp, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3457,11 +3321,10 @@ func (dm *DataManager) GetActionProfile(tenant, id string, cacheRead, cacheWrite utils.ReplicatorSv1GetActionProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &ap); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &ap); err == nil { err = dm.dataDB.SetActionProfileDrv(ap) } } @@ -3521,10 +3384,8 @@ func (dm *DataManager) SetActionProfile(ap *ActionProfile, withIndex bool) (err utils.ReplicatorSv1SetActionProfile, &ActionProfileWithOpts{ ActionProfile: ap, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3557,10 +3418,8 @@ func (dm *DataManager) RemoveActionProfile(tenant, id string, utils.ReplicatorSv1RemoveActionProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3604,11 +3463,9 @@ func (dm *DataManager) GetIndexes(idxItmType, tntCtx, idxKey string, TntCtx: tntCtx, IdxKey: idxKey, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }, + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), }, &indexes); err == nil { err = dm.dataDB.SetIndexesDrv(idxItmType, tntCtx, indexes, true, utils.NonTransactional) } @@ -3657,10 +3514,8 @@ func (dm *DataManager) SetIndexes(idxItmType, tntCtx string, TntCtx: tntCtx, Indexes: indexes, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3682,10 +3537,8 @@ func (dm *DataManager) RemoveIndexes(idxItmType, tntCtx, idxKey string) (err err TntCtx: tntCtx, IdxKey: idxKey, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3750,11 +3603,10 @@ func (dm *DataManager) checkFilters(tenant string, ids []string) (brokenReferenc err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &fltr) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &fltr) has = fltr == nil } // not in local DB and not in remote DB @@ -3778,11 +3630,10 @@ func (dm *DataManager) GetAccountProfile(tenant, id string) (ap *utils.AccountPr utils.ReplicatorSv1GetAccountProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - utils.RemoteHostOpt: utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, config.CgrConfig().GeneralCfg().NodeID), - }}, &ap); err == nil { + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString, + utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID, + config.CgrConfig().GeneralCfg().NodeID)), + }, &ap); err == nil { err = dm.dataDB.SetAccountProfileDrv(ap) } } @@ -3828,10 +3679,8 @@ func (dm *DataManager) SetAccountProfile(ap *utils.AccountProfile, withIndex boo utils.ReplicatorSv1SetAccountProfile, &utils.AccountProfileWithOpts{ AccountProfile: ap, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } @@ -3864,10 +3713,8 @@ func (dm *DataManager) RemoveAccountProfile(tenant, id string, utils.ReplicatorSv1RemoveAccountProfile, &utils.TenantIDWithOpts{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, - Opts: map[string]interface{}{ - utils.OptsAPIKey: itm.APIKey, - utils.OptsRouteID: itm.RouteID, - }}) + Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return } diff --git a/engine/libstats.go b/engine/libstats.go index a2fcb2dc1..4d4baa2a9 100644 --- a/engine/libstats.go +++ b/engine/libstats.go @@ -97,8 +97,8 @@ type StoredStatQueue struct { Compressed bool } -type StoredStatQueueWithOpts struct { - *StoredStatQueue +type StatQueueWithOpts struct { + *StatQueue Opts map[string]interface{} } diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index 977fab314..35354cda4 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -1658,6 +1658,11 @@ func (ms *MongoStorage) GetStatQueueDrv(tenant, id string) (sq *StatQueue, err e // SetStatQueueDrv stores the metrics for a StoredStatQueue func (ms *MongoStorage) SetStatQueueDrv(ssq *StoredStatQueue, sq *StatQueue) (err error) { + if ssq == nil { + if ssq, err = NewStoredStatQueue(sq, ms.ms); err != nil { + return + } + } return ms.query(func(sctx mongo.SessionContext) (err error) { _, err = ms.getCol(ColSqs).UpdateOne(sctx, bson.M{"tenant": ssq.Tenant, "id": ssq.ID}, bson.M{"$set": ssq}, diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 0a467e02b..ac7c70098 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -993,6 +993,11 @@ func (rs *RedisStorage) GetStatQueueDrv(tenant, id string) (sq *StatQueue, err e // SetStatQueueDrv stores the metrics for a StatsQueue func (rs *RedisStorage) SetStatQueueDrv(ssq *StoredStatQueue, sq *StatQueue) (err error) { + if ssq == nil { + if ssq, err = NewStoredStatQueue(sq, rs.ms); err != nil { + return + } + } var result []byte if result, err = rs.ms.Marshal(ssq); err != nil { return diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index b121d026e..6027be2f2 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -141,6 +141,9 @@ func testFltrRplStartEngine(t *testing.T) { func testFltrRplRPCConn(t *testing.T) { var err error + tmp := *encoding + // run only under *gob encoding + *encoding = utils.MetaGOB if fltrRplInternalRPC, err = newRPCClient(fltrRplInternalCfg.ListenCfg()); err != nil { t.Fatal(err) } @@ -150,6 +153,7 @@ func testFltrRplRPCConn(t *testing.T) { if fltrRplEngine2RPC, err = newRPCClient(fltrRplEngine2Cfg.ListenCfg()); err != nil { t.Fatal(err) } + *encoding = tmp } func testFltrRplAttributeProfile(t *testing.T) { @@ -247,7 +251,7 @@ func testFltrRplAttributeProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveAttributeProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: attrID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -295,7 +299,7 @@ func testFltrRplFilters(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetFilter, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -314,7 +318,7 @@ func testFltrRplFilters(t *testing.T) { } if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetFilter, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -329,7 +333,7 @@ func testFltrRplFilters(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetFilter, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -354,7 +358,7 @@ func testFltrRplFilters(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveFilter, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: fltrID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -376,15 +380,25 @@ func testFltrRplThresholdProfile(t *testing.T) { Tenant: "cgrates.org", ID: thID, FilterIDs: []string{"*string:~*req.Account:dan"}, - MinHits: 1, MaxHits: -1, - MinSleep: 5 * time.Minute, Weight: 20, }, } + th := engine.Threshold{ + Tenant: "cgrates.org", + ID: thID, + } var result string var replyPrfl *engine.ThresholdProfile var rplyIDs []string + var replyTh engine.Threshold + + argsTh := &utils.TenantIDWithOpts{ + TenantID: &utils.TenantID{ + Tenant: "cgrates.org", + ID: thID, + }, + } // empty if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetThresholdProfileIDs, &utils.PaginatorWithTenant{}, &rplyIDs); err == nil || err.Error() != utils.ErrNotFound.Error() { @@ -395,13 +409,22 @@ func testFltrRplThresholdProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplInternalRPC.Call(utils.APIerSv1SetThresholdProfile, thPrfl, &result); err != nil { t.Fatal(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetThresholdProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: thID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(thPrfl.ThresholdProfile, replyPrfl) { @@ -418,13 +441,29 @@ func testFltrRplThresholdProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetThresholdProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: thID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(thPrfl.ThresholdProfile, replyPrfl) { t.Errorf("Expecting : %s, received: %s", utils.ToJSON(thPrfl.ThresholdProfile), utils.ToJSON(replyPrfl)) } + + if err := fltrRplEngine1RPC.Call(utils.ThresholdSv1GetThreshold, argsTh, &replyTh); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(th, replyTh) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(th), utils.ToJSON(replyTh)) + } + replyPrfl = nil thPrfl.Weight = 10 if err := fltrRplInternalRPC.Call(utils.APIerSv1SetThresholdProfile, thPrfl, &result); err != nil { @@ -433,7 +472,7 @@ func testFltrRplThresholdProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetThresholdProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: thID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(thPrfl.ThresholdProfile, replyPrfl) { @@ -455,8 +494,34 @@ func testFltrRplThresholdProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + tEv := &engine.ThresholdsArgsProcessEvent{ + CGREvent: &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "event1", + Event: map[string]interface{}{ + utils.AccountField: "dan", + }, + }, + } + var thIDs []string + //Testing ProcessEvent on set thresholdprofile using apier + if err := fltrRplInternalRPC.Call(utils.ThresholdSv1ProcessEvent, tEv, &thIDs); err != nil { + t.Fatal(err) + } else if expected := []string{thID}; !reflect.DeepEqual(expected, thIDs) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(expected), utils.ToJSON(thIDs)) + } + + if err := fltrRplEngine1RPC.Call(utils.ThresholdSv1GetThreshold, argsTh, &replyTh); err != nil { + t.Fatal(err) + } + th.Hits = 1 + replyTh.Snooze = th.Snooze // ignore the snooze as this is relative to time.Now + if !reflect.DeepEqual(th, replyTh) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(th), utils.ToJSON(replyTh)) + } + if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveThresholdProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: thID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -469,6 +534,15 @@ func testFltrRplThresholdProfile(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Fatalf("Unexpected error: %v", err) } + + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetThreshold, argsTh, &replyTh); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } } func testFltrRplStatQueueProfile(t *testing.T) { @@ -482,8 +556,7 @@ func testFltrRplStatQueueProfile(t *testing.T) { TTL: time.Second, Metrics: []*engine.MetricWithFilters{ { - MetricID: utils.MetaACD, - FilterIDs: []string{"*gt:~*req.Usage:10s"}, + MetricID: utils.MetaACD, }, }, ThresholdIDs: []string{"*none"}, @@ -493,9 +566,23 @@ func testFltrRplStatQueueProfile(t *testing.T) { MinItems: 1, }, } + sq := engine.StatQueue{ + Tenant: "cgrates.org", + ID: stID, + SQItems: []engine.SQItem{}, + SQMetrics: map[string]engine.StatMetric{}, + } var result string var replyPrfl *engine.StatQueueProfile var rplyIDs []string + var replySq engine.StatQueue + + argsSq := &utils.TenantIDWithOpts{ + TenantID: &utils.TenantID{ + Tenant: "cgrates.org", + ID: stID, + }, + } // empty if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetStatQueueProfileIDs, &utils.PaginatorWithTenant{}, &rplyIDs); err == nil || err.Error() != utils.ErrNotFound.Error() { @@ -506,13 +593,22 @@ func testFltrRplStatQueueProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplInternalRPC.Call(utils.APIerSv1SetStatQueueProfile, stPrf, &result); err != nil { t.Fatal(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetStatQueueProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: stID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(stPrf.StatQueueProfile, replyPrfl) { @@ -529,13 +625,34 @@ func testFltrRplStatQueueProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetStatQueueProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: stID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(stPrf.StatQueueProfile, replyPrfl) { t.Errorf("Expecting : %s, received: %s", utils.ToJSON(stPrf.StatQueueProfile), utils.ToJSON(replyPrfl)) } + replySq = engine.StatQueue{} + sq.SQItems = nil + s, _ := engine.NewACD(1, "", nil) + sq.SQMetrics = map[string]engine.StatMetric{ + utils.MetaACD: s, + } + if err := fltrRplEngine1RPC.Call(utils.StatSv1GetStatQueue, argsSq, &replySq); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(sq, replySq) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(sq), utils.ToJSON(replySq)) + } + replyPrfl = nil stPrf.Weight = 15 if err := fltrRplInternalRPC.Call(utils.APIerSv1SetStatQueueProfile, stPrf, &result); err != nil { @@ -544,7 +661,7 @@ func testFltrRplStatQueueProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetStatQueueProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: stID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(stPrf.StatQueueProfile, replyPrfl) { @@ -566,8 +683,38 @@ func testFltrRplStatQueueProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + sEv := &engine.StatsArgsProcessEvent{ + CGREvent: &utils.CGREvent{ + Tenant: "cgrates.org", + ID: "event1", + Event: map[string]interface{}{ + utils.AccountField: "dan", + utils.Usage: 45 * time.Second, + }, + }, + } + var sqIDs []string + //Testing ProcessEvent on set thresholdprofile using apier + if err := fltrRplInternalRPC.Call(utils.StatSv1ProcessEvent, sEv, &sqIDs); err != nil { + t.Fatal(err) + } else if expected := []string{stID}; !reflect.DeepEqual(expected, sqIDs) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(expected), utils.ToJSON(sqIDs)) + } + + if err := fltrRplEngine1RPC.Call(utils.StatSv1GetStatQueue, argsSq, &replySq); err != nil { + t.Fatal(err) + } + sq.SQItems = []engine.SQItem{{ + EventID: "event1", + }} + s.AddEvent("event1", utils.MapStorage{utils.MetaReq: map[string]interface{}{utils.Usage: 45 * time.Second}}) + replySq.SQItems[0].ExpiryTime = sq.SQItems[0].ExpiryTime + if !reflect.DeepEqual(sq, replySq) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(sq), utils.ToJSON(replySq)) + } + if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveStatQueueProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: stID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -580,6 +727,15 @@ func testFltrRplStatQueueProfile(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Fatalf("Unexpected error: %v", err) } + + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetStatQueue, argsSq, &replySq); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } } func testFltrRplResourceProfile(t *testing.T) { @@ -597,9 +753,22 @@ func testFltrRplResourceProfile(t *testing.T) { ThresholdIDs: []string{utils.MetaNone}, }, } + rs := engine.Resource{ + Tenant: "cgrates.org", + ID: resID, + Usages: make(map[string]*engine.ResourceUsage), + } var result string var replyPrfl *engine.ResourceProfile var rplyIDs []string + var replyRs engine.Resource + + argsRs := &utils.TenantIDWithOpts{ + TenantID: &utils.TenantID{ + Tenant: "cgrates.org", + ID: resID, + }, + } // empty if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetResourceProfileIDs, &utils.PaginatorWithTenant{}, &rplyIDs); err == nil || err.Error() != utils.ErrNotFound.Error() { @@ -610,13 +779,21 @@ func testFltrRplResourceProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } if err := fltrRplInternalRPC.Call(utils.APIerSv1SetResourceProfile, resPrf, &result); err != nil { t.Fatal(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetResourceProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: resID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(resPrf.ResourceProfile, replyPrfl) { @@ -633,13 +810,29 @@ func testFltrRplResourceProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetResourceProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: resID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(resPrf.ResourceProfile, replyPrfl) { t.Errorf("Expecting : %s, received: %s", utils.ToJSON(resPrf.ResourceProfile), utils.ToJSON(replyPrfl)) } + + if err := fltrRplEngine1RPC.Call(utils.ResourceSv1GetResource, argsRs, &replyRs); err != nil { + t.Fatal(err) + } else if !reflect.DeepEqual(rs, replyRs) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(rs), utils.ToJSON(replyRs)) + } + replyPrfl = nil resPrf.Weight = 15 if err := fltrRplInternalRPC.Call(utils.APIerSv1SetResourceProfile, resPrf, &result); err != nil { @@ -648,7 +841,7 @@ func testFltrRplResourceProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetResourceProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: resID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(resPrf.ResourceProfile, replyPrfl) { @@ -670,8 +863,43 @@ func testFltrRplResourceProfile(t *testing.T) { t.Fatalf("Unexpected error: %v", err) } + rEv := utils.ArgRSv1ResourceUsage{ + UsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", + CGREvent: &utils.CGREvent{ + Tenant: "cgrates.org", + ID: utils.UUIDSha1Prefix(), + Event: map[string]interface{}{ + utils.AccountField: "dan", + }, + }, + Units: 6, + } + var rsIDs string + //Testing ProcessEvent on set thresholdprofile using apier + if err := fltrRplInternalRPC.Call(utils.ResourceSv1AllocateResources, rEv, &rsIDs); err != nil { + t.Fatal(err) + } else if expected := resPrf.AllocationMessage; !reflect.DeepEqual(expected, rsIDs) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(expected), utils.ToJSON(rsIDs)) + } + + if err := fltrRplEngine1RPC.Call(utils.ResourceSv1GetResource, argsRs, &replyRs); err != nil { + t.Fatal(err) + } + rs.TTLIdx = []string{rEv.UsageID} + rs.Usages = map[string]*engine.ResourceUsage{ + rEv.UsageID: { + Tenant: "cgrates.org", + ID: rEv.UsageID, + Units: 6, + }, + } + replyRs.Usages[rEv.UsageID].ExpiryTime = time.Time{} + if !reflect.DeepEqual(rs, replyRs) { + t.Errorf("Expecting : %s, received: %s", utils.ToJSON(rs), utils.ToJSON(replyRs)) + } + if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveResourceProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: resID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -684,6 +912,15 @@ func testFltrRplResourceProfile(t *testing.T) { err.Error() != utils.ErrNotFound.Error() { t.Fatalf("Unexpected error: %v", err) } + + if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } + if err := fltrRplEngine2RPC.Call(utils.ReplicatorSv1GetResource, argsRs, &replyRs); err == nil || + err.Error() != utils.ErrNotFound.Error() { + t.Fatalf("Unexpected error: %v", err) + } } func testFltrRplRouteProfile(t *testing.T) { @@ -728,7 +965,7 @@ func testFltrRplRouteProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetRouteProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: rpID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -747,7 +984,7 @@ func testFltrRplRouteProfile(t *testing.T) { } if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetRouteProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: rpID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -762,7 +999,7 @@ func testFltrRplRouteProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetRouteProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: rpID}, &replyPrfl); err != nil { t.Fatal(err) } replyPrfl.Compile() @@ -787,7 +1024,7 @@ func testFltrRplRouteProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveRouteProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: rpID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -833,7 +1070,7 @@ func testFltrRplChargerProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetChargerProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: chID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(chPrf.ChargerProfile, replyPrfl) { @@ -851,7 +1088,7 @@ func testFltrRplChargerProfile(t *testing.T) { } if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetChargerProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: chID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(chPrf.ChargerProfile, replyPrfl) { @@ -865,7 +1102,7 @@ func testFltrRplChargerProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetChargerProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: chID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(chPrf.ChargerProfile, replyPrfl) { @@ -888,7 +1125,7 @@ func testFltrRplChargerProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveChargerProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: chID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -933,7 +1170,7 @@ func testFltrRplDispatcherProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetDispatcherProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherProfile, replyPrfl) { @@ -951,7 +1188,7 @@ func testFltrRplDispatcherProfile(t *testing.T) { } if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetDispatcherProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherProfile, replyPrfl) { @@ -965,7 +1202,7 @@ func testFltrRplDispatcherProfile(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetDispatcherProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherProfile, replyPrfl) { @@ -988,7 +1225,7 @@ func testFltrRplDispatcherProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveDispatcherProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: dspID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -1033,7 +1270,7 @@ func testFltrRplDispatcherHost(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetDispatcherHost, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherHost, replyPrfl) { @@ -1051,7 +1288,7 @@ func testFltrRplDispatcherHost(t *testing.T) { } if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetDispatcherHost, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherHost, replyPrfl) { @@ -1065,7 +1302,7 @@ func testFltrRplDispatcherHost(t *testing.T) { t.Error("Unexpected reply returned", result) } if err := fltrRplInternalRPC.Call(utils.APIerSv1GetDispatcherHost, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil { + &utils.TenantID{Tenant: "cgrates.org", ID: dspID}, &replyPrfl); err != nil { t.Fatal(err) } if !reflect.DeepEqual(dspPrf.DispatcherHost, replyPrfl) { @@ -1088,7 +1325,7 @@ func testFltrRplDispatcherHost(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveDispatcherHost, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: dspID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -1230,7 +1467,7 @@ func testFltrRplRateProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveRateProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: rpID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -1336,7 +1573,7 @@ func testFltrRplActionProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveActionProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: acID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -1457,7 +1694,7 @@ func testFltrRplAccountProfile(t *testing.T) { } if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveAccountProfile, - utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil { + utils.TenantIDWithCache{Tenant: "cgrates.org", ID: acID}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) diff --git a/packages/debian/changelog b/packages/debian/changelog index 6159204e2..8f05912b3 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -147,6 +147,7 @@ cgrates (0.11.0~dev) UNRELEASED; urgency=medium * [SessionS] Added JSON and GOB BiRPC support * [ActionS] Added *add_balance, *set_balance and *rem_balance * [RegistrarC] Renamed DispatcherH to RegistrarC + * [DataDB] Added replication filtering -- DanB Wed, 19 Feb 2020 13:25:52 +0200 diff --git a/registrarc/libregistrarc_test.go b/registrarc/libregistrarc_test.go index 77db8d440..21961ea04 100644 --- a/registrarc/libregistrarc_test.go +++ b/registrarc/libregistrarc_test.go @@ -159,7 +159,7 @@ func TestRegister(t *testing.T) { t.Fatal(err) } req.RemoteAddr = "127.0.0.1:2356" - engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil)) + engine.Cache = engine.NewCacheS(config.CgrConfig(), nil, nil) if rplyID, err := register(req); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(id, *rplyID) { @@ -248,7 +248,7 @@ func TestRegister(t *testing.T) { }, } errCfg.CacheCfg().ReplicationConns = []string{"errCon"} - engine.SetCache(engine.NewCacheS(errCfg, nil, nil)) + engine.Cache = engine.NewCacheS(errCfg, nil, nil) req.Body = ioutil.NopCloser(bytes.NewBuffer(uargsJSON)) if _, err := register(req); err != utils.ErrPartiallyExecuted { t.Errorf("Expected error: %s ,received: %v", utils.ErrPartiallyExecuted, err) @@ -322,7 +322,7 @@ func TestRegister(t *testing.T) { if _, err := register(req); err == nil { t.Errorf("Expected error,received: nil") } - engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil)) + engine.Cache = engine.NewCacheS(config.CgrConfig(), nil, nil) } type errRecorder struct{} @@ -475,7 +475,7 @@ func TestRegisterRegistrarSv1UnregisterRPCHosts(t *testing.T) { t.Fatal(err) } req.RemoteAddr = "127.0.0.1:2356" - engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil)) + engine.Cache = engine.NewCacheS(config.CgrConfig(), nil, nil) if rplyID, err := register(req); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(id, *rplyID) { @@ -563,11 +563,11 @@ func TestRegisterRegistrarSv1RegisterRPCHosts(t *testing.T) { t.Fatal(err) } req.RemoteAddr = "127.0.0.1:2356" - engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil)) + engine.Cache = engine.NewCacheS(config.CgrConfig(), nil, nil) if rplyID, err := register(req); err != nil { t.Fatal(err) } else if !reflect.DeepEqual(id, *rplyID) { t.Errorf("Expected: %q ,received: %q", string(id), string(*rplyID)) } - engine.SetCache(engine.NewCacheS(config.CgrConfig(), nil, nil)) + engine.Cache = engine.NewCacheS(config.CgrConfig(), nil, nil) } diff --git a/services/apierv1.go b/services/apierv1.go index bb631b669..0ce3f03d5 100644 --- a/services/apierv1.go +++ b/services/apierv1.go @@ -120,7 +120,7 @@ func (apiService *APIerSv1Service) Start() (err error) { if !apiService.cfg.DispatcherSCfg().Enabled { apiService.server.RpcRegister(apiService.api) apiService.server.RpcRegisterName(utils.ApierV1, apiService.api) - apiService.server.RpcRegister(v1.NewReplicatorSv1(datadb)) + apiService.server.RpcRegister(v1.NewReplicatorSv1(datadb, apiService.api)) } //backwards compatible diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go index 1ebbd5a6b..633b40848 100644 --- a/sessions/sessionscover_test.go +++ b/sessions/sessionscover_test.go @@ -1472,7 +1472,7 @@ func TestProcessChargerS(t *testing.T) { Replicate: true, } cacheS := engine.NewCacheS(cfg, nil, nil) - engine.SetCache(cacheS) + engine.Cache = cacheS connMgr = engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator): sMock}) engine.SetConnManager(connMgr) @@ -1616,7 +1616,7 @@ func TestLibsessionsSetMockErrors(t *testing.T) { Replicate: true, } cacheS := engine.NewCacheS(cfg, nil, nil) - engine.SetCache(cacheS) + engine.Cache = cacheS connMgr := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator): chanInternal}) engine.SetConnManager(connMgr) @@ -1706,7 +1706,7 @@ func TestSyncSessions(t *testing.T) { sessions.cgrCfg.GeneralCfg().ReplyTimeout = 1 cacheS := engine.NewCacheS(cfg, nil, nil) - engine.SetCache(cacheS) + engine.Cache = cacheS connMgr = engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator): chanInternal}) engine.SetConnManager(connMgr) @@ -1931,7 +1931,7 @@ func TestChargeEvent(t *testing.T) { } cacheS := engine.NewCacheS(cfg, nil, nil) - engine.SetCache(cacheS) + engine.Cache = cacheS connMgr = engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaReplicator): chanInternal}) engine.SetConnManager(connMgr) @@ -2443,7 +2443,7 @@ func TestBiRPCv1AuthorizeEvent(t *testing.T) { ResourceAllocation: utils.StringPointer("ROUTE_LEASTCOST_1"), }, } - engine.SetCache(caches) + engine.Cache = caches caches.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1AuthorizeEvent, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1AuthorizeEvent(nil, args, rply); err != nil { @@ -2812,7 +2812,7 @@ func TestBiRPCv1InitiateSession1(t *testing.T) { ResourceAllocation: utils.StringPointer("ROUTE_LEASTCOST_1"), }, } - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1InitiateSession, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1InitiateSession(nil, args, rply); err != nil { @@ -3148,7 +3148,7 @@ func TestBiRPCv1UpdateSession1(t *testing.T) { cgrEvent.ID = "test_id" args = NewV1UpdateSessionArgs(true, []string{}, false, cgrEvent, true) - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1UpdateSession, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1UpdateSession(nil, args, rply); err != nil { @@ -3318,7 +3318,7 @@ func TestBiRPCv1TerminateSession1(t *testing.T) { value := &utils.CachedRPCResponse{ Result: utils.StringPointer("ROUTE_LEASTCOST_1"), } - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1TerminateSession, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1TerminateSession(nil, args, &reply); err != nil { @@ -3391,7 +3391,7 @@ func TestBiRPCv1TerminateSession1(t *testing.T) { }) sessions = NewSessionS(cfg, dm, connMgr) caches = engine.NewCacheS(cfg, dm, nil) - engine.SetCache(caches) + engine.Cache = caches args = NewV1TerminateSessionArgs(true, false, false, nil, false, nil, cgrEvent, true) expected = "RALS_ERROR:NOT_IMPLEMENTED" if err := sessions.BiRPCv1TerminateSession(nil, args, &reply); err == nil || err.Error() != expected { @@ -3491,7 +3491,7 @@ func TestBiRPCv1ProcessCDR(t *testing.T) { value := &utils.CachedRPCResponse{ Result: utils.StringPointer("ROUTE_LEASTCOST_1"), } - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1ProcessCDR, cgrEvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1ProcessCDR(nil, cgrEvent, &reply); err != nil { @@ -3569,7 +3569,7 @@ func TestBiRPCv1ProcessMessage1(t *testing.T) { MaxUsage: utils.DurationPointer(time.Hour), }, } - engine.SetCache(caches) + engine.Cache = caches args = NewV1ProcessMessageArgs(true, []string{}, false, []string{}, false, []string{}, true, false, false, false, false, cgrEvent, utils.Paginator{}, false, "1") @@ -3781,7 +3781,7 @@ func TestBiRPCv1ProcessEvent(t *testing.T) { }, }, } - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1ProcessEvent, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err != nil { @@ -4241,7 +4241,7 @@ func TestBiRPCv1ProcessEventRals2(t *testing.T) { Replicate: true, } cacheS := engine.NewCacheS(cfg, nil, nil) - engine.SetCache(cacheS) + engine.Cache = cacheS engine.SetConnManager(connMgr) expected = "RALS_ERROR:NOT_IMPLEMENTED" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { @@ -4398,7 +4398,7 @@ func TestBiRPCv1GetCost(t *testing.T) { }, }, } - engine.SetCache(caches) + engine.Cache = caches engine.Cache.SetWithoutReplicate(utils.CacheRPCResponses, utils.ConcatenatedKey(utils.SessionSv1GetCost, args.CGREvent.ID), value, nil, true, utils.NonTransactional) if err := sessions.BiRPCv1GetCost(nil, args, &reply); err != nil { diff --git a/utils/consts.go b/utils/consts.go index 457b89a15..013b8b316 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -2111,7 +2111,8 @@ const ( RedisClientCertificate = "redis_client_certificate" RedisClientKey = "redis_client_key" RedisCACertificate = "redis_ca_certificate" - FilteredReplicationCfg = "filtered_replication" + ReplicationFilteredCfg = "replication_filtered" + ReplicationCache = "replication_cache" RemoteConnIDCfg = "remote_conn_id" ) @@ -2528,7 +2529,8 @@ var CGROptionsSet = NewStringSet([]string{OptsRatesStartTime, OptsRatesUsage, Op OptsDebitInterval, OptsStirATest, OptsStirPayloadMaxDuration, OptsStirIdentity, OptsStirOriginatorTn, OptsStirOriginatorURI, OptsStirDestinationTn, OptsStirDestinationURI, OptsStirPublicKeyPath, OptsStirPrivateKeyPath, OptsAPIKey, OptsRouteID, OptsContext, - OptsAttributesProcessRuns, OptsRoutesLimit, OptsRoutesOffset, OptsChargeable}) + OptsAttributesProcessRuns, OptsRoutesLimit, OptsRoutesOffset, OptsChargeable, + RemoteHostOpt, CacheOpt}) // EventExporter metrics const ( @@ -2608,6 +2610,7 @@ const ( SchedulerInit = "SchedulerInit" RemoteHostOpt = "*rmtHost" + CacheOpt = "*cache" ) // Event Flags diff --git a/utils/coreutils.go b/utils/coreutils.go index 77ca7a0c5..1258dc9b2 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -1049,3 +1049,22 @@ func (b *boolGen) RandomBool() bool { b.remaining-- return result } + +// GenerateDBItemOpts will create the options for DB replication +// if they are empty they should be omitted +func GenerateDBItemOpts(apiKey, routeID, cache, rmtHost string) (mp map[string]interface{}) { + mp = make(map[string]interface{}) + if apiKey != EmptyString { + mp[OptsAPIKey] = apiKey + } + if routeID != EmptyString { + mp[OptsRouteID] = routeID + } + if cache != EmptyString { + mp[CacheOpt] = cache + } + if rmtHost != EmptyString { + mp[RemoteHostOpt] = rmtHost + } + return +}