From 48e1189dda4bee5522b702343d91b7baf5ff193c Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 4 Mar 2019 17:55:06 +0200 Subject: [PATCH] Updated filters from data with the new dynamic value --- data/conf/samples/cdrc_partcsv/cgrates.json | 4 +- data/conf/samples/cdrccsv/cgrates.json | 10 ++-- .../samples/cdrcfwvwithfilter/cgrates.json | 2 +- .../samples/cdrcxmlwithfilter/cgrates.json | 2 +- data/conf/samples/cdrewithfilter/cgrates.json | 2 +- data/conf/samples/diamagent/data.json | 10 ++-- data/conf/samples/diamagent/dryrun.json | 2 +- data/conf/samples/diamagent/message.json | 4 +- data/conf/samples/diamagent/simpa.json | 4 +- data/conf/samples/diamagent/tests.json | 8 +-- data/conf/samples/diamagent/voice.json | 8 +-- .../samples/diamagentmaxconn/cgrates.json | 2 +- data/conf/samples/diamsctpagent/data.json | 14 ++--- data/conf/samples/diamsctpagent/dryrun.json | 2 +- data/conf/samples/diamsctpagent/message.json | 4 +- data/conf/samples/diamsctpagent/simpa.json | 4 +- data/conf/samples/diamsctpagent/voice.json | 12 ++-- data/conf/samples/httpagent/httpagent.json | 6 +- data/conf/samples/httpagenttls/httpagent.json | 6 +- data/conf/samples/multifiles/a.json | 2 +- data/conf/samples/multifiles/b/b.json | 2 +- data/conf/samples/radagent/cgrates.json | 6 +- data/tariffplans/cluelrn/Attributes.csv | 8 +-- data/tariffplans/cluelrn/Filters.csv | 8 +-- data/tariffplans/dispatchers/Attributes.csv | 20 +++---- data/tariffplans/dispatchers/Dispatchers.csv | 6 +- data/tariffplans/oldtutorial/Attributes.csv | 2 +- data/tariffplans/oldtutorial/Filters.csv | 59 +++++++++---------- data/tariffplans/testit/Attributes.csv | 2 +- data/tariffplans/testit/Filters.csv | 50 ++++++++-------- data/tariffplans/testtp/Filters.csv | 55 +++++++++-------- data/tariffplans/tutorial/Attributes.csv | 18 +++--- data/tariffplans/tutorial/Filters.csv | 24 ++++---- 33 files changed, 183 insertions(+), 185 deletions(-) diff --git a/data/conf/samples/cdrc_partcsv/cgrates.json b/data/conf/samples/cdrc_partcsv/cgrates.json index 507b414b9..5934a30e6 100644 --- a/data/conf/samples/cdrc_partcsv/cgrates.json +++ b/data/conf/samples/cdrc_partcsv/cgrates.json @@ -52,7 +52,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~4", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~4", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~6:s/^(\\d+)$/${1}s/", "mandatory": true}, - {"tag": "Partial", "field_id": "Partial", "type": "*composed", "value": "true", "filters":["*string:10:partial"]}, + {"tag": "Partial", "field_id": "Partial", "type": "*composed", "value": "true", "filters":["*string:~10:partial"]}, ], "cache_dump_fields": [ {"tag": "OriginID", "type": "*composed", "value": "~OriginID"}, @@ -92,7 +92,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~4", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~4", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~6:s/^(\\d+)$/${1}s/", "mandatory": true}, - {"tag": "Partial", "field_id": "Partial", "type": "*composed", "value": "true", "filters":["*string:10:partial"]}, + {"tag": "Partial", "field_id": "Partial", "type": "*composed", "value": "true", "filters":["*string:~10:partial"]}, ], }, ], diff --git a/data/conf/samples/cdrccsv/cgrates.json b/data/conf/samples/cdrccsv/cgrates.json index 9a2be3a5c..00f795cc3 100644 --- a/data/conf/samples/cdrccsv/cgrates.json +++ b/data/conf/samples/cdrccsv/cgrates.json @@ -68,7 +68,7 @@ "cdr_in_dir": "/tmp/csvwithfilter1/csvit1/in", // absolute path towards the directory where the CDRs are stored "cdr_out_dir": "/tmp/csvwithfilter1/csvit1/out", // absolute path towards the directory where processed CDRs will be moved "cdr_source_id": "csvit1", // free form field, tag identifying the source of the CDRs within CDRS database - "filters":["*string:3:1002"], //filter Account to be 1002 + "filters":["*string:~3:1002"], //filter Account to be 1002 "content_fields":[ // import content_fields template, tag will match internally CDR field, in case of .csv value will be represented by index of the field value {"tag": "TOR", "field_id": "ToR", "type": "*composed", "value": "*voice", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~0", "mandatory": true}, @@ -94,7 +94,7 @@ "cdr_in_dir": "/tmp/csvwithfilter2/csvit2/in", // absolute path towards the directory where the CDRs are stored "cdr_out_dir": "/tmp/csvwithfilter2/csvit2/out", // absolute path towards the directory where processed CDRs will be moved "cdr_source_id": "csvit2", // free form field, tag identifying the source of the CDRs within CDRS database - "filters":["*string:3:1002","*string:1:*prepaid","*gte:6:70"], //filter Account to be 1002 and RequestType *prepaid + "filters":["*string:~3:1002","*string:~1:*prepaid","*gte:~6:70"], //filter Account to be 1002 and RequestType *prepaid "content_fields":[ // import content_fields template, tag will match internally CDR field, in case of .csv value will be represented by index of the field value {"tag": "TOR", "field_id": "ToR", "type": "*composed", "value": "*voice", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~0", "mandatory": true}, @@ -120,7 +120,7 @@ "cdr_in_dir": "/tmp/csvwithfilter3/csvit3/in", // absolute path towards the directory where the CDRs are stored "cdr_out_dir": "/tmp/csvwithfilter3/csvit3/out", // absolute path towards the directory where processed CDRs will be moved "cdr_source_id": "csvit4", // free form field, tag identifying the source of the CDRs within CDRS database - "filters":["*string:1:*postpaid"], //filter Account to be 1002 + "filters":["*string:~1:*postpaid"], //filter Account to be 1002 "content_fields":[ // import content_fields template, tag will match internally CDR field, in case of .csv value will be represented by index of the field value {"tag": "TOR", "field_id": "ToR", "type": "*composed", "value": "*voice", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~0", "mandatory": true}, @@ -137,7 +137,7 @@ {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~6", "mandatory": true}, {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~6", "mandatory": true}, {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~6", "mandatory": true}, - {"tag": "RandomVal", "field_id": "RandomVal", "type": "*composed", "value": "*randomValue","filters":["*string:3:1001"]}, + {"tag": "RandomVal", "field_id": "RandomVal", "type": "*composed", "value": "*randomValue","filters":["*string:~3:1001"]}, ], }, { @@ -166,7 +166,7 @@ {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~6", "mandatory": true}, {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~6", "mandatory": true}, {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~6", "mandatory": true}, - {"tag": "RandomVal", "field_id": "RandomVal", "type": "*composed", "value": "*randomValue","filters":["*string:3:1001"]}, + {"tag": "RandomVal", "field_id": "RandomVal", "type": "*composed", "value": "*randomValue","filters":["*string:~3:1001"]}, ], }, ], diff --git a/data/conf/samples/cdrcfwvwithfilter/cgrates.json b/data/conf/samples/cdrcfwvwithfilter/cgrates.json index 216311249..7b9ce166a 100755 --- a/data/conf/samples/cdrcfwvwithfilter/cgrates.json +++ b/data/conf/samples/cdrcfwvwithfilter/cgrates.json @@ -45,7 +45,7 @@ "cdr_in_dir": "/tmp/cgr_fwv/cdrc/in", // absolute path towards the directory where the CDRs are stored "cdr_out_dir": "/tmp/cgr_fwv/cdrc/out", // absolute path towards the directory where processed CDRs will be moved "cdr_source_id": "cdrc", // free form field, id identifying the source of the CDRs within CDRS database - "filters":["*string:0-10:CDR0000010"], + "filters":["*string:~0-10:CDR0000010"], "header_fields": [ {"tag": "FileName", "field_id": "CdrFileName", "type": "*composed", "value": "~95-135", "padding":"right"}, {"tag": "FileSeqNr", "field_id": "FileSeqNr", "type": "*composed", "value": "~135-141", "padding":"zeroleft"}, diff --git a/data/conf/samples/cdrcxmlwithfilter/cgrates.json b/data/conf/samples/cdrcxmlwithfilter/cgrates.json index 2a92ad6ed..2de0c8351 100755 --- a/data/conf/samples/cdrcxmlwithfilter/cgrates.json +++ b/data/conf/samples/cdrcxmlwithfilter/cgrates.json @@ -30,7 +30,7 @@ "cdr_out_dir": "/tmp/cdrcxmlwithfilters/xmlit1/out", "cdr_path": "broadWorksCDR.cdrData", "cdr_source_id": "xmlit1", - "filters": ["*string:broadWorksCDR.cdrData.basicModule.userNumber:1002","*string:broadWorksCDR.cdrData.headerModule.type:Normal"], + "filters": ["*string:~broadWorksCDR.cdrData.basicModule.userNumber:1002","*string:~broadWorksCDR.cdrData.headerModule.type:Normal"], "content_fields":[ // import content_fields template, id will match internally CDR field, in case of .csv value will be represented by index of the field value {"tag": "TOR", "field_id": "ToR", "type": "*composed", "value": "*voice", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~broadWorksCDR.cdrData.basicModule.localCallId", "mandatory": true}, diff --git a/data/conf/samples/cdrewithfilter/cgrates.json b/data/conf/samples/cdrewithfilter/cgrates.json index 483e30875..483e0881b 100755 --- a/data/conf/samples/cdrewithfilter/cgrates.json +++ b/data/conf/samples/cdrewithfilter/cgrates.json @@ -82,7 +82,7 @@ "TemplateWithFilter": { "export_format": "*file_csv", "export_path": "/tmp/", - "filters" :["*string:Source:test2"], + "filters" :["*string:~Source:test2"], "content_fields": [ {"tag": "CGRID", "type": "*composed", "value": "~CGRID"}, {"tag": "RunID", "type": "*composed", "value": "~RunID"}, diff --git a/data/conf/samples/diamagent/data.json b/data/conf/samples/diamagent/data.json index 98a8ae7eb..e9561505d 100644 --- a/data/conf/samples/diamagent/data.json +++ b/data/conf/samples/diamagent/data.json @@ -6,7 +6,7 @@ { "id": "data_init", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:1", "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, @@ -32,7 +32,7 @@ { "id": "data_update_grp1", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", "*string:*req.Multiple-Services-Credit-Control.Rating-Group:1", "*prefix:*req.Service-Context-Id:gprs"], "flags": ["*update", "*accounts"], "continue_on_success": true, @@ -65,7 +65,7 @@ { "id": "data_update_grp2", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", "*string:*req.Multiple-Services-Credit-Control.Rating-Group[1]:2", "*prefix:*req.Service-Context-Id:gprs"], "flags": ["*update", "*accounts"], "request_fields":[ @@ -97,8 +97,8 @@ { "id": "data_terminate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:3", - "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:3", + "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, diff --git a/data/conf/samples/diamagent/dryrun.json b/data/conf/samples/diamagent/dryrun.json index 4e3e78df3..5e2b7d74e 100644 --- a/data/conf/samples/diamagent/dryrun.json +++ b/data/conf/samples/diamagent/dryrun.json @@ -4,7 +4,7 @@ "request_processors": [ { "id": "dryrun1", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.Service-Context-Id:TestDiamItDryRun"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.Service-Context-Id:TestDiamItDryRun"], "flags": ["*dryrun"], "continue_on_success": true, "request_fields":[ diff --git a/data/conf/samples/diamagent/message.json b/data/conf/samples/diamagent/message.json index d299bc4a8..baf085117 100644 --- a/data/conf/samples/diamagent/message.json +++ b/data/conf/samples/diamagent/message.json @@ -5,8 +5,8 @@ { "id": "message", - "filters": ["*string:*vars.*cmd:CCR", "*prefix:*req.Service-Context-Id:message", - "*string:*req.CC-Request-Type:4"], + "filters": ["*string:~*vars.*cmd:CCR", "*prefix:~*req.Service-Context-Id:message", + "*string:~*req.CC-Request-Type:4"], "flags": ["*event", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/diamagent/simpa.json b/data/conf/samples/diamagent/simpa.json index 4e0e730e2..b48279db5 100644 --- a/data/conf/samples/diamagent/simpa.json +++ b/data/conf/samples/diamagent/simpa.json @@ -5,8 +5,8 @@ "request_processors": [ { "id": "simpa_event", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:4", - "*prefix:*req.Service-Context-Id:simpa"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:4", + "*prefix:~*req.Service-Context-Id:simpa"], "flags": ["*event", "*accounts", "*log"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, diff --git a/data/conf/samples/diamagent/tests.json b/data/conf/samples/diamagent/tests.json index 3ca8948c9..cd751c6b1 100644 --- a/data/conf/samples/diamagent/tests.json +++ b/data/conf/samples/diamagent/tests.json @@ -5,8 +5,8 @@ "request_processors": [ { "id": "TestSessionDisconnect", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", - "*prefix:*req.Service-Context-Id:testSessionDisconnect"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:1", + "*prefix:~*req.Service-Context-Id:testSessionDisconnect"], "flags": ["*initiate", "*accounts","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, @@ -33,10 +33,10 @@ ], "reply_fields":[ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*notempty:*cgrep.Error:"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", - "filters": ["*gte:*cgrep.MaxUsage:0s"], + "filters": ["*gte:~*cgrep.MaxUsage:0s"], "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds&*round:0}", "mandatory": true}, ], }, diff --git a/data/conf/samples/diamagent/voice.json b/data/conf/samples/diamagent/voice.json index 5d9e80823..e6ab7d2bc 100644 --- a/data/conf/samples/diamagent/voice.json +++ b/data/conf/samples/diamagent/voice.json @@ -5,8 +5,8 @@ "request_processors": [ { "id": "VoiceInit", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", - "*prefix:*req.Service-Context-Id:voice"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:1", + "*prefix:~*req.Service-Context-Id:voice"], "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, @@ -36,7 +36,7 @@ }, { "id": "VoiceUpdate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", "*prefix:*req.Service-Context-Id:voice"], "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ @@ -69,7 +69,7 @@ }, { "id": "VoiceTerminate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:3", + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:3", "*prefix:*req.Service-Context-Id:voice"], "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ diff --git a/data/conf/samples/diamagentmaxconn/cgrates.json b/data/conf/samples/diamagentmaxconn/cgrates.json index 8bb164d72..eabdb7fae 100755 --- a/data/conf/samples/diamagentmaxconn/cgrates.json +++ b/data/conf/samples/diamagentmaxconn/cgrates.json @@ -74,7 +74,7 @@ "request_processors": [ { "id": "maxconn", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.Service-Context-Id:TestDiamItDryRun"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.Service-Context-Id:TestDiamItDryRun"], "flags": ["*dryrun"], "continue_on_success": true, "request_fields":[], diff --git a/data/conf/samples/diamsctpagent/data.json b/data/conf/samples/diamsctpagent/data.json index 98a8ae7eb..e42c19fa1 100755 --- a/data/conf/samples/diamsctpagent/data.json +++ b/data/conf/samples/diamsctpagent/data.json @@ -6,7 +6,7 @@ { "id": "data_init", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:1", "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, @@ -32,8 +32,8 @@ { "id": "data_update_grp1", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", - "*string:*req.Multiple-Services-Credit-Control.Rating-Group:1", "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", + "*string:~*req.Multiple-Services-Credit-Control.Rating-Group:1", "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*update", "*accounts"], "continue_on_success": true, "request_fields":[ @@ -65,8 +65,8 @@ { "id": "data_update_grp2", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", - "*string:*req.Multiple-Services-Credit-Control.Rating-Group[1]:2", "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", + "*string:~*req.Multiple-Services-Credit-Control.Rating-Group[1]:2", "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, @@ -97,8 +97,8 @@ { "id": "data_terminate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:3", - "*prefix:*req.Service-Context-Id:gprs"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:3", + "*prefix:~*req.Service-Context-Id:gprs"], "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, diff --git a/data/conf/samples/diamsctpagent/dryrun.json b/data/conf/samples/diamsctpagent/dryrun.json index 4e3e78df3..5e2b7d74e 100755 --- a/data/conf/samples/diamsctpagent/dryrun.json +++ b/data/conf/samples/diamsctpagent/dryrun.json @@ -4,7 +4,7 @@ "request_processors": [ { "id": "dryrun1", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.Service-Context-Id:TestDiamItDryRun"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.Service-Context-Id:TestDiamItDryRun"], "flags": ["*dryrun"], "continue_on_success": true, "request_fields":[ diff --git a/data/conf/samples/diamsctpagent/message.json b/data/conf/samples/diamsctpagent/message.json index d299bc4a8..baf085117 100755 --- a/data/conf/samples/diamsctpagent/message.json +++ b/data/conf/samples/diamsctpagent/message.json @@ -5,8 +5,8 @@ { "id": "message", - "filters": ["*string:*vars.*cmd:CCR", "*prefix:*req.Service-Context-Id:message", - "*string:*req.CC-Request-Type:4"], + "filters": ["*string:~*vars.*cmd:CCR", "*prefix:~*req.Service-Context-Id:message", + "*string:~*req.CC-Request-Type:4"], "flags": ["*event", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/diamsctpagent/simpa.json b/data/conf/samples/diamsctpagent/simpa.json index d58867b16..4d10862ae 100755 --- a/data/conf/samples/diamsctpagent/simpa.json +++ b/data/conf/samples/diamsctpagent/simpa.json @@ -5,8 +5,8 @@ "request_processors": [ { "id": "simpa_event", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:4", - "*prefix:*req.Service-Context-Id:simpa"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:4", + "*prefix:~*req.Service-Context-Id:simpa"], "flags": ["*event", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, diff --git a/data/conf/samples/diamsctpagent/voice.json b/data/conf/samples/diamsctpagent/voice.json index 5d9e80823..5f5bd32de 100755 --- a/data/conf/samples/diamsctpagent/voice.json +++ b/data/conf/samples/diamsctpagent/voice.json @@ -5,8 +5,8 @@ "request_processors": [ { "id": "VoiceInit", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:1", - "*prefix:*req.Service-Context-Id:voice"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:1", + "*prefix:~*req.Service-Context-Id:voice"], "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, @@ -36,8 +36,8 @@ }, { "id": "VoiceUpdate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:2", - "*prefix:*req.Service-Context-Id:voice"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:2", + "*prefix:~*req.Service-Context-Id:voice"], "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, @@ -69,8 +69,8 @@ }, { "id": "VoiceTerminate", - "filters": ["*string:*vars.*cmd:CCR", "*string:*req.CC-Request-Type:3", - "*prefix:*req.Service-Context-Id:voice"], + "filters": ["*string:~*vars.*cmd:CCR", "*string:~*req.CC-Request-Type:3", + "*prefix:~*req.Service-Context-Id:voice"], "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, diff --git a/data/conf/samples/httpagent/httpagent.json b/data/conf/samples/httpagent/httpagent.json index bf1e3b829..a500aab57 100644 --- a/data/conf/samples/httpagent/httpagent.json +++ b/data/conf/samples/httpagent/httpagent.json @@ -13,7 +13,7 @@ "request_processors": [ { "id": "OutboundAUTHDryRun", - "filters": ["*string:*req.request_type:OutboundAUTH","*string:*req.Msisdn:497700056231"], + "filters": ["*string:~*req.request_type:OutboundAUTH","*string:~*req.Msisdn:497700056231"], "tenant": "cgrates.org", "flags": ["*dryrun"], "request_fields":[ @@ -33,7 +33,7 @@ }, { "id": "OutboundAUTH", - "filters": ["*string:*req.request_type:OutboundAUTH"], + "filters": ["*string:~*req.request_type:OutboundAUTH"], "tenant": "cgrates.org", "flags": [ "*auth", "*accounts", "*attributes"], "request_fields":[ @@ -58,7 +58,7 @@ }, { "id": "mtcall_cdr", - "filters": ["*string:*req.request_type:MTCALL_CDR"], + "filters": ["*string:~*req.request_type:MTCALL_CDR"], "tenant": "cgrates.org", "flags": ["*cdrs"], "request_fields":[ diff --git a/data/conf/samples/httpagenttls/httpagent.json b/data/conf/samples/httpagenttls/httpagent.json index 38021808a..7170b2236 100755 --- a/data/conf/samples/httpagenttls/httpagent.json +++ b/data/conf/samples/httpagenttls/httpagent.json @@ -13,7 +13,7 @@ "request_processors": [ { "id": "OutboundAUTHDryRun", - "filters": ["*string:*req.request_type:OutboundAUTH","*string:*req.Msisdn:497700056231"], + "filters": ["*string:~*req.request_type:OutboundAUTH","*string:~*req.Msisdn:497700056231"], "tenant": "cgrates.org", "flags": ["*dryrun"], "request_fields":[ @@ -33,7 +33,7 @@ }, { "id": "OutboundAUTH", - "filters": ["*string:*req.request_type:OutboundAUTH"], + "filters": ["*string:~*req.request_type:OutboundAUTH"], "tenant": "cgrates.org", "flags": [ "*auth", "*accounts", "*attributes"], "request_fields":[ @@ -58,7 +58,7 @@ }, { "id": "mtcall_cdr", - "filters": ["*string:*req.request_type:MTCALL_CDR"], + "filters": ["*string:~*req.request_type:MTCALL_CDR"], "tenant": "cgrates.org", "flags": ["*cdrs"], "request_fields":[ diff --git a/data/conf/samples/multifiles/a.json b/data/conf/samples/multifiles/a.json index 93bc5c538..33186864a 100644 --- a/data/conf/samples/multifiles/a.json +++ b/data/conf/samples/multifiles/a.json @@ -50,7 +50,7 @@ }, { "id": "OutboundAUTH", - "filters": ["*string:*req.request_type:OutboundAUTH"], + "filters": ["*string:~*req.request_type:OutboundAUTH"], "tenant": "cgrates.org", "flags": ["*auth", "*accounts", "*attributes"], "request_fields":[ diff --git a/data/conf/samples/multifiles/b/b.json b/data/conf/samples/multifiles/b/b.json index 4ff7f3764..6a0d784d6 100644 --- a/data/conf/samples/multifiles/b/b.json +++ b/data/conf/samples/multifiles/b/b.json @@ -32,7 +32,7 @@ "request_processors": [ { "id": "mtcall_cdr", - "filters": ["*string:*req.request_type:MTCALL_CDR"], + "filters": ["*string:~*req.request_type:MTCALL_CDR"], "tenant": "cgrates.org", "flags": ["*cdrs"], "request_fields":[ diff --git a/data/conf/samples/radagent/cgrates.json b/data/conf/samples/radagent/cgrates.json index f7003aef3..6beb16b7c 100644 --- a/data/conf/samples/radagent/cgrates.json +++ b/data/conf/samples/radagent/cgrates.json @@ -83,7 +83,7 @@ "request_processors": [ { "id": "KamailioAuth", - "filters": ["*string:*vars.*radReqType:*radAuth"], + "filters": ["*string:~*vars.*radReqType:*radAuth"], "flags": ["*auth", "*accounts"], "continue_on_success": false, "request_fields":[ @@ -110,7 +110,7 @@ }, { "id": "KamailioAccountingStart", - "filters": ["*string:*req.Acct-Status-Type:Start"], + "filters": ["*string:~*req.Acct-Status-Type:Start"], "flags": ["*initiate", "*attributes", "*resources", "*accounts"], "continue_on_success": false, "request_fields":[ @@ -136,7 +136,7 @@ }, { "id": "KamailioAccountingStop", - "filters": ["*string:*req.Acct-Status-Type:Stop"], + "filters": ["*string:~*req.Acct-Status-Type:Stop"], "flags": ["*terminate", "*resources", "*accounts", "*cdrs"], "continue_on_success": false, "request_fields":[ diff --git a/data/tariffplans/cluelrn/Attributes.csv b/data/tariffplans/cluelrn/Attributes.csv index b2c8c079d..fb071bf44 100644 --- a/data/tariffplans/cluelrn/Attributes.csv +++ b/data/tariffplans/cluelrn/Attributes.csv @@ -1,8 +1,8 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,FieldName,Substitute,Blocker,Weight -cgrates.org,LRN_Dst3125650565,lrn,*string:Destination:3125650565,,,Destination,13128543000,false,10 +cgrates.org,LRN_Dst3125650565,lrn,*string:~Destination:3125650565,,,Destination,13128543000,false,10 cgrates.org,LRN_Dst3125650565,,,,,OriginalDestination,3125650565,false,10 -cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:Destination:13128543000;*rsr::~OriginalDestination(!^$),,,DestinationLATA,358,false,20 -cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:Account:9174269000;*rsr::~DestinationLATA(!^$),,,CallerLATA,132,false,30 +cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:~Destination:13128543000;*rsr::~OriginalDestination(!^$),,,DestinationLATA,358,false,20 +cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:~Account:9174269000;*rsr::~DestinationLATA(!^$),,,CallerLATA,132,false,30 cgrates.org,LRN_JURISDICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,,LRNJurisdiction,INTRA,false,50 cgrates.org,LRN_JURISDICTION_IL,lrn,FLTR_INTRALATA_ILLINOIS,,,LRNJurisdiction,INTRA,false,50 -cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:Destination:13128543000;*rsr::~CallerLATA(!^$),,,LRNJurisdiction,INTER,false,40 +cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:~Destination:13128543000;*rsr::~CallerLATA(!^$),,,LRNJurisdiction,INTER,false,40 diff --git a/data/tariffplans/cluelrn/Filters.csv b/data/tariffplans/cluelrn/Filters.csv index d038b6313..080838314 100644 --- a/data/tariffplans/cluelrn/Filters.csv +++ b/data/tariffplans/cluelrn/Filters.csv @@ -1,5 +1,5 @@ #Tenant[0],ID[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5] -cgrates.org,FLTR_INTRALATA_NEWYORK,*string,CallerLATA,224;222;220;132, -cgrates.org,FLTR_INTRALATA_NEWYORK,*string,DestinationLATA,224;222;220;132, -cgrates.org,FLTR_INTRALATA_ILLINOIS,*string,CallerLATA,358;359, -cgrates.org,FLTR_INTRALATA_ILLINOIS,*string,DestinationLATA,358;359, +cgrates.org,FLTR_INTRALATA_NEWYORK,*string,~CallerLATA,224;222;220;132, +cgrates.org,FLTR_INTRALATA_NEWYORK,*string,~DestinationLATA,224;222;220;132, +cgrates.org,FLTR_INTRALATA_ILLINOIS,*string,~CallerLATA,358;359, +cgrates.org,FLTR_INTRALATA_ILLINOIS,*string,~DestinationLATA,358;359, diff --git a/data/tariffplans/dispatchers/Attributes.csv b/data/tariffplans/dispatchers/Attributes.csv index 779d92e6f..ed9ba0a25 100644 --- a/data/tariffplans/dispatchers/Attributes.csv +++ b/data/tariffplans/dispatchers/Attributes.csv @@ -1,12 +1,12 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,FieldName,Substitute,Blocker,Weight -cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:Account:1001,,,Password,CGRateS.org,false,20 -cgrates.org,ATTR_API_ATTR_FAKE_AUTH,*auth,*string:APIKey:12345,,,APIMethods,,false,20 -cgrates.org,ATTR_API_ATTR_AUTH,*auth,*string:APIKey:attr12345,,,APIMethods,AttributeSv1.Ping&AttributeSv1.GetAttributeForEvent&AttributeSv1.ProcessEvent,false,20 -cgrates.org,ATTR_API_CHRG_AUTH,*auth,*string:APIKey:chrg12345,,,APIMethods,ChargerSv1.Ping&ChargerSv1.GetChargersForEvent&ChargerSv1.ProcessEvent,false,20 -cgrates.org,ATTR_API_THR_AUTH,*auth,*string:APIKey:thr12345,,,APIMethods,ThresholdSv1.Ping&ThresholdSv1.GetThresholdsForEvent&ThresholdSv1.ProcessEvent&ThresholdSv1.GetThreshold&ThresholdSv1.GetThresholdIDs,false,20 -cgrates.org,ATTR_API_SUP_AUTH,*auth,*string:APIKey:sup12345,,,APIMethods,SupplierSv1.Ping&SupplierSv1.GetSuppliers,false,20 -cgrates.org,ATTR_API_STAT_AUTH,*auth,*string:APIKey:stat12345,,,APIMethods,StatSv1.Ping&StatSv1.GetStatQueuesForEvent&StatSv1.GetQueueStringMetrics&StatSv1.ProcessEvent&StatSv1.GetQueueIDs&StatSv1.GetQueueFloatMetrics,false,20 -cgrates.org,ATTR_API_RES_AUTH,*auth,*string:APIKey:res12345,,,APIMethods,ResourceSv1.Ping&ResourceSv1.GetResourcesForEvent&ResourceSv1.AuthorizeResources&ResourceSv1.AllocateResources&ResourceSv1.ReleaseResources,false,20 -cgrates.org,ATTR_API_SES_AUTH,*auth,*string:APIKey:ses12345,,,APIMethods,SessionSv1.Ping&SessionSv1.AuthorizeEventWithDigest&SessionSv1.InitiateSessionWithDigest&SessionSv1.UpdateSession&SessionSv1.TerminateSession&SessionSv1.ProcessCDR&SessionSv1.ProcessEvent&SessionSv1.GetActiveSessions&SessionSv1.GetActiveSessionsCount&SessionSv1.ForceDisconnect&SessionSv1.GetPassiveSessions&SessionSv1.GetPassiveSessionsCount&SessionSv1.SetPassiveSession&SessionSv1.ReplicateSessions,false,20 -cgrates.org,ATTR_API_RSP_AUTH,*auth,*string:APIKey:rsp12345,,,APIMethods,Responder.Status,false,20 +cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:~Account:1001,,,Password,CGRateS.org,false,20 +cgrates.org,ATTR_API_ATTR_FAKE_AUTH,*auth,*string:~APIKey:12345,,,APIMethods,,false,20 +cgrates.org,ATTR_API_ATTR_AUTH,*auth,*string:~APIKey:attr12345,,,APIMethods,AttributeSv1.Ping&AttributeSv1.GetAttributeForEvent&AttributeSv1.ProcessEvent,false,20 +cgrates.org,ATTR_API_CHRG_AUTH,*auth,*string:~APIKey:chrg12345,,,APIMethods,ChargerSv1.Ping&ChargerSv1.GetChargersForEvent&ChargerSv1.ProcessEvent,false,20 +cgrates.org,ATTR_API_THR_AUTH,*auth,*string:~APIKey:thr12345,,,APIMethods,ThresholdSv1.Ping&ThresholdSv1.GetThresholdsForEvent&ThresholdSv1.ProcessEvent&ThresholdSv1.GetThreshold&ThresholdSv1.GetThresholdIDs,false,20 +cgrates.org,ATTR_API_SUP_AUTH,*auth,*string:~APIKey:sup12345,,,APIMethods,SupplierSv1.Ping&SupplierSv1.GetSuppliers,false,20 +cgrates.org,ATTR_API_STAT_AUTH,*auth,*string:~APIKey:stat12345,,,APIMethods,StatSv1.Ping&StatSv1.GetStatQueuesForEvent&StatSv1.GetQueueStringMetrics&StatSv1.ProcessEvent&StatSv1.GetQueueIDs&StatSv1.GetQueueFloatMetrics,false,20 +cgrates.org,ATTR_API_RES_AUTH,*auth,*string:~APIKey:res12345,,,APIMethods,ResourceSv1.Ping&ResourceSv1.GetResourcesForEvent&ResourceSv1.AuthorizeResources&ResourceSv1.AllocateResources&ResourceSv1.ReleaseResources,false,20 +cgrates.org,ATTR_API_SES_AUTH,*auth,*string:~APIKey:ses12345,,,APIMethods,SessionSv1.Ping&SessionSv1.AuthorizeEventWithDigest&SessionSv1.InitiateSessionWithDigest&SessionSv1.UpdateSession&SessionSv1.TerminateSession&SessionSv1.ProcessCDR&SessionSv1.ProcessEvent&SessionSv1.GetActiveSessions&SessionSv1.GetActiveSessionsCount&SessionSv1.ForceDisconnect&SessionSv1.GetPassiveSessions&SessionSv1.GetPassiveSessionsCount&SessionSv1.SetPassiveSession&SessionSv1.ReplicateSessions,false,20 +cgrates.org,ATTR_API_RSP_AUTH,*auth,*string:~APIKey:rsp12345,,,APIMethods,Responder.Status,false,20 diff --git a/data/tariffplans/dispatchers/Dispatchers.csv b/data/tariffplans/dispatchers/Dispatchers.csv index ae6a8f6e8..66cb563e1 100644 --- a/data/tariffplans/dispatchers/Dispatchers.csv +++ b/data/tariffplans/dispatchers/Dispatchers.csv @@ -1,9 +1,9 @@ #Tenant,ID,Subsystems,FilterIDs,ActivationInterval,Strategy,StrategyParameters,ConnID,ConnFilterIDs,ConnWeight,ConnBlocker,ConnParameters,Weight cgrates.org,PING1,*any,,,*weight,,ALL,,20,false,,10 cgrates.org,PING1,,,,,,ALL2,,10,,, -cgrates.org,EVENT1,*any,*string:EventName:Event1,,*weight,,ALL2,,20,false,,30 +cgrates.org,EVENT1,*any,*string:~EventName:Event1,,*weight,,ALL2,,20,false,,30 cgrates.org,EVENT1,,,,,,ALL,,10,,, -cgrates.org,EVENT2,*any,*string:EventName:RoundRobin,,*round_robin,,ALL2,,20,false,,20 +cgrates.org,EVENT2,*any,*string:~EventName:RoundRobin,,*round_robin,,ALL2,,20,false,,20 cgrates.org,EVENT2,,,,,,ALL,,10,,, -cgrates.org,EVENT3,*any,*string:EventName:Random,,*random,,ALL2,,20,false,,20 +cgrates.org,EVENT3,*any,*string:~EventName:Random,,*random,,ALL2,,20,false,,20 cgrates.org,EVENT3,,,,,,ALL,,10,,, diff --git a/data/tariffplans/oldtutorial/Attributes.csv b/data/tariffplans/oldtutorial/Attributes.csv index 6966a4f4a..6556cb8cd 100644 --- a/data/tariffplans/oldtutorial/Attributes.csv +++ b/data/tariffplans/oldtutorial/Attributes.csv @@ -1,3 +1,3 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,FieldName,Substitute,Blocker,Weight -cgrates.org,ATTR_1,*sessions;*cdrs,*string:Account:1007,2014-01-14T00:00:00Z,,Account,1001,false,10 +cgrates.org,ATTR_1,*sessions;*cdrs,*string:~Account:1007,2014-01-14T00:00:00Z,,Account,1001,false,10 cgrates.org,ATTR_1,,,,,Subject,1001,, diff --git a/data/tariffplans/oldtutorial/Filters.csv b/data/tariffplans/oldtutorial/Filters.csv index d20147272..29d14ae3d 100644 --- a/data/tariffplans/oldtutorial/Filters.csv +++ b/data/tariffplans/oldtutorial/Filters.csv @@ -1,33 +1,32 @@ #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,*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_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 -cgrates.org,FLTR_DST_NL,*destinations,Destination,DST_NL,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_BALANCE_1,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_BALANCE_1,*string,EventType,BalanceUpdate, -cgrates.org,FLTR_ACNT_BALANCE_1,*gte,Units,10.0, -cgrates.org,FLTR_ACNT_EXPIRED,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_EXPIRED,*gte,ExpiryTime,*now, -cgrates.org,FLTR_STATS_1,*string,Account,1002, -cgrates.org,FLTR_STATS_1,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_1,*lt,ASR,40.0, -cgrates.org,FLTR_STATS_1,*lt,ACD,3m, -cgrates.org,FLTR_STATS_2,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_2,*string,StatID,STATS_HOURLY_DE, -cgrates.org,FLTR_STATS_2,*gt,TCD,30m, -cgrates.org,FLTR_STATS_3,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_3,*string,StatID,STATS_DAILY_DE, -cgrates.org,FLTR_STATS_3,*gt,TCD,3h, -cgrates.org,FLTR_RES_1,*string,EventType,ResourceUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_RES_1,*string,ResourceID,RES_GRP_1, -cgrates.org,FLTR_RES_1,*gte,Usage,10.0, -cgrates.org,FLTR_DST_FS,*string,Account,1001;1002;dan,2014-07-29T15:00:00Z -cgrates.org,FLTR_DST_FS,*destinations,Destination,DST_FS, -cgrates.org,FLTR_RES_GR3,*string,Account,3001,2014-07-29T15:00:00Z -cgrates.org,FLTR_CDRS,*cdr_stats,,CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20,2014-07-29T15:00:00Z -cgrates.org,FLTR_STS1,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_CDR_UPDATE,*string,EventType,CDR,2014-07-29T15:00:00Z +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 +cgrates.org,FLTR_DST_NL,*destinations,~Destination,DST_NL,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_BALANCE_1,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_BALANCE_1,*string,~EventType,BalanceUpdate, +cgrates.org,FLTR_ACNT_BALANCE_1,*gte,~Units,10.0, +cgrates.org,FLTR_ACNT_EXPIRED,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_EXPIRED,*gte,~ExpiryTime,*now, +cgrates.org,FLTR_STATS_1,*string,~Account,1002, +cgrates.org,FLTR_STATS_1,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_1,*lt,~ASR,40.0, +cgrates.org,FLTR_STATS_1,*lt,~ACD,3m, +cgrates.org,FLTR_STATS_2,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_2,*string,~StatID,STATS_HOURLY_DE, +cgrates.org,FLTR_STATS_2,*gt,~TCD,30m, +cgrates.org,FLTR_STATS_3,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_3,*string,~StatID,STATS_DAILY_DE, +cgrates.org,FLTR_STATS_3,*gt,~TCD,3h, +cgrates.org,FLTR_RES_1,*string,~EventType,ResourceUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_RES_1,*string,~ResourceID,RES_GRP_1, +cgrates.org,FLTR_RES_1,*gte,~Usage,10.0, +cgrates.org,FLTR_DST_FS,*string,~Account,1001;1002;dan,2014-07-29T15:00:00Z +cgrates.org,FLTR_DST_FS,*destinations,~Destination,DST_FS, +cgrates.org,FLTR_RES_GR3,*string,~Account,3001,2014-07-29T15:00:00Z +cgrates.org,FLTR_STS1,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_CDR_UPDATE,*string,~EventType,CDR,2014-07-29T15:00:00Z diff --git a/data/tariffplans/testit/Attributes.csv b/data/tariffplans/testit/Attributes.csv index 8ae92e0b7..2ae621173 100644 --- a/data/tariffplans/testit/Attributes.csv +++ b/data/tariffplans/testit/Attributes.csv @@ -1,4 +1,4 @@ #Tenant,ID,Context,FilterIDs,ActivationInterval,AttributeFilterIDs,FieldName,Substitute,Blocker,Weight cgrates.org,ATTR_ACNT_1001,*sessions,FLTR_ACCOUNT_1001,,,OfficeGroup,Marketing,false,10 cgrates.org,ATTR_SUPPLIER1,*chargers,,,,Subject,SUPPLIER1,false,10 -cgrates.org,ATTR_PAYPAL,*cdrs,*string:Subject:ANY2CNT,,,PayPalAccount,paypal@cgrates.org,false,10 +cgrates.org,ATTR_PAYPAL,*cdrs,*string:~Subject:ANY2CNT,,,PayPalAccount,paypal@cgrates.org,false,10 diff --git a/data/tariffplans/testit/Filters.csv b/data/tariffplans/testit/Filters.csv index f3396bbd8..2629390d2 100644 --- a/data/tariffplans/testit/Filters.csv +++ b/data/tariffplans/testit/Filters.csv @@ -1,27 +1,27 @@ #Tenant[0],ID[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5] -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_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,,~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 -cgrates.org,FLTR_SPP_2,*string,Account,1003,2014-07-29T15:00:00Z -cgrates.org,FLTR_SPP_2,*prefix,Destination,10;20, -cgrates.org,FLTR_SPP_2,*string,DistinctMatch,*highest_cost, -cgrates.org,FLTR_SPP_3,*string,DistinctMatch,*qos,2014-07-29T15:00:00Z -cgrates.org,FLTR_STAT_1,*string,Account,1001,2014-07-29T15:00:00Z -cgrates.org,FLTR_STAT_2,*string,Account,1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_STAT_3,*string,Account,1003,2014-07-29T15:00:00Z -cgrates.org,FLTR_SPP_4,*string,DistinctMatch,*qos2,2014-07-29T15:00:00Z -cgrates.org,FLTR_SPP_5,*string,DistinctMatch,*qos3,2014-07-29T15:00:00Z -cgrates.org,FLTR_STAT_1_1,*string,Stat,Stat1_1,2014-07-29T15:00:00Z -cgrates.org,FLTR_SPP_6,*string,DistinctMatch,*qos_filtred,2014-07-29T15:00:00Z -cgrates.org,FLTR_QOS_SP1,*gte,*vars.*acd,10.0,2014-07-29T15:00:00Z -cgrates.org,FLTR_QOS_SP2,*gte,*vars.*acd,10.0,2014-07-29T15:00:00Z -cgrates.org,FLTR_QOS_SP2,*gte,*vars.*tcd,11.0, -cgrates.org,FLTR_SPP_QOS_2,*string,DistinctMatch,*qos_filtred2,2014-07-29T15:00:00Z -cgrates.org,FLTR_QOS_SP1_2,*gte,*vars.Cost,0.1,2014-07-29T15:00:00Z -cgrates.org,FLTR_QOS_SP2_2,*gte,*vars.Cost,0.2,2014-07-29T15:00:00Z -cgrates.org,FLTR_TEST,*string,Subject,TEST,2014-07-29T15:00:00Z \ No newline at end of file +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 +cgrates.org,FLTR_SPP_2,*string,~Account,1003,2014-07-29T15:00:00Z +cgrates.org,FLTR_SPP_2,*prefix,~Destination,10;20, +cgrates.org,FLTR_SPP_2,*string,~DistinctMatch,*highest_cost, +cgrates.org,FLTR_SPP_3,*string,~DistinctMatch,*qos,2014-07-29T15:00:00Z +cgrates.org,FLTR_STAT_1,*string,~Account,1001,2014-07-29T15:00:00Z +cgrates.org,FLTR_STAT_2,*string,~Account,1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_STAT_3,*string,~Account,1003,2014-07-29T15:00:00Z +cgrates.org,FLTR_SPP_4,*string,~DistinctMatch,*qos2,2014-07-29T15:00:00Z +cgrates.org,FLTR_SPP_5,*string,~DistinctMatch,*qos3,2014-07-29T15:00:00Z +cgrates.org,FLTR_STAT_1_1,*string,~Stat,Stat1_1,2014-07-29T15:00:00Z +cgrates.org,FLTR_SPP_6,*string,~DistinctMatch,*qos_filtred,2014-07-29T15:00:00Z +cgrates.org,FLTR_QOS_SP1,*gte,~*vars.*acd,10.0,2014-07-29T15:00:00Z +cgrates.org,FLTR_QOS_SP2,*gte,~*vars.*acd,10.0,2014-07-29T15:00:00Z +cgrates.org,FLTR_QOS_SP2,*gte,~*vars.*tcd,11.0, +cgrates.org,FLTR_SPP_QOS_2,*string,~DistinctMatch,*qos_filtred2,2014-07-29T15:00:00Z +cgrates.org,FLTR_QOS_SP1_2,*gte,~*vars.Cost,0.1,2014-07-29T15:00:00Z +cgrates.org,FLTR_QOS_SP2_2,*gte,~*vars.Cost,0.2,2014-07-29T15:00:00Z +cgrates.org,FLTR_TEST,*string,~Subject,TEST,2014-07-29T15:00:00Z \ No newline at end of file diff --git a/data/tariffplans/testtp/Filters.csv b/data/tariffplans/testtp/Filters.csv index 294aa501a..9246a781e 100644 --- a/data/tariffplans/testtp/Filters.csv +++ b/data/tariffplans/testtp/Filters.csv @@ -1,30 +1,29 @@ #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,*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_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 -cgrates.org,FLTR_DST_NL,*destinations,Destination,DST_NL,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_BALANCE_1,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_BALANCE_1,*string,EventType,BalanceUpdate, -cgrates.org,FLTR_ACNT_BALANCE_1,*gte,Units,10.0, -cgrates.org,FLTR_ACNT_EXPIRED,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_EXPIRED,*gte,ExpiryTime,*now, -cgrates.org,FLTR_STATS_1,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_1,*lt,ASR,40.0, -cgrates.org,FLTR_STATS_1,*lt,ACD,3m, -cgrates.org,FLTR_STATS_2,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_2,*string,StatID,STATS_HOURLY_DE, -cgrates.org,FLTR_STATS_2,*gt,TCD,30m, -cgrates.org,FLTR_STATS_3,*string,EventType,StatUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_STATS_3,*string,StatID,STATS_DAILY_DE, -cgrates.org,FLTR_STATS_3,*gt,TCD,3h, -cgrates.org,FLTR_RES_1,*string,EventType,ResourceUpdate,2014-07-29T15:00:00Z -cgrates.org,FLTR_RES_1,*string,ResourceID,RES_GRP_1, -cgrates.org,FLTR_RES_1,*gte,Usage,10.0, -cgrates.org,FLTR_DST_FS,*destinations,Destination,DST_FS,2014-07-29T15:00:00Z -cgrates.org,FLTR_RES_GR3,*string,Account,3001,2014-07-29T15:00:00Z -cgrates.org,FLTR_CDRS,*cdr_stats,,CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20,2014-07-29T15:00:00Z -cgrates.org,FLTR_STS1,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_CDR_UPDATE,*string,EventType,CDR,2014-07-29T15:00:00Z +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 +cgrates.org,FLTR_DST_NL,*destinations,~Destination,DST_NL,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_BALANCE_1,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_BALANCE_1,*string,~EventType,BalanceUpdate, +cgrates.org,FLTR_ACNT_BALANCE_1,*gte,~Units,10.0, +cgrates.org,FLTR_ACNT_EXPIRED,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_EXPIRED,*gte,~ExpiryTime,*now, +cgrates.org,FLTR_STATS_1,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_1,*lt,~ASR,40.0, +cgrates.org,FLTR_STATS_1,*lt,~ACD,3m, +cgrates.org,FLTR_STATS_2,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_2,*string,`StatID,STATS_HOURLY_DE, +cgrates.org,FLTR_STATS_2,*gt,~TCD,30m, +cgrates.org,FLTR_STATS_3,*string,~EventType,StatUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_STATS_3,*string,~StatID,STATS_DAILY_DE, +cgrates.org,FLTR_STATS_3,*gt,~TCD,3h, +cgrates.org,FLTR_RES_1,*string,~EventType,ResourceUpdate,2014-07-29T15:00:00Z +cgrates.org,FLTR_RES_1,*string,`ResourceID,RES_GRP_1, +cgrates.org,FLTR_RES_1,*gte,~Usage,10.0, +cgrates.org,FLTR_DST_FS,*destinations,~Destination,DST_FS,2014-07-29T15:00:00Z +cgrates.org,FLTR_RES_GR3,*string,~Account,3001,2014-07-29T15:00:00Z +cgrates.org,FLTR_STS1,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_CDR_UPDATE,*string,~EventType,CDR,2014-07-29T15:00:00Z diff --git a/data/tariffplans/tutorial/Attributes.csv b/data/tariffplans/tutorial/Attributes.csv index d7ce8b081..db373d495 100644 --- a/data/tariffplans/tutorial/Attributes.csv +++ b/data/tariffplans/tutorial/Attributes.csv @@ -1,22 +1,22 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,FieldName,Substitute,Blocker,Weight -cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:Account:1001,,,Password,CGRateS.org,false,20 -cgrates.org,ATTR_1002_SIMPLEAUTH,simpleauth,*string:Account:1002,,,Password,CGRateS.org,false,20 -cgrates.org,ATTR_1003_SIMPLEAUTH,simpleauth,*string:Account:1003,,,Password,CGRateS.org,false,20 -cgrates.org,ATTR_1001_SESSIONAUTH,*sessions,*string:Account:1001,,,Password,CGRateS.org,false,10 +cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:~Account:1001,,,Password,CGRateS.org,false,20 +cgrates.org,ATTR_1002_SIMPLEAUTH,simpleauth,*string:~Account:1002,,,Password,CGRateS.org,false,20 +cgrates.org,ATTR_1003_SIMPLEAUTH,simpleauth,*string:~Account:1003,,,Password,CGRateS.org,false,20 +cgrates.org,ATTR_1001_SESSIONAUTH,*sessions,*string:~Account:1001,,,Password,CGRateS.org,false,10 cgrates.org,ATTR_1001_SESSIONAUTH,,,,,RequestType,*prepaid,, cgrates.org,ATTR_1001_SESSIONAUTH,,,,,PaypalAccount,cgrates@paypal.com,, cgrates.org,ATTR_1001_SESSIONAUTH,,,,,LCRProfile,premium_cli,, -cgrates.org,ATTR_1002_SESSIONAUTH,*sessions,*string:Account:1002,,,Password,CGRateS.org,false,10 +cgrates.org,ATTR_1002_SESSIONAUTH,*sessions,*string:~Account:1002,,,Password,CGRateS.org,false,10 cgrates.org,ATTR_1002_SESSIONAUTH,,,,,RequestType,*postpaid,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,PaypalAccount,cgrates@paypal.com,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,LCRProfile,premium_cli,, cgrates.org,ATTR_1002_SESSIONAUTH,,,,,ResourceAllocation,"ResGroup1",, -cgrates.org,ATTR_1003_SESSIONAUTH,*sessions,*string:Account:1003,,,Password,CGRateS.org,false,10 +cgrates.org,ATTR_1003_SESSIONAUTH,*sessions,*string:~Account:1003,,,Password,CGRateS.org,false,10 cgrates.org,ATTR_1003_SESSIONAUTH,,,,,RequestType,*prepaid,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,,PaypalAccount,cgrates@paypal.com,, cgrates.org,ATTR_1003_SESSIONAUTH,,,,,LCRProfile,premium_cli,, -cgrates.com,ATTR_TNT_ALIAS,*any,*string:SubscriberId:1006,,,Account,1001,false,10 +cgrates.com,ATTR_TNT_ALIAS,*any,*string:~SubscriberId:1006,,,Account,1001,false,10 cgrates.com,ATTR_TNT_ALIAS,*any,,,,RequestType,*prepaid,, cgrates.com,ATTR_TNT_ALIAS,*any,,,,*tenant,cgrates.org,, -cgrates.com,ATTR_TNT_1001,*any,*string:Account:1001,,,*tenant,cgrates.org,, -cgrates.com,ATTR_TNT_DISC,*any,*string:Account:testDiamInitWithSessionDisconnect,,,*tenant,cgrates.org,, +cgrates.com,ATTR_TNT_1001,*any,*string:~Account:1001,,,*tenant,cgrates.org,, +cgrates.com,ATTR_TNT_DISC,*any,*string:~Account:testDiamInitWithSessionDisconnect,,,*tenant,cgrates.org,, diff --git a/data/tariffplans/tutorial/Filters.csv b/data/tariffplans/tutorial/Filters.csv index 143bd00b7..40c0f895c 100644 --- a/data/tariffplans/tutorial/Filters.csv +++ b/data/tariffplans/tutorial/Filters.csv @@ -1,13 +1,13 @@ #Tenant[0],ID[1],FilterType[2],FilterFieldName[3],FilterFieldValues[4],ActivationInterval[5] -cgrates.org,FLTR_RES,*string,Account,1001;1002;1003,2014-07-29T15:00:00Z -cgrates.org,FLTR_DST_FS,*string,Account,1001,2014-07-29T15:00:00Z -cgrates.org,FLTR_DST_FS,*destinations,Destination,DST_FS, -cgrates.org,FLTR_ACNT_1001_1002,*string,Account,1001;1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_1001_1002,*string,RunID,*default, -cgrates.org,FLTR_ACNT_1001_1002,*string,Destination,1001;1002;1003, -cgrates.org,FLTR_ACNT_1001,*string,Account,1001,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_1002,*string,Account,1002,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_1003,*string,Account,1003,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_1003_1001,*string,Account,1003,2014-07-29T15:00:00Z -cgrates.org,FLTR_ACNT_1003_1001,*string,RunID,*default, -cgrates.org,FLTR_ACNT_1003_1001,*string,Destination,1001, +cgrates.org,FLTR_RES,*string,~Account,1001;1002;1003,2014-07-29T15:00:00Z +cgrates.org,FLTR_DST_FS,*string,~Account,1001,2014-07-29T15:00:00Z +cgrates.org,FLTR_DST_FS,*destinations,~Destination,DST_FS, +cgrates.org,FLTR_ACNT_1001_1002,*string,~Account,1001;1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_1001_1002,*string,~RunID,*default, +cgrates.org,FLTR_ACNT_1001_1002,*string,~Destination,1001;1002;1003, +cgrates.org,FLTR_ACNT_1001,*string,~Account,1001,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_1002,*string,~Account,1002,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_1003,*string,~Account,1003,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_1003_1001,*string,~Account,1003,2014-07-29T15:00:00Z +cgrates.org,FLTR_ACNT_1003_1001,*string,~RunID,*default, +cgrates.org,FLTR_ACNT_1003_1001,*string,~Destination,1001,