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

Adding *resources type for FilterS

Browse Source
This commit is contained in:
TeoV
2019-02-25 19:32:59 +02:00
committed by Dan Christian Bogos
parent a37cd65587
commit 2360aee3d1
4 changed files with 186 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
engine/filters.go
View File

@@ -481,7 +481,7 @@ func (fltr *FilterRule) passStatS(dP config.DataProvider,
for key, val := range statValues {
ifaceStatValues[key] = val
}
//convert convert into a NavigableMap so we can send it to passGreaterThan
//convert ifaceStatValues into a NavigableMap so we can send it to passGreaterThan
nM := config.NewNavigableMap(ifaceStatValues)
//split the type in exact 2 parts
//special cases like *gt#sum#Usage
@@ -538,17 +538,30 @@ func (fltr *FilterRule) passResourceS(dP config.DataProvider,
if resourceS == nil || reflect.ValueOf(resourceS).IsNil() {
return false, errors.New("Missing ResourceS information")
}
// for _, resItem := range fltr.resourceItems {
// //take total usage for resource
// //compose the newFilter
// //send it to passGreaterThan
// // if val, err := fltr.passGreaterThan(nM); err != nil || !val {
// // //in case of error return false and error
// // //and in case of not pass return false and nil
// // return false, err
// // }
// }
for _, resItem := range fltr.resourceItems {
//take total usage for resource
var reply *Resource
if err := resourceS.Call(utils.ApierV1GetResource,
&utils.TenantID{Tenant: tenant, ID: resItem.ItemID}, &reply); err != nil {
return false, err
}
data := map[string]interface{}{
utils.Usage: reply.totalUsage(),
}
//convert data into a NavigableMap so we can send it to passGreaterThan
nM := config.NewNavigableMap(data)
//compose the newFilter
fltr, err := NewFilterRule(resItem.FilterType,
utils.Usage, []string{resItem.FilterValue})
if err != nil {
return false, err
}
// send it to passGreaterThan
if val, err := fltr.passGreaterThan(nM); err != nil || !val {
//in case of error return false and error
//and in case of not pass return false and nil
return false, err
}
}
return true, nil
}