From ce810971627db2facdc6b9134c48f0bcecce76f9 Mon Sep 17 00:00:00 2001 From: adragusin Date: Wed, 5 Feb 2020 17:20:57 +0200 Subject: [PATCH] Updated filters in configs --- data/conf/samples/diamagent_internal/data.json | 6 +++--- data/conf/samples/diamagent_internal/dryrun.json | 2 +- data/conf/samples/diamagent_internal/message.json | 2 +- data/conf/samples/diamagent_internal/voice.json | 6 +++--- data/conf/samples/diamagent_mongo/data.json | 6 +++--- data/conf/samples/diamagent_mongo/dryrun.json | 2 +- data/conf/samples/diamagent_mongo/message.json | 2 +- data/conf/samples/diamagent_mongo/voice.json | 6 +++--- data/conf/samples/diamagent_mysql/data.json | 6 +++--- data/conf/samples/diamagent_mysql/dryrun.json | 2 +- data/conf/samples/diamagent_mysql/message.json | 2 +- data/conf/samples/diamagent_mysql/voice.json | 6 +++--- data/conf/samples/diamsctpagent_internal/data.json | 6 +++--- data/conf/samples/diamsctpagent_internal/dryrun.json | 2 +- data/conf/samples/diamsctpagent_internal/message.json | 2 +- data/conf/samples/diamsctpagent_internal/voice.json | 6 +++--- data/conf/samples/diamsctpagent_mongo/data.json | 6 +++--- data/conf/samples/diamsctpagent_mongo/dryrun.json | 2 +- data/conf/samples/diamsctpagent_mongo/message.json | 2 +- data/conf/samples/diamsctpagent_mongo/voice.json | 6 +++--- data/conf/samples/diamsctpagent_mysql/data.json | 6 +++--- data/conf/samples/diamsctpagent_mysql/dryrun.json | 2 +- data/conf/samples/diamsctpagent_mysql/message.json | 2 +- data/conf/samples/diamsctpagent_mysql/voice.json | 6 +++--- data/conf/samples/dispatchers/diamagent/data.json | 6 +++--- data/conf/samples/dispatchers/diamagent/dryrun.json | 2 +- data/conf/samples/dispatchers/diamagent/message.json | 2 +- data/conf/samples/dispatchers/diamagent/voice.json | 6 +++--- data/conf/samples/httpagent_internal/httpagent.json | 2 +- data/conf/samples/httpagent_internal_gob/httpagent.json | 2 +- data/conf/samples/httpagent_mongo/httpagent.json | 2 +- data/conf/samples/httpagent_mongo_gob/httpagent.json | 2 +- data/conf/samples/httpagent_mysql/httpagent.json | 2 +- data/conf/samples/httpagent_mysql_gob/httpagent.json | 2 +- data/conf/samples/httpagenttls_internal/httpagent.json | 2 +- data/conf/samples/httpagenttls_internal_gob/httpagent.json | 2 +- data/conf/samples/httpagenttls_mongo/httpagent.json | 2 +- data/conf/samples/httpagenttls_mongo_gob/httpagent.json | 2 +- data/conf/samples/httpagenttls_mysql/httpagent.json | 2 +- data/conf/samples/httpagenttls_mysql_gob/httpagent.json | 2 +- data/tariffplans/cluelrn/Attributes.csv | 6 +++--- 41 files changed, 71 insertions(+), 71 deletions(-) diff --git a/data/conf/samples/diamagent_internal/data.json b/data/conf/samples/diamagent_internal/data.json index daa4bca47..aa11150d8 100644 --- a/data/conf/samples/diamagent_internal/data.json +++ b/data/conf/samples/diamagent_internal/data.json @@ -76,7 +76,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -180,7 +180,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -285,7 +285,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_internal/dryrun.json b/data/conf/samples/diamagent_internal/dryrun.json index e01b360e0..e42442702 100644 --- a/data/conf/samples/diamagent_internal/dryrun.json +++ b/data/conf/samples/diamagent_internal/dryrun.json @@ -109,7 +109,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ { diff --git a/data/conf/samples/diamagent_internal/message.json b/data/conf/samples/diamagent_internal/message.json index cba51bbaf..784707957 100644 --- a/data/conf/samples/diamagent_internal/message.json +++ b/data/conf/samples/diamagent_internal/message.json @@ -76,7 +76,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_internal/voice.json b/data/conf/samples/diamagent_internal/voice.json index 337b751f2..7b444abdc 100644 --- a/data/conf/samples/diamagent_internal/voice.json +++ b/data/conf/samples/diamagent_internal/voice.json @@ -81,7 +81,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -186,7 +186,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -286,7 +286,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mongo/data.json b/data/conf/samples/diamagent_mongo/data.json index daa4bca47..aa11150d8 100644 --- a/data/conf/samples/diamagent_mongo/data.json +++ b/data/conf/samples/diamagent_mongo/data.json @@ -76,7 +76,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -180,7 +180,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -285,7 +285,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mongo/dryrun.json b/data/conf/samples/diamagent_mongo/dryrun.json index e01b360e0..e42442702 100644 --- a/data/conf/samples/diamagent_mongo/dryrun.json +++ b/data/conf/samples/diamagent_mongo/dryrun.json @@ -109,7 +109,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ { diff --git a/data/conf/samples/diamagent_mongo/message.json b/data/conf/samples/diamagent_mongo/message.json index cba51bbaf..784707957 100644 --- a/data/conf/samples/diamagent_mongo/message.json +++ b/data/conf/samples/diamagent_mongo/message.json @@ -76,7 +76,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mongo/voice.json b/data/conf/samples/diamagent_mongo/voice.json index 337b751f2..7b444abdc 100644 --- a/data/conf/samples/diamagent_mongo/voice.json +++ b/data/conf/samples/diamagent_mongo/voice.json @@ -81,7 +81,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -186,7 +186,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -286,7 +286,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mysql/data.json b/data/conf/samples/diamagent_mysql/data.json index daa4bca47..aa11150d8 100644 --- a/data/conf/samples/diamagent_mysql/data.json +++ b/data/conf/samples/diamagent_mysql/data.json @@ -76,7 +76,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -180,7 +180,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -285,7 +285,7 @@ }, { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mysql/dryrun.json b/data/conf/samples/diamagent_mysql/dryrun.json index e01b360e0..e42442702 100644 --- a/data/conf/samples/diamagent_mysql/dryrun.json +++ b/data/conf/samples/diamagent_mysql/dryrun.json @@ -109,7 +109,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ { diff --git a/data/conf/samples/diamagent_mysql/message.json b/data/conf/samples/diamagent_mysql/message.json index cba51bbaf..784707957 100644 --- a/data/conf/samples/diamagent_mysql/message.json +++ b/data/conf/samples/diamagent_mysql/message.json @@ -76,7 +76,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamagent_mysql/voice.json b/data/conf/samples/diamagent_mysql/voice.json index 337b751f2..7b444abdc 100644 --- a/data/conf/samples/diamagent_mysql/voice.json +++ b/data/conf/samples/diamagent_mysql/voice.json @@ -81,7 +81,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -186,7 +186,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", @@ -286,7 +286,7 @@ "reply_fields":[ { "tag": "ResultCode", - "filters": ["*rsr::~*cgrep.Error(!^$)"], + "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", diff --git a/data/conf/samples/diamsctpagent_internal/data.json b/data/conf/samples/diamsctpagent_internal/data.json index 55f9f3e40..a67c877b8 100755 --- a/data/conf/samples/diamsctpagent_internal/data.json +++ b/data/conf/samples/diamsctpagent_internal/data.json @@ -25,7 +25,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -57,7 +57,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -89,7 +89,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_internal/dryrun.json b/data/conf/samples/diamsctpagent_internal/dryrun.json index 99b5c890d..9606545cc 100755 --- a/data/conf/samples/diamsctpagent_internal/dryrun.json +++ b/data/conf/samples/diamsctpagent_internal/dryrun.json @@ -38,7 +38,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ {"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/diamsctpagent_internal/message.json b/data/conf/samples/diamsctpagent_internal/message.json index 62f89092b..c45b0eba4 100755 --- a/data/conf/samples/diamsctpagent_internal/message.json +++ b/data/conf/samples/diamsctpagent_internal/message.json @@ -26,7 +26,7 @@ "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_internal/voice.json b/data/conf/samples/diamsctpagent_internal/voice.json index 25b164ba6..76656c74b 100755 --- a/data/conf/samples/diamsctpagent_internal/voice.json +++ b/data/conf/samples/diamsctpagent_internal/voice.json @@ -27,7 +27,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -60,7 +60,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -92,7 +92,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, ], diff --git a/data/conf/samples/diamsctpagent_mongo/data.json b/data/conf/samples/diamsctpagent_mongo/data.json index 55f9f3e40..a67c877b8 100755 --- a/data/conf/samples/diamsctpagent_mongo/data.json +++ b/data/conf/samples/diamsctpagent_mongo/data.json @@ -25,7 +25,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -57,7 +57,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -89,7 +89,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_mongo/dryrun.json b/data/conf/samples/diamsctpagent_mongo/dryrun.json index 99b5c890d..9606545cc 100755 --- a/data/conf/samples/diamsctpagent_mongo/dryrun.json +++ b/data/conf/samples/diamsctpagent_mongo/dryrun.json @@ -38,7 +38,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ {"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/diamsctpagent_mongo/message.json b/data/conf/samples/diamsctpagent_mongo/message.json index 62f89092b..c45b0eba4 100755 --- a/data/conf/samples/diamsctpagent_mongo/message.json +++ b/data/conf/samples/diamsctpagent_mongo/message.json @@ -26,7 +26,7 @@ "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_mongo/voice.json b/data/conf/samples/diamsctpagent_mongo/voice.json index 25b164ba6..76656c74b 100755 --- a/data/conf/samples/diamsctpagent_mongo/voice.json +++ b/data/conf/samples/diamsctpagent_mongo/voice.json @@ -27,7 +27,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -60,7 +60,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -92,7 +92,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, ], diff --git a/data/conf/samples/diamsctpagent_mysql/data.json b/data/conf/samples/diamsctpagent_mysql/data.json index 55f9f3e40..a67c877b8 100755 --- a/data/conf/samples/diamsctpagent_mysql/data.json +++ b/data/conf/samples/diamsctpagent_mysql/data.json @@ -25,7 +25,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -57,7 +57,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -89,7 +89,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_mysql/dryrun.json b/data/conf/samples/diamsctpagent_mysql/dryrun.json index 99b5c890d..9606545cc 100755 --- a/data/conf/samples/diamsctpagent_mysql/dryrun.json +++ b/data/conf/samples/diamsctpagent_mysql/dryrun.json @@ -38,7 +38,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ {"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/diamsctpagent_mysql/message.json b/data/conf/samples/diamsctpagent_mysql/message.json index 62f89092b..c45b0eba4 100755 --- a/data/conf/samples/diamsctpagent_mysql/message.json +++ b/data/conf/samples/diamsctpagent_mysql/message.json @@ -26,7 +26,7 @@ "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/diamsctpagent_mysql/voice.json b/data/conf/samples/diamsctpagent_mysql/voice.json index 25b164ba6..76656c74b 100755 --- a/data/conf/samples/diamsctpagent_mysql/voice.json +++ b/data/conf/samples/diamsctpagent_mysql/voice.json @@ -27,7 +27,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -60,7 +60,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -92,7 +92,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, ], diff --git a/data/conf/samples/dispatchers/diamagent/data.json b/data/conf/samples/dispatchers/diamagent/data.json index 5e680de86..098bf796c 100644 --- a/data/conf/samples/dispatchers/diamagent/data.json +++ b/data/conf/samples/dispatchers/diamagent/data.json @@ -26,7 +26,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -59,7 +59,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, @@ -92,7 +92,7 @@ ], "reply_fields": [ {"tag": "CCATemplate", "type": "*template", "value": "*cca"}, - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/dispatchers/diamagent/dryrun.json b/data/conf/samples/dispatchers/diamagent/dryrun.json index 54e8a5362..09e04c3b1 100644 --- a/data/conf/samples/dispatchers/diamagent/dryrun.json +++ b/data/conf/samples/dispatchers/diamagent/dryrun.json @@ -39,7 +39,7 @@ }, { "id": "dryrun2", - "filters": ["*rsr::~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0](!^$)"], // make sure the CC-Total-Octets was populated in the previous processor + "filters": ["*notempty:~*rep.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[0]:"], // make sure the CC-Total-Octets was populated in the previous processor "flags": ["*dryrun"], "request_fields":[ {"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*sms"}, diff --git a/data/conf/samples/dispatchers/diamagent/message.json b/data/conf/samples/dispatchers/diamagent/message.json index 9a13cefdc..1814848d5 100644 --- a/data/conf/samples/dispatchers/diamagent/message.json +++ b/data/conf/samples/dispatchers/diamagent/message.json @@ -27,7 +27,7 @@ "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, ], }, diff --git a/data/conf/samples/dispatchers/diamagent/voice.json b/data/conf/samples/dispatchers/diamagent/voice.json index fffb09720..bffbe9fbf 100644 --- a/data/conf/samples/dispatchers/diamagent/voice.json +++ b/data/conf/samples/dispatchers/diamagent/voice.json @@ -28,7 +28,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -62,7 +62,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, {"tag": "GrantedUnits", "path": "*rep.Granted-Service-Unit.CC-Time", "type": "*variable", @@ -95,7 +95,7 @@ "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "path": "*rep.Result-Code", "type": "*constant", "value": "2001"}, ], diff --git a/data/conf/samples/httpagent_internal/httpagent.json b/data/conf/samples/httpagent_internal/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_internal/httpagent.json +++ b/data/conf/samples/httpagent_internal/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagent_internal_gob/httpagent.json b/data/conf/samples/httpagent_internal_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_internal_gob/httpagent.json +++ b/data/conf/samples/httpagent_internal_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagent_mongo/httpagent.json b/data/conf/samples/httpagent_mongo/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_mongo/httpagent.json +++ b/data/conf/samples/httpagent_mongo/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagent_mongo_gob/httpagent.json b/data/conf/samples/httpagent_mongo_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_mongo_gob/httpagent.json +++ b/data/conf/samples/httpagent_mongo_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagent_mysql/httpagent.json b/data/conf/samples/httpagent_mysql/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_mysql/httpagent.json +++ b/data/conf/samples/httpagent_mysql/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagent_mysql_gob/httpagent.json b/data/conf/samples/httpagent_mysql_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagent_mysql_gob/httpagent.json +++ b/data/conf/samples/httpagent_mysql_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_internal/httpagent.json b/data/conf/samples/httpagenttls_internal/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_internal/httpagent.json +++ b/data/conf/samples/httpagenttls_internal/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_internal_gob/httpagent.json b/data/conf/samples/httpagenttls_internal_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_internal_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_internal_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_mongo/httpagent.json b/data/conf/samples/httpagenttls_mongo/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_mongo/httpagent.json +++ b/data/conf/samples/httpagenttls_mongo/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_mongo_gob/httpagent.json b/data/conf/samples/httpagenttls_mongo_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_mongo_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_mongo_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_mysql/httpagent.json b/data/conf/samples/httpagenttls_mysql/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_mysql/httpagent.json +++ b/data/conf/samples/httpagenttls_mysql/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/conf/samples/httpagenttls_mysql_gob/httpagent.json b/data/conf/samples/httpagenttls_mysql_gob/httpagent.json index e623cb867..a9310450a 100644 --- a/data/conf/samples/httpagenttls_mysql_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_mysql_gob/httpagent.json @@ -78,7 +78,7 @@ "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ - {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], + {"tag": "ResultCode", "filters": ["*notempty:~*cgrep.Error:"], "path": "*rep.CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, {"tag": "CDR_ID", "path": "*rep.CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, diff --git a/data/tariffplans/cluelrn/Attributes.csv b/data/tariffplans/cluelrn/Attributes.csv index cc128ac6e..5e8686d31 100644 --- a/data/tariffplans/cluelrn/Attributes.csv +++ b/data/tariffplans/cluelrn/Attributes.csv @@ -1,8 +1,8 @@ #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight cgrates.org,LRN_Dst3125650565,lrn,*string:~*req.Destination:3125650565,,,*req.Destination,*constant,13128543000,false,10 cgrates.org,LRN_Dst3125650565,,,,,*req.OriginalDestination,*constant,3125650565,false,10 -cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:~*req.Destination:13128543000;*rsr::~*req.OriginalDestination(!^$),,,*req.DestinationLATA,*constant,358,false,20 -cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:~*req.Account:9174269000;*rsr::~*req.DestinationLATA(!^$),,,*req.CallerLATA,*constant,132,false,30 +cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:~*req.Destination:13128543000;*notempty:~*req.OriginalDestination:,,,*req.DestinationLATA,*constant,358,false,20 +cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:~*req.Account:9174269000;*notempty:~*req.DestinationLATA:,,,*req.CallerLATA,*constant,132,false,30 cgrates.org,LRN_JURISDICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,,*req.LRNJurisdiction,*constant,INTRA,false,50 cgrates.org,LRN_JURISDICTION_IL,lrn,FLTR_INTRALATA_ILLINOIS,,,*req.LRNJurisdiction,*constant,INTRA,false,50 -cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:~*req.Destination:13128543000;*rsr::~*req.CallerLATA(!^$),,,*req.LRNJurisdiction,*constant,INTER,false,40 +cgrates.org,LRN_JURISDICTION_INTER,lrn,*string:~*req.Destination:13128543000;*notempty:~*req.CallerLATA:,,,*req.LRNJurisdiction,*constant,INTER,false,40