From 422ad62b62d313e61e68fb6597dfd5059c0f39eb Mon Sep 17 00:00:00 2001 From: adragusin Date: Wed, 29 Jan 2020 11:05:04 +0200 Subject: [PATCH] updated configs after changing from *composed to *variable --- data/conf/samples/ers_mongo/cgrates.json | 18 +++++----- data/conf/samples/ers_mysql/cgrates.json | 10 +++--- data/conf/samples/ers_postgres/cgrates.json | 18 +++++----- data/conf/samples/radagent_mysql/cgrates.json | 36 +++++++++---------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index 35ea40b52..d7cf6b793 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -283,15 +283,15 @@ {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "type": "*variable", "value": "~OriginID"}, - {"tag": "OrderID", "type": "*variable", "value": "~OrderID"}, - {"tag": "RequestType", "type": "*variable", "value": "~RequestType"}, - {"tag": "Account", "type": "*variable", "value": "~Account"}, - {"tag": "Destination", "type": "*variable", "value": "~Destination"}, - {"tag": "SetupTime", "type": "*variable", "value": "~SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "type": "*variable", "value": "~AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "type": "*variable", "value": "~Usage"}, - {"tag": "Cost", "type": "*variable", "value": "~Cost","rounding_decimals":5}, + {"tag": "OriginID", "type": "*composed", "value": "~OriginID"}, + {"tag": "OrderID", "type": "*composed", "value": "~OrderID"}, + {"tag": "RequestType", "type": "*composed", "value": "~RequestType"}, + {"tag": "Account", "type": "*composed", "value": "~Account"}, + {"tag": "Destination", "type": "*composed", "value": "~Destination"}, + {"tag": "SetupTime", "type": "*composed", "value": "~SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "type": "*composed", "value": "~AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "type": "*composed", "value": "~Usage"}, + {"tag": "Cost", "type": "*composed", "value": "~Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index e35f49437..c232bdadd 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -273,11 +273,11 @@ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*rated", "mandatory": true}, {"tag": "Tenant", "field_id": "Tenant", "type": "*constant", "value": "cgrates.org", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.0:s/^49([1-9]\\d+)$/0$1/", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.1:s/^00(\\d+)$/+$1/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.4", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.4", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6:s/^(\\d+)$/${1}s/", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.0:s/^49([1-9]\\d+)$/0$1/", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.1:s/^00(\\d+)$/+$1/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.4", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.4", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6:s/^(\\d+)$/${1}s/", "mandatory": true}, {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index aeedaae30..f639221b2 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -277,15 +277,15 @@ {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "type": "*variable", "value": "~OriginID"}, - {"tag": "OrderID", "type": "*variable", "value": "~OrderID"}, - {"tag": "RequestType", "type": "*variable", "value": "~RequestType"}, - {"tag": "Account", "type": "*variable", "value": "~Account"}, - {"tag": "Destination", "type": "*variable", "value": "~Destination"}, - {"tag": "SetupTime", "type": "*variable", "value": "~SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "type": "*variable", "value": "~AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "type": "*variable", "value": "~Usage"}, - {"tag": "Cost", "type": "*variable", "value": "~Cost","rounding_decimals":5}, + {"tag": "OriginID", "type": "*composed", "value": "~OriginID"}, + {"tag": "OrderID", "type": "*composed", "value": "~OrderID"}, + {"tag": "RequestType", "type": "*composed", "value": "~RequestType"}, + {"tag": "Account", "type": "*composed", "value": "~Account"}, + {"tag": "Destination", "type": "*composed", "value": "~Destination"}, + {"tag": "SetupTime", "type": "*composed", "value": "~SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "type": "*composed", "value": "~AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "type": "*composed", "value": "~Usage"}, + {"tag": "Cost", "type": "*composed", "value": "~Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/radagent_mysql/cgrates.json b/data/conf/samples/radagent_mysql/cgrates.json index 444cd3216..540cbb331 100644 --- a/data/conf/samples/radagent_mysql/cgrates.json +++ b/data/conf/samples/radagent_mysql/cgrates.json @@ -74,21 +74,21 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", + {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*variable", + {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.User-Name", "mandatory": true}, {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*variable", + {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*variable", + {"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*composed", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -100,19 +100,19 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", + {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "field_id": "OriginHost", "type": "*variable", + {"tag": "OriginHost", "field_id": "OriginHost", "type": "*composed", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*variable", + {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.User-Name", "mandatory": true}, {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*variable", + {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "field_id": "RemoteAddr", "type": "*remote_host"}, ], @@ -126,19 +126,19 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", + {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "field_id": "OriginHost", "type": "*variable", + {"tag": "OriginHost", "field_id": "OriginHost", "type": "*composed", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*variable", + {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.User-Name", "mandatory": true}, {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*variable", + {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true},