uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 14:19:54 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests of cache

Browse Source
This commit is contained in:
adi
2022-09-19 16:21:50 +03:00
committed by Dan Christian Bogos
parent 7c18d51581
commit fe3d34639a
43 changed files with 292 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/caps_test.go
View File

@@ -140,7 +140,7 @@ func TestCapsStatsGetAverageOnEvict(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.CacheCfg().Partitions[utils.CacheCapsEvents] = &config.CacheParamCfg{Limit: 2}
tmp := Cache
Cache = NewCacheS(cfg, nil, cs)
Cache = NewCacheS(cfg, nil, nil, cs)
cs.addSample("1", 10)
expAvg := 10.

66
engine/cdrs_test.go
View File

@@ -334,7 +334,7 @@ func TestCDRsAttrSProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -411,7 +411,7 @@ func TestCDRsAttrSProcessEventMockNotFoundErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -490,7 +490,7 @@ func TestCDRsAttrSProcessEventMockNotEmptyAF(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -655,7 +655,7 @@ func TestCDRsRateProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -731,7 +731,7 @@ func TestCDRsAccountProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -809,7 +809,7 @@ func TestCDRsThdSProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -879,7 +879,7 @@ func TestCDRsThdSProcessEventMockNotfound(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -948,7 +948,7 @@ func TestCDRsStatSProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1018,7 +1018,7 @@ func TestCDRsEESProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1092,7 +1092,7 @@ func TestCDRsProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1162,7 +1162,7 @@ func TestCDRsProcessEventMockSkipOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1251,7 +1251,7 @@ func TestCDRsProcessEventMockAttrsErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1312,7 +1312,7 @@ func TestCDRsProcessEventMockAttrsErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1373,7 +1373,7 @@ func TestCDRsProcessEventMockChrgsErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1435,7 +1435,7 @@ func TestCDRsProcessEventMockChrgsErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1497,7 +1497,7 @@ func TestCDRsProcessEventMockRateSErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1559,7 +1559,7 @@ func TestCDRsProcessEventMockRateSErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1621,7 +1621,7 @@ func TestCDRsProcessEventMockAcntsErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1683,7 +1683,7 @@ func TestCDRsProcessEventMockAcntsErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1746,7 +1746,7 @@ func TestCDRsProcessEventMockExportErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1808,7 +1808,7 @@ func TestCDRsProcessEventMockExportErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1870,7 +1870,7 @@ func TestCDRsProcessEventMockThdsErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1932,7 +1932,7 @@ func TestCDRsProcessEventMockThdsErrBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -1994,7 +1994,7 @@ func TestCDRsProcessEventMockStatsErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2056,7 +2056,7 @@ func TestCDRsProcessEventMockStatsErrGetBoolOpts(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2113,7 +2113,7 @@ func TestCDRsV1ProcessEventMock(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2189,7 +2189,7 @@ func TestCDRsV1ProcessEventMockErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2268,7 +2268,7 @@ func TestCDRsV1ProcessEventMockCache(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2349,7 +2349,7 @@ func TestCDRsV1ProcessEventWithGetMockCache(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2429,7 +2429,7 @@ func TestCDRsV1ProcessEventWithGetMockCacheErr(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2492,7 +2492,7 @@ func TestCDRsChrgrSProcessEventEmptyChrgrs(t *testing.T) {
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2545,7 +2545,7 @@ func TestCDRsV1ProcessEventCacheGet(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, nil)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -2592,7 +2592,7 @@ func TestCDRsV1ProcessEventWithGetCacheGet(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, nil)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",

6
engine/connmanager_test.go
View File

@@ -47,7 +47,7 @@ func TestCMgetConnNotFound(t *testing.T) {
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, cfg.CacheCfg(), cM)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
Cache.SetWithoutReplicate(utils.CacheRPCConnections, connID, nil, nil, true, utils.NonTransactional)
experr := utils.ErrNotFound
@@ -358,7 +358,7 @@ func TestCMCallErrgetConn(t *testing.T) {
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, cfg.CacheCfg(), cM)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
Cache.SetWithoutReplicate(utils.CacheRPCConnections, connID, nil, nil, true, utils.NonTransactional)
experr := utils.ErrNotFound
@@ -538,7 +538,7 @@ func TestCMReload(t *testing.T) {
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, cfg.CacheCfg(), cM)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
Cache.SetWithoutReplicate(utils.CacheRPCConnections, "itmID2",
"value of 2nd item", nil, true, utils.NonTransactional)

66
engine/stats_test.go
View File

@@ -706,7 +706,7 @@ func TestStatQueueMatchingStatQueuesForEventLocks(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.StatSCfg().StoreInterval = 1
@@ -759,7 +759,7 @@ func TestStatQueueMatchingStatQueuesForEventLocks2(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.StatSCfg().StoreInterval = 1
@@ -831,7 +831,7 @@ func TestStatQueueMatchingStatQueuesForEventLocksBlocker(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil,nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.StatSCfg().StoreInterval = 1
@@ -896,7 +896,7 @@ func TestStatQueueMatchingStatQueuesForEventLocks3(t *testing.T) {
prfs := make([]*StatQueueProfile, 0)
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := &DataDBMock{
GetStatQueueProfileDrvF: func(ctx *context.Context, tnt, id string) (*StatQueueProfile, error) {
if id == "STS1" {
@@ -950,7 +950,7 @@ func TestStatQueueMatchingStatQueuesForEventLocks4(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.StatSCfg().StoreInterval = 1
@@ -1194,7 +1194,7 @@ func TestStatQueueStoreStatQueueCacheSetErr(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
connMgr = NewConnManager(cfg)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, connMgr)
@@ -1368,7 +1368,7 @@ func TestStatQueueV1ProcessEventMissingArgs(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1462,7 +1462,7 @@ func TestStatQueueV1GetQueueIDsOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1548,7 +1548,7 @@ func TestStatQueueV1GetQueueIDsGetKeysForPrefixErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := &DataDBMock{}
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1570,7 +1570,7 @@ func TestStatQueueV1GetStatQueueOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1638,7 +1638,7 @@ func TestStatQueueV1GetStatQueueNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1663,7 +1663,7 @@ func TestStatQueueV1GetStatQueueMissingArgs(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1727,7 +1727,7 @@ func TestStatQueueV1GetStatQueuesForEventOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1808,7 +1808,7 @@ func TestStatQueueV1GetStatQueuesForEventNotFoundErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1861,7 +1861,7 @@ func TestStatQueueV1GetStatQueuesForEventMissingArgs(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -1935,7 +1935,7 @@ func TestStatQueueV1ResetStatQueueOK(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2030,7 +2030,7 @@ func TestStatQueueV1ResetStatQueueNotFoundErr(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2100,7 +2100,7 @@ func TestStatQueueV1ResetStatQueueMissingArgs(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2168,7 +2168,7 @@ func TestStatQueueV1ResetStatQueueUnsupportedMetricType(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2242,7 +2242,7 @@ func TestStatQueueProcessThresholdsOKNoThIDs(t *testing.T) {
cfg.StatSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2314,7 +2314,7 @@ func TestStatQueueProcessThresholdsOK(t *testing.T) {
cfg.StatSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2419,7 +2419,7 @@ func TestStatQueueProcessThresholdsErrPartExec(t *testing.T) {
cfg.StatSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -2505,7 +2505,7 @@ func TestStatQueueV1GetQueueFloatMetricsOK(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2578,7 +2578,7 @@ func TestStatQueueV1GetQueueFloatMetricsErrNotFound(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2646,7 +2646,7 @@ func TestStatQueueV1GetQueueFloatMetricsMissingArgs(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2712,7 +2712,7 @@ func TestStatQueueV1GetQueueFloatMetricsErrGetStats(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.StatSCfg().StoreInterval = 1
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
filterS := NewFilterS(cfg, nil, nil)
sS := NewStatService(nil, cfg, filterS, nil)
@@ -2735,7 +2735,7 @@ func TestStatQueueV1GetQueueStringMetricsOK(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2808,7 +2808,7 @@ func TestStatQueueV1GetQueueStringMetricsErrNotFound(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2874,7 +2874,7 @@ func TestStatQueueV1GetQueueStringMetricsMissingArgs(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -2940,7 +2940,7 @@ func TestStatQueueV1GetQueueStringMetricsErrGetStats(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.StatSCfg().StoreInterval = 1
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
filterS := NewFilterS(cfg, nil, nil)
sS := NewStatService(nil, cfg, filterS, nil)
@@ -2967,7 +2967,7 @@ func TestStatQueueStoreStatQueueStoreIntervalDisabled(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
connMgr = NewConnManager(cfg)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, connMgr)
@@ -2997,7 +2997,7 @@ func TestStatQueueGetStatQueueOK(t *testing.T) {
cfg.StatSCfg().StoreInterval = 1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)
@@ -3202,7 +3202,7 @@ func TestStatQueueV1GetStatQueuesForEventProfileIgnoreFilters(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
sS := NewStatService(dm, cfg, filterS, nil)

46
engine/thresholds_test.go
View File

@@ -1501,7 +1501,7 @@ func TestThresholdsProcessEventMaxHitsDMErr(t *testing.T) {
dm := NewDataManager(data, cfg.CacheCfg(), connMgr)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(nil, cfg, filterS, connMgr)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
defer func() {
connMgr = tmpCMgr
@@ -1627,7 +1627,7 @@ func TestThresholdsV1ProcessEventOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -1699,7 +1699,7 @@ func TestThresholdsV1ProcessEventPartExecErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -1765,7 +1765,7 @@ func TestThresholdsV1ProcessEventMissingArgs(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -1849,7 +1849,7 @@ func TestThresholdsV1GetThresholdOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -1902,7 +1902,7 @@ func TestThresholdsV1GetThresholdNotFoundErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -1937,7 +1937,7 @@ func TestThresholdMatchingThresholdForEventLocks(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.ThresholdSCfg().StoreInterval = 1
@@ -1997,7 +1997,7 @@ func TestThresholdMatchingThresholdForEventLocks2(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.ThresholdSCfg().StoreInterval = 1
@@ -2069,7 +2069,7 @@ func TestThresholdMatchingThresholdForEventLocksBlocker(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.ThresholdSCfg().StoreInterval = 1
@@ -2136,7 +2136,7 @@ func TestThresholdMatchingThresholdForEventLocks3(t *testing.T) {
prfs := make([]*ThresholdProfile, 0)
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := &DataDBMock{
GetThresholdProfileDrvF: func(ctx *context.Context, tnt, id string) (*ThresholdProfile, error) {
if id == "TH1" {
@@ -2192,7 +2192,7 @@ func TestThresholdMatchingThresholdForEventLocks4(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
tmp := Cache
defer func() { Cache = tmp }()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), nil)
cfg.ThresholdSCfg().StoreInterval = 1
@@ -2250,7 +2250,7 @@ func TestThresholdMatchingThresholdForEventLocks5(t *testing.T) {
Cache = tmp
config.SetCgrConfig(tmpC)
}()
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
db := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(db, config.CgrConfig().CacheCfg(), NewConnManager(cfg))
cfg.ThresholdSCfg().StoreInterval = 1
@@ -2430,7 +2430,7 @@ func TestThresholdsV1GetThresholdsForEventOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2486,7 +2486,7 @@ func TestThresholdsV1GetThresholdsForEventMissingArgs(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2552,7 +2552,7 @@ func TestThresholdsV1GetThresholdIDsOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2612,7 +2612,7 @@ func TestThresholdsV1GetThresholdIDsGetKeysForPrefixErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := &DataDBMock{}
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2634,7 +2634,7 @@ func TestThresholdsV1ResetThresholdOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2693,7 +2693,7 @@ func TestThresholdsV1ResetThresholdErrNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2744,7 +2744,7 @@ func TestThresholdsV1ResetThresholdNegativeStoreIntervalOK(t *testing.T) {
cfg.ThresholdSCfg().StoreInterval = -1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2799,7 +2799,7 @@ func TestThresholdsV1ResetThresholdNegativeStoreIntervalErr(t *testing.T) {
cfg.ThresholdSCfg().StoreInterval = -1
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(nil, cfg, filterS, nil)
@@ -2924,7 +2924,7 @@ func TestThresholdsMatchingThresholdsForEventNotFoundErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)
@@ -2980,7 +2980,7 @@ func TestThresholdsStoreThresholdCacheSetErr(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
connMgr = NewConnManager(cfg)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, connMgr)
@@ -3011,7 +3011,7 @@ func TestThreholdsMatchingThresholdsForEventDoesNotPass(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
tS := NewThresholdService(dm, cfg, filterS, nil)

12
engine/tpreader_test.go
View File

@@ -40,7 +40,7 @@ func TestTPReaderCallCacheNoCaching(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cM := NewConnManager(defaultCfg)
args := map[string][]string{
utils.CacheFilters: {"cgrates.org:FLTR_ID1", "cgrates.org:FLTR_ID2"},
@@ -67,7 +67,7 @@ func TestTPReaderCallCacheReloadCacheFirstCallErr(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cacheConns := []string{"cacheConn1"}
client := make(chan birpc.ClientConnector, 1)
mCC := &ccMock{
@@ -133,7 +133,7 @@ func TestTPReaderCallCacheReloadCacheSecondCallErr(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cacheConns := []string{"cacheConn1"}
client := make(chan birpc.ClientConnector, 1)
mCC := &ccMock{
@@ -214,7 +214,7 @@ func TestTPReaderCallCacheLoadCache(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cacheConns := []string{"cacheConn1"}
client := make(chan birpc.ClientConnector, 1)
mCC := &ccMock{
@@ -284,7 +284,7 @@ func TestTPReaderCallCacheRemoveItems(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cacheConns := []string{"cacheConn1"}
client := make(chan birpc.ClientConnector, 1)
mCC := &ccMock{
@@ -354,7 +354,7 @@ func TestTPReaderCallCacheClear(t *testing.T) {
}()
defaultCfg := config.NewDefaultCGRConfig()
Cache = NewCacheS(defaultCfg, nil, nil)
Cache = NewCacheS(defaultCfg, nil, nil, nil)
cacheConns := []string{"cacheConn1"}
client := make(chan birpc.ClientConnector, 1)
mCC := &ccMock{

18
engine/z_attributes_test.go
View File

@@ -4074,7 +4074,7 @@ func TestAttributesattributeProfileForEventNoDBConn(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
dataDB := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(dataDB, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := &AttributeS{
cfg: cfg,
dm: dm,
@@ -4155,7 +4155,7 @@ func TestAttributesattributeProfileForEventErrNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
dataDB := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(dataDB, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := &AttributeS{
cfg: cfg,
dm: dm,
@@ -4193,7 +4193,7 @@ func TestAttributesattributeProfileForEventErrPass(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
dataDB := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(dataDB, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := &AttributeS{
cfg: cfg,
dm: dm,
@@ -4378,7 +4378,7 @@ func TestAttributesV1ProcessEventMultipleRuns1(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
filterS := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := NewAttributeService(dm, filterS, cfg)
postpaid := config.NewRSRParsersMustCompile(utils.MetaPostpaid, utils.InfieldSep)
@@ -4488,7 +4488,7 @@ func TestAttributesV1ProcessEventMultipleRuns2(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
filterS := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := NewAttributeService(dm, filterS, cfg)
postpaid := config.NewRSRParsersMustCompile(utils.MetaPostpaid, utils.InfieldSep)
@@ -5269,7 +5269,7 @@ func TestAttributesAttributeServiceV1PrcssEvPrcssRunsGetIntOptsErr(t *testing.T)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
filterS := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := NewAttributeService(dm, filterS, cfg)
pw := config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep)
@@ -5321,7 +5321,7 @@ func TestAttributesAttributeServiceV1PrcssEvProfRunsGetIntOptsErr(t *testing.T)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
filterS := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
alS := NewAttributeService(dm, filterS, cfg)
pw := config.NewRSRParsersMustCompile("CGRateS.org", utils.InfieldSep)
@@ -5404,7 +5404,7 @@ func TestAttributesProcessEventPasswordAttribute(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
filterS := NewFilterS(cfg, nil, dm)
attrS := NewAttributeService(dm, filterS, cfg)
@@ -5510,7 +5510,7 @@ func TestAttributesSetAttributeProfilePasswordAttr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
value := config.NewRSRParsersMustCompile("abcd123", config.CgrConfig().GeneralCfg().RSRSep)
attrPrf := &AttributeProfile{

2
engine/z_loader_it_test.go
View File

@@ -103,7 +103,7 @@ func testLoaderITInitDataDB(t *testing.T) {
}
}
cacheChan := make(chan birpc.ClientConnector, 1)
srv, _ := birpc.NewServiceWithMethodsRename(NewCacheS(lCfg, dataDbCsv, nil), "", false, func(key string) (newKey string) {
srv, _ := birpc.NewServiceWithMethodsRename(NewCacheS(lCfg, dataDbCsv, nil, nil), "", false, func(key string) (newKey string) {
return strings.TrimPrefix(key, "V1")
})
cacheChan <- srv

96
engine/z_resources_test.go
View File

@@ -3098,7 +3098,7 @@ func TestResourcesStoreResourceErrCache(t *testing.T) {
config.SetCgrConfig(cfg)
dm := NewDataManager(NewInternalDB(nil, nil, cfg.DataDbCfg().Items), cfg.CacheCfg(), NewConnManager(cfg))
rS := NewResourceService(dm, cfg, nil, nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
r := &Resource{
Tenant: "cgrates.org",
ID: "RES1",
@@ -3176,7 +3176,7 @@ func TestResourcesProcessThresholdsOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.ResourceSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -3240,7 +3240,7 @@ func TestResourcesProcessThresholdsCallErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.ResourceSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
Cache = NewCacheS(cfg, nil, nil)
Cache = NewCacheS(cfg, nil, nil, nil)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
@@ -3462,7 +3462,7 @@ func TestResourcesV1ResourcesForEventOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
ID: "RES1",
@@ -3707,7 +3707,7 @@ func TestResourcesV1ResourcesForEventCacheReplyExists(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1GetResourcesForEvent,
utils.ConcatenatedKey("cgrates.org", "ResourcesForEventTest"))
rsPrf := &ResourceProfile{
@@ -3805,7 +3805,7 @@ func TestResourcesV1ResourcesForEventCacheReplySet(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1GetResourcesForEvent,
utils.ConcatenatedKey("cgrates.org", "ResourcesForEventTest"))
rsPrf := &ResourceProfile{
@@ -3907,7 +3907,7 @@ func TestResourcesV1GetResourceOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -3987,7 +3987,7 @@ func TestResourcesV1GetResourceNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4049,7 +4049,7 @@ func TestResourcesV1GetResourceMissingParameters(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4110,7 +4110,7 @@ func TestResourcesV1GetResourceWithConfigOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4193,7 +4193,7 @@ func TestResourcesV1GetResourceWithConfigNilrPrfOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4279,7 +4279,7 @@ func TestResourcesV1GetResourceWithConfigNilrPrfProfileNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4343,7 +4343,7 @@ func TestResourcesV1GetResourceWithConfigResourceNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4403,7 +4403,7 @@ func TestResourcesV1GetResourceWithConfigMissingParameters(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4462,7 +4462,7 @@ func TestResourcesV1AuthorizeResourcesOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4516,7 +4516,7 @@ func TestResourcesV1AuthorizeResourcesNotAuthorized(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4570,7 +4570,7 @@ func TestResourcesV1AuthorizeResourcesNoMatch(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4624,7 +4624,7 @@ func TestResourcesV1AuthorizeResourcesNilCGREvent(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4667,7 +4667,7 @@ func TestResourcesV1AuthorizeResourcesMissingUsageID(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4720,7 +4720,7 @@ func TestResourcesV1AuthorizeResourcesCacheReplyExists(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1AuthorizeResources,
utils.ConcatenatedKey("cgrates.org", "EventAuthorizeResource"))
@@ -4804,7 +4804,7 @@ func TestResourcesV1AuthorizeResourcesCacheReplySet(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1AuthorizeResources,
utils.ConcatenatedKey("cgrates.org", "EventAuthorizeResource"))
@@ -4890,7 +4890,7 @@ func TestResourcesV1AllocateResourcesOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4944,7 +4944,7 @@ func TestResourcesV1AllocateResourcesNoMatch(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -4997,7 +4997,7 @@ func TestResourcesV1AllocateResourcesMissingParameters(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5088,7 +5088,7 @@ func TestResourcesV1AllocateResourcesCacheReplyExists(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1AllocateResources,
utils.ConcatenatedKey("cgrates.org", "EventAllocateResource"))
@@ -5172,7 +5172,7 @@ func TestResourcesV1AllocateResourcesCacheReplySet(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1AllocateResources,
utils.ConcatenatedKey("cgrates.org", "EventAllocateResource"))
@@ -5258,7 +5258,7 @@ func TestResourcesV1AllocateResourcesResAllocErr(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5312,7 +5312,7 @@ func TestResourcesV1AllocateResourcesProcessThErr(t *testing.T) {
cfg.ResourceSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5397,7 +5397,7 @@ func TestResourcesV1ReleaseResourcesOK(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5456,7 +5456,7 @@ func TestResourcesV1ReleaseResourcesUsageNotFound(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5527,7 +5527,7 @@ func TestResourcesV1ReleaseResourcesNoMatch(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5580,7 +5580,7 @@ func TestResourcesV1ReleaseResourcesMissingParameters(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
rsPrf := &ResourceProfile{
Tenant: "cgrates.org",
@@ -5671,7 +5671,7 @@ func TestResourcesV1ReleaseResourcesCacheReplyExists(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1ReleaseResources,
utils.ConcatenatedKey("cgrates.org", "EventReleaseResource"))
@@ -5755,7 +5755,7 @@ func TestResourcesV1ReleaseResourcesCacheReplySet(t *testing.T) {
config.SetCgrConfig(cfg)
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
cacheKey := utils.ConcatenatedKey(utils.ResourceSv1ReleaseResources,
utils.ConcatenatedKey("cgrates.org", "EventReleaseResource"))
@@ -5843,7 +5843,7 @@ func TestResourcesV1ReleaseResourcesProcessThErr(t *testing.T) {
cfg.ResourceSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.ThresholdSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -6476,7 +6476,7 @@ func TestResourcesStartLoop(t *testing.T) {
// data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
// dm := NewDataManager(data, cfg.CacheCfg(), nil)
// connMgr = NewConnManager(cfg)
// Cache = NewCacheS(cfg, dm, nil)
// Cache = NewCacheS(cfg, dm, nil,nil)
// fltrs := NewFilterS(cfg, nil, dm)
@@ -6532,7 +6532,7 @@ func TestResourcesMatchingResourcesForEventCacheSetErr(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
connMgr = NewConnManager(cfg)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, connMgr)
@@ -6572,7 +6572,7 @@ func TestResourcesMatchingResourcesForEventFinalCacheSetErr(t *testing.T) {
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
connMgr = NewConnManager(cfg)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rsPrf := &ResourceProfile{
@@ -6643,7 +6643,7 @@ func TestResourcesV1ResourcesForEventErrRetrieveUsageID(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6680,7 +6680,7 @@ func TestResourcesV1ResourcesForEventErrRetrieveUsageTTL(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6717,7 +6717,7 @@ func TestResourcesV1AuthorizeResourcesErrRetrieveUsageID(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6754,7 +6754,7 @@ func TestResourcesV1AuthorizeResourcesErrRetrieveUnits(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6791,7 +6791,7 @@ func TestResourcesV1AuthorizeResourcesErrRetrieveUsageTTL(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6828,7 +6828,7 @@ func TestResourcesV1AllocateResourcesErrRetrieveUsageID(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6865,7 +6865,7 @@ func TestResourcesV1AllocateResourcesErrRetrieveUsageTTL(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6902,7 +6902,7 @@ func TestResourcesV1AllocateResourcesErrRetrieveUnits(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6939,7 +6939,7 @@ func TestResourcesV1ReleaseResourcesErrRetrieveUsageID(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)
@@ -6976,7 +6976,7 @@ func TestResourcesV1ReleaseResourcesErrRetrieveUsageTTL(t *testing.T) {
}
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
Cache = NewCacheS(cfg, dm, nil)
Cache = NewCacheS(cfg, dm, nil, nil)
fltrs := NewFilterS(cfg, nil, dm)
rS := NewResourceService(dm, cfg, fltrs, nil)