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

Loader for derived charging filters, using derived chargers filters within mediator and session manager, filter implementation inside StoredCdr

Browse Source
This commit is contained in:
DanB
2014-07-07 11:34:23 +02:00
parent 9b37e97cc2
commit 31b421c755
12 changed files with 93 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/storage/mysql/create_tariffplan_tables.sql
View File

@@ -246,7 +246,8 @@ CREATE TABLE tp_derived_chargers (
`category` varchar(16) NOT NULL,
`account` varchar(24) NOT NULL,
`subject` varchar(64) NOT NULL,
`runid_field` varchar(24) NOT NULL,
`run_id` varchar(24) NOT NULL,
`run_filter` varchar(24) NOT NULL,
`reqtype_field` varchar(24) NOT NULL,
`direction_field` varchar(24) NOT NULL,
`tenant_field` varchar(24) NOT NULL,

9
data/tariffplans/prepaid1centpsec/DerivedChargers.csv
View File

@@ -1,4 +1,5 @@
#Direction,Tenant,Tor,Account,Subject,RunId,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,DurationField
*out,cgrates.org,call,dan,dan,extra1,^prepaid,,,,^rif,^rif,,,,^1s
*out,cgrates.org,call,dan,dan,extra2,,,,,^ivo,^ivo,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,^rif2,^rif2,,,,
#Direction,Tenant,Tor,Account,Subject,RunId,RunFilter,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,DurationField
*out,cgrates.org,call,dan,dan,extra1,,^prepaid,,,,^rif,^rif,,,,^1s
*out,cgrates.org,call,dan,dan,extra2,,,,,,^ivo,^ivo,,,,
*out,cgrates.org,call,dan,dan,extra3,~filterhdr1:s/(.+)/special_run3/,,,,,^runusr3,^runusr3,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,,^rif2,^rif2,,,,
1 #Direction Tenant Tor Account Subject RunId RunFilter ReqTypeField DirectionField TenantField TorField AccountField SubjectField DestinationField SetupTimeField AnswerTimeField DurationField
2 *out cgrates.org call dan dan extra1 ^prepaid ^rif ^rif ^1s
3 *out cgrates.org call dan dan extra2 ^ivo ^ivo
4 *out cgrates.org call dan *any dan extra1 extra3 ~filterhdr1:s/(.+)/special_run3/ ^rif2 ^runusr3 ^rif2 ^runusr3
5 *out cgrates.org call dan *any extra1 ^rif2 ^rif2

4
data/tutorials/fs_json/cgrates/tariffplans/DerivedChargers.csv
View File

@@ -1,2 +1,2 @@
#Direction,Tenant,Category,Account,Subject,RunId,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,UsageField
*out,cgrates.org,call,1001,1001,fs_json_run,^rated,*default,*default,*default,*default,^1002,*default,*default,*default,*default
#Direction,Tenant,Category,Account,Subject,RunId,RunFilter,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,UsageField
*out,cgrates.org,call,1001,1001,fs_json_run,,^rated,*default,*default,*default,*default,^1002,*default,*default,*default,*default
1 #Direction Tenant Category Account Subject RunId RunFilter ReqTypeField DirectionField TenantField TorField AccountField SubjectField DestinationField SetupTimeField AnswerTimeField UsageField
2 *out cgrates.org call 1001 1001 fs_json_run ^rated *default *default *default *default ^1002 *default *default *default *default

42
engine/loader_csv.go
View File

@@ -842,16 +842,17 @@ func (csvr *CSVReader) LoadDerivedChargers() (err error) {
if found {
if csvr.derivedChargers[tag], err = csvr.derivedChargers[tag].Append(&utils.DerivedCharger{
RunId: ValueOrDefault(record[5], "*default"),
ReqTypeField: ValueOrDefault(record[6], "*default"),
DirectionField: ValueOrDefault(record[7], "*default"),
TenantField: ValueOrDefault(record[8], "*default"),
CategoryField: ValueOrDefault(record[9], "*default"),
AccountField: ValueOrDefault(record[10], "*default"),
SubjectField: ValueOrDefault(record[11], "*default"),
DestinationField: ValueOrDefault(record[12], "*default"),
SetupTimeField: ValueOrDefault(record[13], "*default"),
AnswerTimeField: ValueOrDefault(record[14], "*default"),
UsageField: ValueOrDefault(record[15], "*default"),
RunFilter: record[6],
ReqTypeField: ValueOrDefault(record[7], "*default"),
DirectionField: ValueOrDefault(record[8], "*default"),
TenantField: ValueOrDefault(record[9], "*default"),
CategoryField: ValueOrDefault(record[10], "*default"),
AccountField: ValueOrDefault(record[11], "*default"),
SubjectField: ValueOrDefault(record[12], "*default"),
DestinationField: ValueOrDefault(record[13], "*default"),
SetupTimeField: ValueOrDefault(record[14], "*default"),
AnswerTimeField: ValueOrDefault(record[15], "*default"),
UsageField: ValueOrDefault(record[16], "*default"),
}); err != nil {
return err
}
@@ -861,16 +862,17 @@ func (csvr *CSVReader) LoadDerivedChargers() (err error) {
}
csvr.derivedChargers[tag] = utils.DerivedChargers{&utils.DerivedCharger{
RunId: ValueOrDefault(record[5], "*default"),
ReqTypeField: ValueOrDefault(record[6], "*default"),
DirectionField: ValueOrDefault(record[7], "*default"),
TenantField: ValueOrDefault(record[8], "*default"),
CategoryField: ValueOrDefault(record[9], "*default"),
AccountField: ValueOrDefault(record[10], "*default"),
SubjectField: ValueOrDefault(record[11], "*default"),
DestinationField: ValueOrDefault(record[12], "*default"),
SetupTimeField: ValueOrDefault(record[13], "*default"),
AnswerTimeField: ValueOrDefault(record[14], "*default"),
UsageField: ValueOrDefault(record[15], "*default"),
RunFilter: record[6],
ReqTypeField: ValueOrDefault(record[7], "*default"),
DirectionField: ValueOrDefault(record[8], "*default"),
TenantField: ValueOrDefault(record[9], "*default"),
CategoryField: ValueOrDefault(record[10], "*default"),
AccountField: ValueOrDefault(record[11], "*default"),
SubjectField: ValueOrDefault(record[12], "*default"),
DestinationField: ValueOrDefault(record[13], "*default"),
SetupTimeField: ValueOrDefault(record[14], "*default"),
AnswerTimeField: ValueOrDefault(record[15], "*default"),
UsageField: ValueOrDefault(record[16], "*default"),
}}
}
}

13
engine/loader_csv_test.go
View File

@@ -177,10 +177,10 @@ vdf,emptyY,*out,TOPUP_EMPTY_AT,
`
derivedCharges = `
#Direction,Tenant,Category,Account,Subject,RunId,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,UsageField
*out,cgrates.org,call,dan,dan,extra1,^prepaid,,,,rif,rif,,,,
*out,cgrates.org,call,dan,dan,extra2,,,,,ivo,ivo,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,rif2,rif2,,,,
#Direction,Tenant,Category,Account,Subject,RunId,RunFilter,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,UsageField
*out,cgrates.org,call,dan,dan,extra1,^filteredHeader1/filterValue1,^prepaid,,,,rif,rif,,,,
*out,cgrates.org,call,dan,dan,extra2,,,,,,ivo,ivo,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,,rif2,rif2,,,,
`
)
@@ -932,8 +932,9 @@ func TestLoadDerivedChargers(t *testing.T) {
t.Error("Failed to load derivedChargers: ", csvr.derivedChargers)
}
expCharger1 := utils.DerivedChargers{
&utils.DerivedCharger{RunId: "extra1", ReqTypeField: "^prepaid", DirectionField: "*default", TenantField: "*default", CategoryField: "*default",
AccountField: "rif", SubjectField: "rif", DestinationField: "*default", SetupTimeField: "*default", AnswerTimeField: "*default", UsageField: "*default"},
&utils.DerivedCharger{RunId: "extra1", RunFilter: "^filteredHeader1/filterValue1", ReqTypeField: "^prepaid", DirectionField: "*default", TenantField: "*default",
CategoryField: "*default", AccountField: "rif", SubjectField: "rif", DestinationField: "*default",
SetupTimeField: "*default", AnswerTimeField: "*default", UsageField: "*default"},
&utils.DerivedCharger{RunId: "extra2", ReqTypeField: "*default", DirectionField: "*default", TenantField: "*default", CategoryField: "*default",
AccountField: "ivo", SubjectField: "ivo", DestinationField: "*default", SetupTimeField: "*default", AnswerTimeField: "*default", UsageField: "*default"},
}

4
engine/loader_helpers.go
View File

@@ -208,8 +208,8 @@ var FileValidators = map[string]*FileLineRegexValidator{
regexp.MustCompile(`(?:\w+\s*),(?:(\w+;?)+\s*),(?:\*out\s*),(?:\w+\s*),(?:\w+\s*)$`),
"Tenant([0-9A-Za-z_]),Account([0-9A-Za-z_.]),Direction(*out),ActionTimingsTag([0-9A-Za-z_]),ActionTriggersTag([0-9A-Za-z_])"},
utils.DERIVED_CHARGERS_CSV: &FileLineRegexValidator{utils.DERIVED_CHARGERS_NRCOLS,
regexp.MustCompile(`^(?:\*out),(?:[0-9A-Za-z_\.]+\s*),(?:\w+\s*),(?:\w+\s*),(?:\*any\s*|\w+\s*),(?:\w+\s*),(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?,(?:\*default\s*|\^*\w+\s*)?$`),
"Direction(*out),Tenant[0-9A-Za-z_],Category([0-9A-Za-z_]),Account[0-9A-Za-z_],Subject([0-9A-Za-z_]|*any),RunId([^0-9A-Za-z_]),ReqTypeField([^0-9A-Za-z_]|*default),DirectionField([^0-9A-Za-z_]|*default),TenantField([^0-9A-Za-z_]|*default),TorField([^0-9A-Za-z_]|*default),AccountField([^0-9A-Za-z_]|*default),SubjectField([^0-9A-Za-z_]|*default),DestinationField([^0-9A-Za-z_]|*default),SetupTimeField([^0-9A-Za-z_]|*default),AnswerTimeField([^0-9A-Za-z_]|*default),DurationField([^0-9A-Za-z_]|*default)"},
regexp.MustCompile(`^(?:\*out),(?:[0-9A-Za-z_\.]+\s*),(?:\w+\s*),(?:\w+\s*),(?:\*any\s*|\w+\s*),(?:\w+\s*),(?:[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?,(?:\*default\s*|[~^]*[0-9A-Za-z_/:().+]+\s*)?$`),
"Direction(*out),Tenant[0-9A-Za-z_],Category([0-9A-Za-z_]),Account[0-9A-Za-z_],Subject([0-9A-Za-z_]|*any),RunId([0-9A-Za-z_]),RunFilter([^~]*[0-9A-Za-z_/]),ReqTypeField([^~]*[0-9A-Za-z_/]|*default),DirectionField([^~]*[0-9A-Za-z_/]|*default),TenantField([^~]*[0-9A-Za-z_/]|*default),TorField([^~]*[0-9A-Za-z_/]|*default),AccountField([^~]*[0-9A-Za-z_/]|*default),SubjectField([^~]*[0-9A-Za-z_/]|*default),DestinationField([^~]*[0-9A-Za-z_/]|*default),SetupTimeField([^~]*[0-9A-Za-z_/]|*default),AnswerTimeField([^~]*[0-9A-Za-z_/]|*default),DurationField([^~]*[0-9A-Za-z_/]|*default)"},
}
func NewTPCSVFileParser(dirPath, fileName string) (*TPCSVFileParser, error) {

23
engine/loader_helpers_test.go
View File

@@ -93,17 +93,18 @@ DUMMY,INVALID;DATA
cgrates.org,1002;1006,*out,PACKAGE_10,STANDARD_TRIGGERS
`
var derivedChargesSample = `#Direction,Tenant,Tor,Account,Subject,RunId,ReqTypeField,DirectionField,TenantField,TorField,AccountField,SubjectField,DestinationField,SetupTimeField,AnswerTimeField,DurationField
*out,cgrates.org,call,dan,dan,extra1,^prepaid,,,,rif,rif,,,,
*out,cgrates.org,,dan,dan,extra1,^prepaid,,,,rif,rif,,,,
*in,cgrates.org,call,dan,dan,extra1,^prepaid,,,,rif,rif,,,,
*out,cgrates.org,call,dan,dan,extra1,^filteredHeader1/filterValue1,^prepaid,,,,rif,rif,,,,
*out,cgrates.org,,dan,dan,extra1,^filteredHeader1/filterValue1,^prepaid,,,,rif,rif,,,,
*in,cgrates.org,call,dan,dan,extra1,^filteredHeader1/filterValue1,^prepaid,,,,rif,rif,,,,
DUMMY_DATA
*out,cgrates.org,call,dan,dan,extra2,,,,,ivo,ivo,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,rif2,rif2,,,,
*out,cgrates.org,call,dan,*any,*any,,,,,rif2,rif2,,,,
*out,cgrates.org,call,dan,*any,*default,*default,*default,*default,*default,rif2,rif2,*default,*default,*default,*default
*out,cgrates.org,call,dan,*any,test,^test,^test,^test,^test,^test,^test,^test,^test,^test,^test
*out,cgrates.org,call,dan,*any,run1,,,,,,,,,,
*out,cgrates.org,call,dan,*default,,,,,,,,,,,
*out,cgrates.org,call,dan,dan,extra2,,,,,,ivo,ivo,,,,
*out,cgrates.org,call,dan,*any,extra1,,,,,,rif2,rif2,,,,
*out,cgrates.org,call,dan,*any,*any,,,,,,rif2,rif2,,,,
*out,cgrates.org,call,dan,*any,*default,,*default,*default,*default,*default,rif2,rif2,*default,*default,*default,*default
*out,cgrates.org,call,dan,*any,test,^test,^test,^test,^test,^test,^test,^test,^test,^test,^test,^test
*out,cgrates.org,call,dan,*any,run1,,,,,,,,,,,
*out,cgrates.org,call,dan,*default,,,,,,,,,,,,
*out,cgrates.org,call,dan,dan,extra3,~filterhdr1:s/(.+)/special_run3/,,,,,^runusr3,^runusr3,,,,
`
func TestTimingsValidator(t *testing.T) {
@@ -386,7 +387,7 @@ func TestDerivedChargersValidator(t *testing.T) {
if valid {
t.Error("Validation passed for invalid line", string(ln))
}
case 2, 6, 7, 10, 11:
case 2, 6, 7, 10, 11, 13:
if !valid {
t.Error("Validation did not pass for valid line", string(ln))
}

4
mediator/mediator.go
View File

@@ -121,8 +121,8 @@ func (self *Mediator) RateCdr(storedCdr *utils.StoredCdr) error {
}
for _, dc := range dcs {
dcRunFilter, _ := utils.NewRSRField(dc.RunFilter)
if dcRunFilter != nil && storedCdr.FieldAsString(&utils.RSRField{Id: dcRunFilter.Id}) != storedCdr.FieldAsString(dcRunFilter) {
engine.Logger.Info(fmt.Sprintf("Ignoring DerivedCharger with id %s due to non matching filter", dc.RunId))
if !storedCdr.PassesFieldFilter(dcRunFilter) {
engine.Logger.Info(fmt.Sprintf("<Mediator> Ignoring DerivedCharger with id %s - non matching filter", dc.RunId))
continue
}
dcReqTypeFld, _ := utils.NewRSRField(dc.ReqTypeField)

2
sessionmanager/fssessionmanager.go
View File

@@ -163,7 +163,7 @@ func (sm *FSSessionManager) OnChannelPark(ev Event) {
for _, dc := range dcs {
dcRunFilter, _ := utils.NewRSRField(dc.RunFilter)
if dcRunFilter != nil && ev.ParseEventValue(&utils.RSRField{Id: dcRunFilter.Id}) != ev.ParseEventValue(dcRunFilter) {
engine.Logger.Info(fmt.Sprintf("Ignoring DerivedCharger with id %s due to non matching filter", dc.RunId))
engine.Logger.Info(fmt.Sprintf("<SessionManager> Ignoring DerivedCharger with id %s - non matching filter", dc.RunId))
}
startTime, err := ev.GetAnswerTime(PARK_TIME)
if err != nil {

2
utils/consts.go
View File

@@ -61,7 +61,7 @@ const (
ACTION_PLANS_NRCOLS = 4
ACTION_TRIGGERS_NRCOLS = 9
ACCOUNT_ACTIONS_NRCOLS = 5
DERIVED_CHARGERS_NRCOLS = 16
DERIVED_CHARGERS_NRCOLS = 17
ROUNDING_UP = "*up"
ROUNDING_MIDDLE = "*middle"
ROUNDING_DOWN = "*down"

11
utils/storedcdr.go
View File

@@ -133,6 +133,17 @@ func (storedCdr *StoredCdr) FieldAsString(rsrFld *RSRField) string {
}
}
func (storedCdr *StoredCdr) PassesFieldFilter(fieldFilter *RSRField) bool {
if fieldFilter == nil {
return true
}
if storedCdr.FieldAsString(&RSRField{Id: fieldFilter.Id}) == storedCdr.FieldAsString(fieldFilter) && len(storedCdr.FieldAsString(fieldFilter)) != 0 {
// Field value must be non empty in order to declare it filtered, otherwise filter makes no sense
return true
}
return false
}
func (storedCdr *StoredCdr) AsStoredCdr() *StoredCdr {
return storedCdr
}

26
utils/storedcdr_test.go
View File

@@ -78,6 +78,32 @@ func TestFieldAsString(t *testing.T) {
}
}
func TestPassesFieldFilter(t *testing.T) {
cdr := StoredCdr{CgrId: Sha1("dsafdsaf", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderId: 123, TOR: VOICE, AccId: "dsafdsaf", CdrHost: "192.168.1.1", CdrSource: "test", ReqType: "rated", Direction: "*out", Tenant: "cgrates.org",
Category: "call", Account: "1001", Subject: "1001", Destination: "1002", SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), MediationRunId: DEFAULT_RUNID,
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01,
}
if !cdr.PassesFieldFilter(nil) {
t.Error("Not passing filter")
}
acntPrefxFltr, _ := NewRSRField(`~account:s/(.+)/1001/`)
if !cdr.PassesFieldFilter(acntPrefxFltr) {
t.Error("Not passing filter")
}
torFltr, _ := NewRSRField(`^tor/*voice`)
if !cdr.PassesFieldFilter(torFltr) {
t.Error("Not passing filter")
}
torFltr, _ = NewRSRField(`^tor/*data`)
if cdr.PassesFieldFilter(torFltr) {
t.Error("Passing filter")
}
inexistentFieldFltr, _ := NewRSRField(`^fakefield/fakevalue`)
if cdr.PassesFieldFilter(inexistentFieldFltr) {
t.Error("Passing filter")
}
}
func TestUsageMultiply(t *testing.T) {
cdr := StoredCdr{Usage: time.Duration(10) * time.Second}
if cdr.UsageMultiply(1024.0, 0); cdr.Usage != time.Duration(10240)*time.Second {