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

Replace RSRField from Filters with RSRParsers

Browse Source
This commit is contained in:
TeoV
2018-09-19 06:15:35 -04:00
committed by Dan Christian Bogos
parent a73e53c855
commit 9683c50db0
9 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/agentreq_test.go
View File

@@ -94,7 +94,7 @@ func TestAgReqAsNavigableMap(t *testing.T) {
"~*cgrep.MaxUsage{*duration_seconds}", true)},
&config.FCTemplate{Tag: "Error",
FieldId: "Error", Type: utils.META_COMPOSED,
Filters: []string{"*rsr::*cgrep.Error(!^$)"},
Filters: []string{"*rsr::~*cgrep.Error(!^$)"},
Value: config.NewRSRParsersMustCompile(
"~*cgrep.Error", true)},
}

8
config/rsrparser.go
View File

@@ -102,9 +102,9 @@ func (prsrs RSRParsers) ParseDataProvider(dP DataProvider, separator string) (ou
return
}
func (prsrs RSRParsers) ParseCDR(dP DataProvider) (out string, err error) {
func (prsrs RSRParsers) ParseDataProviderWithInterfaces(dP DataProvider, separator string) (out string, err error) {
for _, prsr := range prsrs {
if outPrsr, err := prsr.ParseCDR(dP); err != nil {
if outPrsr, err := prsr.ParseDataProviderWithInterfaces(dP, separator); err != nil {
return "", err
} else {
out += outPrsr
@@ -275,11 +275,11 @@ func (prsr *RSRParser) ParseDataProvider(dP DataProvider, separator string) (out
return prsr.ParseValue(outStr)
}
func (prsr *RSRParser) ParseCDR(dP DataProvider) (out string, err error) {
func (prsr *RSRParser) ParseDataProviderWithInterfaces(dP DataProvider, separator string) (out string, err error) {
var outStr interface{}
if prsr.attrValue == "" {
if outStr, err = dP.FieldAsInterface(
strings.Split(prsr.attrName, utils.NestingSep)); err != nil {
strings.Split(prsr.attrName, separator)); err != nil {
return
}
}

6
data/tariffplans/cluelrn/Attributes.csv
View File

@@ -1,8 +1,8 @@
#Tenant,ID,Contexts,FilterIDs,ActivationInterval,FieldName,Initial,Substitute,Append,Blocker,Weight
cgrates.org,LRN_Dst3125650565,lrn,*string:Destination:3125650565,,Destination,*any,13128543000,true,false,10
cgrates.org,LRN_Dst3125650565,,,,OriginalDestination,*any,3125650565,true,false,10
cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:Destination:13128543000;*rsr::OriginalDestination(!^$),,DestinationLATA,*any,358,true,false,20
cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:Account:9174269000;*rsr::DestinationLATA(!^$),,CallerLATA,*any,132,true,false,30
cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:Destination:13128543000;*rsr::~OriginalDestination(!^$),,DestinationLATA,*any,358,true,false,20
cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:Account:9174269000;*rsr::~DestinationLATA(!^$),,CallerLATA,*any,132,true,false,30
cgrates.org,LRN_JURISDICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,LRNJurisdiction,*any,INTRA,true,false,50
cgrates.org,LRN_JURISDICTION_IL,lrn,FLTR_INTRALATA_ILLINOIS,,LRNJurisdiction,*any,INTRA,true,false,50
cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:Destination:13128543000;*rsr::CallerLATA(!^$),,LRNJurisdiction,*any,INTER,true,false,40
cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:Destination:13128543000;*rsr::~CallerLATA(!^$),,LRNJurisdiction,*any,INTER,true,false,40
1 #Tenant ID Contexts FilterIDs ActivationInterval FieldName Initial Substitute Append Blocker Weight
2 cgrates.org LRN_Dst3125650565 lrn *string:Destination:3125650565 Destination *any 13128543000 true false 10
3 cgrates.org LRN_Dst3125650565 OriginalDestination *any 3125650565 true false 10
4 cgrates.org LRN_LATA_Dst13128543000 lrn *string:Destination:13128543000;*rsr::OriginalDestination(!^$) *string:Destination:13128543000;*rsr::~OriginalDestination(!^$) DestinationLATA *any 358 true false 20
5 cgrates.org LRN_LATA_Cli9174269000 lrn *string:Account:9174269000;*rsr::DestinationLATA(!^$) *string:Account:9174269000;*rsr::~DestinationLATA(!^$) CallerLATA *any 132 true false 30
6 cgrates.org LRN_JURISDICTION_NY lrn FLTR_INTRALATA_NEWYORK LRNJurisdiction *any INTRA true false 50
7 cgrates.org LRN_JURISDICTION_IL lrn FLTR_INTRALATA_ILLINOIS LRNJurisdiction *any INTRA true false 50
8 cgrates.org LRN_JURISDICTION_INTER lrn *string:Destination:13128543000;*rsr::CallerLATA(!^$) *string:Destination:13128543000;*rsr::~CallerLATA(!^$) LRNJurisdiction *any INTER true false 40

2
data/tariffplans/oldtutorial/Filters.csv
View File

@@ -1,7 +1,7 @@
#Tenant[0],ID[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5]
cgrates.org,FLTR_1,*string,Account,1001;1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_1,*prefix,Destination,10;20,
cgrates.org,FLTR_1,*rsr,,Subject(~^1.*1$);Destination(1002),
cgrates.org,FLTR_1,*rsr,,~Subject(~^1.*1$);~Destination(1002),
cgrates.org,FLTR_ACNT_1007,*string,Account,1007,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_dan,*string,Account,dan,2014-07-29T15:00:00Z
cgrates.org,FLTR_DST_DE,*destinations,Destination,DST_DE_MOBILE,2014-07-29T15:00:00Z
1 #Tenant[0] ID[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5]
2 cgrates.org FLTR_1 *string Account 1001;1002 2014-07-29T15:00:00Z
3 cgrates.org FLTR_1 *prefix Destination 10;20
4 cgrates.org FLTR_1 *rsr Subject(~^1.*1$);Destination(1002) ~Subject(~^1.*1$);~Destination(1002)
5 cgrates.org FLTR_ACNT_1007 *string Account 1007 2014-07-29T15:00:00Z
6 cgrates.org FLTR_ACNT_dan *string Account dan 2014-07-29T15:00:00Z
7 cgrates.org FLTR_DST_DE *destinations Destination DST_DE_MOBILE 2014-07-29T15:00:00Z

2
data/tariffplans/testit/Filters.csv
View File

@@ -3,7 +3,7 @@ cgrates.org,FLTR_ACCOUNT_1001,*string,Account,1001,2014-07-29T15:00:00Z
cgrates.org,FLTR_DST_DE,*destinations,Destination,DST_DE_MOBILE,2014-07-29T15:00:00Z
cgrates.org,FLTR_1,*string,Account,1003;1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_1,*prefix,Destination,10;20,
cgrates.org,FLTR_1,*rsr,,Subject(~^1.*1$);Destination(1002),
cgrates.org,FLTR_1,*rsr,,~Subject(~^1.*1$);~Destination(1002),
cgrates.org,FLTR_ACNT_1007,*string,Account,1007,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_dan,*string,Account,dan,2014-07-29T15:00:00Z
cgrates.org,FLTR_SPP_ACNT_dan,*string,*req.Account,dan,2014-07-29T15:00:00Z
1 #Tenant[0] ID[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5]
3 cgrates.org FLTR_DST_DE *destinations Destination DST_DE_MOBILE 2014-07-29T15:00:00Z
4 cgrates.org FLTR_1 *string Account 1003;1002 2014-07-29T15:00:00Z
5 cgrates.org FLTR_1 *prefix Destination 10;20
6 cgrates.org FLTR_1 *rsr Subject(~^1.*1$);Destination(1002) ~Subject(~^1.*1$);~Destination(1002)
7 cgrates.org FLTR_ACNT_1007 *string Account 1007 2014-07-29T15:00:00Z
8 cgrates.org FLTR_ACNT_dan *string Account dan 2014-07-29T15:00:00Z
9 cgrates.org FLTR_SPP_ACNT_dan *string *req.Account dan 2014-07-29T15:00:00Z

2
data/tariffplans/testtp/Filters.csv
View File

@@ -1,7 +1,7 @@
#Tenant[0],ID[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5]
cgrates.org,FLTR_1,*string,Account,1001;1002,2014-07-29T15:00:00Z
cgrates.org,FLTR_1,*prefix,Destination,10;20,
cgrates.org,FLTR_1,*rsr,,Subject(~^1.*1$);Destination(1002),
cgrates.org,FLTR_1,*rsr,,~Subject(~^1.*1$);~Destination(1002),
cgrates.org,FLTR_ACNT_1007,*string,Account,1007,2014-07-29T15:00:00Z
cgrates.org,FLTR_ACNT_dan,*string,Account,dan,2014-07-29T15:00:00Z
cgrates.org,FLTR_DST_DE,*destinations,Destination,DST_DE,2014-07-29T15:00:00Z
1 #Tenant[0] ID[1] FilterType[2] FilterFieldName[3] FilterFieldValues[4] ActivationInterval[5]
2 cgrates.org FLTR_1 *string Account 1001;1002 2014-07-29T15:00:00Z
3 cgrates.org FLTR_1 *prefix Destination 10;20
4 cgrates.org FLTR_1 *rsr Subject(~^1.*1$);Destination(1002) ~Subject(~^1.*1$);~Destination(1002)
5 cgrates.org FLTR_ACNT_1007 *string Account 1007 2014-07-29T15:00:00Z
6 cgrates.org FLTR_ACNT_dan *string Account dan 2014-07-29T15:00:00Z
7 cgrates.org FLTR_DST_DE *destinations Destination DST_DE 2014-07-29T15:00:00Z

4
engine/cdr.go
View File

@@ -155,7 +155,7 @@ func (cdr *CDR) FormatCost(shiftDecimals, roundDecimals int) string {
// Used to retrieve fields as string, primary fields are const labeled
func (cdr *CDR) FieldAsString(rsrPrs *config.RSRParser) (parsed string, err error) {
parsed, err = rsrPrs.ParseCDR(config.NewNavigableMap(cdr.AsMapStringIface()))
parsed, err = rsrPrs.ParseDataProviderWithInterfaces(config.NewNavigableMap(cdr.AsMapStringIface()), utils.NestingSep)
if err != nil {
return
}
@@ -164,7 +164,7 @@ func (cdr *CDR) FieldAsString(rsrPrs *config.RSRParser) (parsed string, err erro
// concatenates values of multiple fields defined in template, used eg in CDR templates
func (cdr *CDR) FieldsAsString(rsrFlds config.RSRParsers) string {
outVal, err := rsrFlds.ParseCDR(config.NewNavigableMap(cdr.AsMapStringIface()))
outVal, err := rsrFlds.ParseDataProviderWithInterfaces(config.NewNavigableMap(cdr.AsMapStringIface()), utils.NestingSep)
if err != nil {
return ""
}

21
engine/filters.go
View File

@@ -180,14 +180,14 @@ type FilterRule struct {
Type string // Filter type (*string, *timing, *rsr_filters, *stats, *lt, *lte, *gt, *gte)
FieldName string // Name of the field providing us the Values to check (used in case of some )
Values []string // Filter definition
rsrFields utils.RSRFields // Cache here the RSRFilter Values
rsrFields config.RSRParsers // Cache here the RSRFilter Values
statSThresholds []*RFStatSThreshold // Cached compiled RFStatsThreshold out of Values
}
// Separate method to compile RSR fields
func (rf *FilterRule) CompileValues() (err error) {
if rf.Type == MetaRSR {
if rf.rsrFields, err = utils.ParseRSRFieldsFromSlice(rf.Values); err != nil {
if rf.rsrFields, err = config.NewRSRParsersFromSlice(rf.Values, true); err != nil {
return
}
} else if rf.Type == MetaStatS {
@@ -297,19 +297,14 @@ func (fltr *FilterRule) passDestinations(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passRSR(dP config.DataProvider) (bool, error) {
for _, rsrFld := range fltr.rsrFields {
fldIface, err := dP.FieldAsInterface(strings.Split(rsrFld.Id, utils.NestingSep))
if err != nil {
if err == utils.ErrNotFound {
return false, nil
}
return false, err
}
if _, err := rsrFld.Parse(fldIface); err == nil {
return true, nil
_, err := fltr.rsrFields.ParseDataProviderWithInterfaces(dP, utils.NestingSep)
if err != nil {
if err == utils.ErrNotFound || err == utils.ErrFilterNotPassingNoCaps {
return false, nil
}
return false, err
}
return false, nil
return true, nil
}
func (fltr *FilterRule) passStatS(dP config.DataProvider,

18
engine/filters_test.go
View File

@@ -90,7 +90,7 @@ func TestFilterPassRSRFields(t *testing.T) {
TimeEnd: time.Date(2013, time.October, 7, 14, 52, 12, 0, time.UTC),
DurationIndex: 132 * time.Second,
ExtraFields: map[string]string{"navigation": "off"}}
rf, err := NewFilterRule(MetaRSR, "", []string{"Tenant(~^cgr.*\\.org$)"})
rf, err := NewFilterRule(MetaRSR, "", []string{"~Tenant(~^cgr.*\\.org$)"})
if err != nil {
t.Error(err)
}
@@ -99,7 +99,7 @@ func TestFilterPassRSRFields(t *testing.T) {
} else if !passes {
t.Error("Not passing")
}
rf, err = NewFilterRule(MetaRSR, "", []string{"navigation(on)"})
rf, err = NewFilterRule(MetaRSR, "", []string{"~navigation(on)"})
if err != nil {
t.Error(err)
}
@@ -108,7 +108,7 @@ func TestFilterPassRSRFields(t *testing.T) {
} else if passes {
t.Error("Passing")
}
rf, err = NewFilterRule(MetaRSR, "", []string{"navigation(off)"})
rf, err = NewFilterRule(MetaRSR, "", []string{"~navigation(off)"})
if err != nil {
t.Error(err)
}
@@ -328,13 +328,13 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
"Tenant": "cgrates.org",
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Tenant(~^cgr.*\\.org$)"}, config.NewNavigableMap(failEvent)); err != nil {
[]string{"*rsr::~Tenant(~^cgr.*\\.org$)"}, config.NewNavigableMap(failEvent)); err != nil {
t.Errorf(err.Error())
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Tenant(~^cgr.*\\.org$)"}, config.NewNavigableMap(passEvent)); err != nil {
[]string{"*rsr::~Tenant(~^cgr.*\\.org$)"}, config.NewNavigableMap(passEvent)); err != nil {
t.Errorf(err.Error())
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
@@ -415,7 +415,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
"Test": "MultipleCharacter",
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Test(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
[]string{"*rsr::~Test(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
t.Errorf(err.Error())
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
@@ -424,7 +424,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
"Test": "MultipleCharacter123456789MoreThan30Character",
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Test(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
[]string{"*rsr::~Test(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
t.Errorf(err.Error())
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
@@ -436,7 +436,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
},
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Test.Test2(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
[]string{"*rsr::~Test.Test2(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
t.Errorf(err.Error())
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
@@ -447,7 +447,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
},
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::Test.Test2(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
[]string{"*rsr::~Test.Test2(~^\\w{30,})"}, config.NewNavigableMap(ev)); err != nil {
t.Errorf(err.Error())
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)