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

Caching StatQueueProfile and StatQueue and upadte tests

Browse Source
This commit is contained in:
TeoV
2017-11-08 16:00:58 +02:00
committed by DanB
parent 7d82717aac
commit bdbabf3a24
6 changed files with 211 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apier/v1/smgenericv1_it_test.go
View File

@@ -102,8 +102,8 @@ func TestSMGV1CacheStats(t *testing.T) {
var rcvStats *utils.CacheStats
expectedStats := &utils.CacheStats{Destinations: 5, ReverseDestinations: 7, RatingPlans: 4, RatingProfiles: 10,
Actions: 9, ActionPlans: 4, AccountActionPlans: 5, SharedGroups: 1, DerivedChargers: 1,
LcrProfiles: 5, CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 0,
StatQueueProfiles: 0, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
LcrProfiles: 5, CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 1,
StatQueueProfiles: 1, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
var args utils.AttrCacheStats
if err := smgV1Rpc.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil {
t.Error("Got error on ApierV1.GetCacheStats: ", err.Error())

6
engine/datamanager.go
View File

@@ -203,6 +203,12 @@ func (dm *DataManager) CacheDataFromDB(prfx string, ids []string, mustBeCached b
case utils.ResourcesPrefix:
tntID := utils.NewTenantID(dataID)
_, err = dm.GetResource(tntID.Tenant, tntID.ID, true, utils.NonTransactional)
case utils.StatQueueProfilePrefix:
tntID := utils.NewTenantID(dataID)
_, err = dm.GetStatQueueProfile(tntID.Tenant, tntID.ID, true, utils.NonTransactional)
case utils.StatQueuePrefix:
tntID := utils.NewTenantID(dataID)
_, err = dm.GetStatQueue(tntID.Tenant, tntID.ID, true, utils.NonTransactional)
case utils.TimingsPrefix:
_, err = dm.GetTiming(dataID, true, utils.NonTransactional)
case utils.ThresholdProfilePrefix:

199
engine/onstor_it_test.go
View File

@@ -63,7 +63,12 @@ var sTestsOnStorIT = []func(t *testing.T){
testOnStorITCacheReverseAlias,
testOnStorITCacheResource,
testOnStorITCacheResourceProfile,
testOnStorITCacheStatQueueProfile,
testOnStorITCacheStatQueue,
testOnStorITCacheThresholdProfile,
testOnStorITCacheThreshold,
testOnStorITCacheTiming,
testOnStorITCacheFilter,
// ToDo: test cache flush for a prefix
// ToDo: testOnStorITLoadAccountingCache
testOnStorITHasData,
@@ -140,6 +145,7 @@ func testOnStorITFlush(t *testing.T) {
}
cache.Flush()
}
func testOnStorITIsDBEmpty(t *testing.T) {
test, err := onStor.DataDB().IsDBEmpty()
if err != nil {
@@ -147,7 +153,6 @@ func testOnStorITIsDBEmpty(t *testing.T) {
} else if test != true {
t.Errorf("\nExpecting: true got :%+v", test)
}
}
func testOnStorITSetGetDerivedCharges(t *testing.T) {
@@ -896,7 +901,199 @@ func testOnStorITCacheResource(t *testing.T) {
} else if rcv := itm.(*Resource); !reflect.DeepEqual(res, rcv) {
t.Errorf("Expecting: %+v, received: %+v", res, rcv)
}
}
func testOnStorITCacheStatQueueProfile(t *testing.T) {
statProfile := &StatQueueProfile{
Tenant: "cgrates.org",
ID: "Test_Stat_Cache",
FilterIDs: []string{"FLTR_1"},
ActivationInterval: &utils.ActivationInterval{
ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
ExpiryTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
},
QueueLength: 10,
TTL: time.Duration(10) * time.Second,
Metrics: []string{"ASR"},
Thresholds: []string{"Th1"},
Blocker: true,
Stored: true,
Weight: 20,
MinItems: 1,
}
if err := onStor.SetStatQueueProfile(statProfile); err != nil {
t.Error(err)
}
expectedR := []string{"sqp_cgrates.org:Test_Stat_Cache"}
if itm, err := onStor.DataDB().GetKeysForPrefix(utils.StatQueueProfilePrefix); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedR, itm) {
t.Errorf("Expected : %+v, but received %+v", expectedR, itm)
}
if _, hasIt := cache.Get(utils.StatQueueProfilePrefix + statProfile.TenantID()); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.StatQueueProfilePrefix, []string{statProfile.TenantID()}, false); err != nil {
t.Error(err)
}
if itm, hasIt := cache.Get(utils.StatQueueProfilePrefix + statProfile.TenantID()); !hasIt {
t.Error("Did not cache")
} else if rcv := itm.(*StatQueueProfile); !reflect.DeepEqual(statProfile, rcv) {
t.Errorf("Expecting: %+v, received: %+v", statProfile, rcv)
}
}
func testOnStorITCacheStatQueue(t *testing.T) {
eTime := utils.TimePointer(time.Date(2013, 10, 1, 0, 0, 0, 0, time.UTC).Local())
sq := &StatQueue{
Tenant: "cgrates.org",
ID: "Test_StatQueue_Cache",
SQItems: []struct {
EventID string // Bounded to the original StatEvent
ExpiryTime *time.Time // Used to auto-expire events
}{{EventID: "cgrates.org:ev1", ExpiryTime: eTime},
{EventID: "cgrates.org:ev2", ExpiryTime: eTime},
{EventID: "cgrates.org:ev3", ExpiryTime: eTime}},
SQMetrics: map[string]StatMetric{
utils.MetaASR: &StatASR{
Answered: 2,
Count: 3,
Events: map[string]bool{
"cgrates.org:ev1": true,
"cgrates.org:ev2": true,
"cgrates.org:ev3": false,
},
},
},
}
if err := onStor.SetStatQueue(sq); err != nil {
t.Error(err)
}
expectedT := []string{"stq_cgrates.org:Test_StatQueue_Cache"}
if itm, err := onStor.DataDB().GetKeysForPrefix(utils.StatQueuePrefix); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedT, itm) {
t.Errorf("Expected : %+v, but received %+v", expectedT, itm)
}
if _, hasIt := cache.Get(utils.StatQueuePrefix + sq.TenantID()); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.StatQueuePrefix, []string{sq.TenantID()}, false); err != nil {
t.Error(err)
}
if itm, hasIt := cache.Get(utils.StatQueuePrefix + sq.TenantID()); !hasIt {
t.Error("Did not cache")
} else if rcv := itm.(*StatQueue); !reflect.DeepEqual(sq, rcv) {
t.Errorf("Expecting: %+v, received: %+v", sq, rcv)
}
}
func testOnStorITCacheThresholdProfile(t *testing.T) {
tPrfl := &ThresholdProfile{
Tenant: "cgrates.org",
ID: "Test_Threshold_Cache",
FilterIDs: []string{"FilterID1", "FilterID2"},
ActivationInterval: &utils.ActivationInterval{
ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
ExpiryTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
},
Recurrent: true,
MinSleep: time.Duration(5 * time.Minute),
Blocker: false,
Weight: 20.0,
ActionIDs: []string{"ACT_1", "ACT_2"},
Async: true,
}
if err := onStor.SetThresholdProfile(tPrfl); err != nil {
t.Error(err)
}
expectedR := []string{"thp_cgrates.org:Test_Threshold_Cache"}
if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ThresholdProfilePrefix); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedR, itm) {
t.Errorf("Expected : %+v, but received %+v", expectedR, itm)
}
if _, hasIt := cache.Get(utils.ThresholdProfilePrefix + tPrfl.TenantID()); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.ThresholdProfilePrefix, []string{tPrfl.TenantID()}, false); err != nil {
t.Error(err)
}
if itm, hasIt := cache.Get(utils.ThresholdProfilePrefix + tPrfl.TenantID()); !hasIt {
t.Error("Did not cache")
} else if rcv := itm.(*ThresholdProfile); !reflect.DeepEqual(tPrfl, rcv) {
t.Errorf("Expecting: %+v, received: %+v", tPrfl, rcv)
}
}
func testOnStorITCacheThreshold(t *testing.T) {
th := &Threshold{
Tenant: "cgrates.org",
ID: "Test_Th_Cache",
Hits: 2,
Snooze: time.Date(2013, 10, 1, 0, 0, 0, 0, time.UTC).Local(),
}
if err := onStor.SetThreshold(th); err != nil {
t.Error(err)
}
expectedT := []string{"thd_cgrates.org:Test_Th_Cache"}
if itm, err := onStor.DataDB().GetKeysForPrefix(utils.ThresholdPrefix); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedT, itm) {
t.Errorf("Expected : %+v, but received %+v", expectedT, itm)
}
if _, hasIt := cache.Get(utils.ThresholdPrefix + th.TenantID()); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.ThresholdPrefix, []string{th.TenantID()}, false); err != nil {
t.Error(err)
}
if itm, hasIt := cache.Get(utils.ThresholdPrefix + th.TenantID()); !hasIt {
t.Error("Did not cache")
} else if rcv := itm.(*Threshold); !reflect.DeepEqual(th, rcv) {
t.Errorf("Expecting: %+v, received: %+v", th, rcv)
}
}
func testOnStorITCacheFilter(t *testing.T) {
filter := &Filter{
Tenant: "cgrates.org",
ID: "Filter1",
RequestFilters: []*RequestFilter{
&RequestFilter{
FieldName: "*string",
Type: "Account",
Values: []string{"1001", "1002"},
},
},
ActivationInterval: &utils.ActivationInterval{
ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
ExpiryTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC).Local(),
},
}
if err := onStor.SetFilter(filter); err != nil {
t.Error(err)
}
expectedT := []string{"ftr_cgrates.org:Filter1"}
if itm, err := onStor.DataDB().GetKeysForPrefix(utils.FilterPrefix); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedT, itm) {
t.Errorf("Expected : %+v, but received %+v", expectedT, itm)
}
if _, hasIt := cache.Get(utils.FilterPrefix + filter.TenantID()); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.FilterPrefix, []string{filter.TenantID()}, false); err != nil {
t.Error(err)
}
if itm, hasIt := cache.Get(utils.FilterPrefix + filter.TenantID()); !hasIt {
t.Error("Did not cache")
} else if rcv := itm.(*Filter); !reflect.DeepEqual(filter, rcv) {
t.Errorf("Expecting: %+v, received: %+v", filter, rcv)
}
}
func testOnStorITHasData(t *testing.T) {

3
engine/storage_redis.go
View File

@@ -1371,8 +1371,7 @@ func (rs *RedisStorage) GetStatQueueProfileDrv(tenant string, id string) (sq *St
// SetStatsQueueDrv stores a StatsQueue into DataDB
func (rs *RedisStorage) SetStatQueueProfileDrv(sq *StatQueueProfile) (err error) {
var result []byte
result, err = rs.ms.Marshal(sq)
result, err := rs.ms.Marshal(sq)
if err != nil {
return
}

4
general_tests/tut_smgeneric_it_test.go
View File

@@ -100,8 +100,8 @@ func TestTutSMGCacheStats(t *testing.T) {
var rcvStats *utils.CacheStats
expectedStats := &utils.CacheStats{Destinations: 5, ReverseDestinations: 7, RatingPlans: 4, RatingProfiles: 10,
Actions: 9, ActionPlans: 4, AccountActionPlans: 5, SharedGroups: 1, DerivedChargers: 1, LcrProfiles: 5,
CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 0,
StatQueueProfiles: 0, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 1,
StatQueueProfiles: 1, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
var args utils.AttrCacheStats
if err := tutSMGRpc.Call("ApierV2.GetCacheStats", args, &rcvStats); err != nil {
t.Error("Got error on ApierV2.GetCacheStats: ", err.Error())

4
general_tests/tutorial_it_test.go
View File

@@ -104,8 +104,8 @@ func TestTutITCacheStats(t *testing.T) {
var rcvStats *utils.CacheStats
expectedStats := &utils.CacheStats{Destinations: 5, ReverseDestinations: 7, RatingPlans: 4, RatingProfiles: 10,
Actions: 9, ActionPlans: 4, AccountActionPlans: 5, SharedGroups: 1, DerivedChargers: 1, LcrProfiles: 5,
CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 0,
StatQueueProfiles: 0, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
CdrStats: 6, Users: 3, Aliases: 1, ReverseAliases: 2, ResourceProfiles: 3, Resources: 3, StatQueues: 1,
StatQueueProfiles: 1, Thresholds: 7, ThresholdProfiles: 7, Filters: 15}
var args utils.AttrCacheStats
if err := tutLocalRpc.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil {
t.Error("Got error on ApierV1.GetCacheStats: ", err.Error())