From da9c00d50a2139fcb5f9b6aedb300c537b691ffc Mon Sep 17 00:00:00 2001 From: adragusin Date: Tue, 28 Jan 2020 15:35:41 +0200 Subject: [PATCH] Changed *composed fields into *variable in templates --- config/config_defaults.go | 42 ++++---- data/conf/cgrates/cgrates.json | 96 ++++--------------- .../conf/samples/diamagent_internal/data.json | 34 +++---- .../samples/diamagent_internal/dryrun.json | 20 ++-- .../samples/diamagent_internal/message.json | 12 +-- .../samples/diamagent_internal/simpa.json | 6 +- .../samples/diamagent_internal/voice.json | 36 +++---- data/conf/samples/diamagent_mongo/data.json | 34 +++---- data/conf/samples/diamagent_mongo/dryrun.json | 20 ++-- .../conf/samples/diamagent_mongo/message.json | 12 +-- data/conf/samples/diamagent_mongo/simpa.json | 6 +- data/conf/samples/diamagent_mongo/voice.json | 36 +++---- data/conf/samples/diamagent_mysql/data.json | 34 +++---- data/conf/samples/diamagent_mysql/dryrun.json | 20 ++-- .../conf/samples/diamagent_mysql/message.json | 12 +-- data/conf/samples/diamagent_mysql/simpa.json | 6 +- data/conf/samples/diamagent_mysql/voice.json | 36 +++---- .../samples/diamsctpagent_internal/data.json | 34 +++---- .../diamsctpagent_internal/dryrun.json | 20 ++-- .../diamsctpagent_internal/message.json | 12 +-- .../samples/diamsctpagent_internal/simpa.json | 6 +- .../samples/diamsctpagent_internal/voice.json | 36 +++---- .../samples/diamsctpagent_mongo/data.json | 34 +++---- .../samples/diamsctpagent_mongo/dryrun.json | 20 ++-- .../samples/diamsctpagent_mongo/message.json | 12 +-- .../samples/diamsctpagent_mongo/simpa.json | 6 +- .../samples/diamsctpagent_mongo/voice.json | 36 +++---- .../samples/diamsctpagent_mysql/data.json | 34 +++---- .../samples/diamsctpagent_mysql/dryrun.json | 20 ++-- .../samples/diamsctpagent_mysql/message.json | 12 +-- .../samples/diamsctpagent_mysql/simpa.json | 6 +- .../samples/diamsctpagent_mysql/voice.json | 36 +++---- .../samples/dispatchers/diamagent/data.json | 34 +++---- .../samples/dispatchers/diamagent/dryrun.json | 20 ++-- .../dispatchers/diamagent/message.json | 12 +-- .../samples/dispatchers/diamagent/simpa.json | 6 +- .../samples/dispatchers/diamagent/voice.json | 36 +++---- data/conf/samples/ers_example/cgrates.json | 24 ++--- data/conf/samples/ers_internal/cgrates.json | 54 +++++------ data/conf/samples/ers_mongo/cgrates.json | 72 +++++++------- data/conf/samples/ers_mysql/cgrates.json | 72 +++++++------- data/conf/samples/ers_postgres/cgrates.json | 72 +++++++------- .../ers_reload/first_reload/cgrates.json | 28 +++--- .../samples/ers_reload/internal/cgrates.json | 22 ++--- .../ers_reload/second_reload/cgrates.json | 58 +++++------ .../samples/httpagent_internal/httpagent.json | 32 +++---- .../httpagent_internal_gob/httpagent.json | 32 +++---- .../samples/httpagent_mongo/httpagent.json | 32 +++---- .../httpagent_mongo_gob/httpagent.json | 32 +++---- .../samples/httpagent_mysql/httpagent.json | 32 +++---- .../httpagent_mysql_gob/httpagent.json | 32 +++---- .../httpagenttls_internal/httpagent.json | 36 +++---- .../httpagenttls_internal_gob/httpagent.json | 36 +++---- .../samples/httpagenttls_mongo/httpagent.json | 36 +++---- .../httpagenttls_mongo_gob/httpagent.json | 36 +++---- .../samples/httpagenttls_mysql/httpagent.json | 36 +++---- .../httpagenttls_mysql_gob/httpagent.json | 36 +++---- data/conf/samples/radagent_mysql/cgrates.json | 36 +++---- general_tests/session3_it_test.go | 1 - 59 files changed, 842 insertions(+), 899 deletions(-) diff --git a/config/config_defaults.go b/config/config_defaults.go index 1d8d8bb39..42c368cbb 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -319,18 +319,18 @@ const CGRATES_CFG_JSON = ` "timezone": "", // timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB> "filters": [], // limit parsing based on the filters "flags": [], // flags to influence the event processing - "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": "~*req.2", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.4", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "~*req.7", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.8", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.9", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.10", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.11", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.12", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.13", "mandatory": true}, + "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": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.4", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "~*req.7", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.8", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.9", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.10", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.11", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.12", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.13", "mandatory": true}, ], "continue": false, // continue to the next template if executed }, @@ -419,27 +419,27 @@ const CGRATES_CFG_JSON = ` "asr_template": "", // enable AbortSession message being sent to client on DisconnectSession "templates":{ // default message templates "*err": [ - {"tag": "SessionId", "field_id": "Session-Id", "type": "*composed", + {"tag": "SessionId", "field_id": "Session-Id", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*composed", + {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*variable", "value": "~*vars.OriginHost", "mandatory": true}, - {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*composed", + {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*variable", "value": "~*vars.OriginRealm", "mandatory": true}, ], "*cca": [ - {"tag": "SessionId", "field_id": "Session-Id", "type": "*composed", + {"tag": "SessionId", "field_id": "Session-Id", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*composed", + {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*variable", "value": "~*vars.OriginHost", "mandatory": true}, - {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*composed", + {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*variable", "value": "~*vars.OriginRealm", "mandatory": true}, - {"tag": "AuthApplicationId", "field_id": "Auth-Application-Id", "type": "*composed", + {"tag": "AuthApplicationId", "field_id": "Auth-Application-Id", "type": "*variable", "value": "~*vars.*appid", "mandatory": true}, - {"tag": "CCRequestType", "field_id": "CC-Request-Type", "type": "*composed", + {"tag": "CCRequestType", "field_id": "CC-Request-Type", "type": "*variable", "value": "~*req.CC-Request-Type", "mandatory": true}, - {"tag": "CCRequestNumber", "field_id": "CC-Request-Number", "type": "*composed", + {"tag": "CCRequestNumber", "field_id": "CC-Request-Number", "type": "*variable", "value": "~*req.CC-Request-Number", "mandatory": true}, ], "*asr": [ diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index 43d808a08..6699d1098 100755 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -279,62 +279,6 @@ // }, -// "cdrc": [ // CDRc config -// { -// "id": "*default", // identifier of the CDRC runner -// "enabled": false, // enable CDR client functionality -// "dry_run": false, // do not send the CDRs to CDRS, just parse them -// "cdrs_conns": ["*internal"], -// "cdr_format": "*file_csv", // CDR file format <*file_csv|*freeswitch_csv|*file_fwv|*opensips_flatstore|*partial_csv|*file_xml> -// "field_separator": ",", // separator used in case of csv files -// "timezone": "", // timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB> -// "run_delay": 0, // sleep interval in seconds between consecutive runs, 0 to use automation via inotify -// "max_open_files": 1024, // maximum simultaneous files to process, 0 for unlimited -// "cdr_in_path": "/var/spool/cgrates/cdrc/in", // absolute path towards the directory where the CDRs are stored -// "cdr_out_path": "/var/spool/cgrates/cdrc/out", // absolute path towards the directory where processed CDRs will be moved -// "failed_calls_prefix": "missed_calls", // used in case of flatstore CDRs to avoid searching for BYE records -// "cdr_root_path": "", // path towards one CDR element in case of XML CDRs -// "cdr_source_id": "cdrc_csv", // free form field, tag identifying the source of the CDRs within CDRS database -// "filters" :[], // limit parsing based on the filters -// "tenant": "", // tenant used by import -// "continue_on_success": false, // continue to the next template if executed -// "partial_record_cache": "10s", // duration to cache partial records when not pairing -// "partial_cache_expiry_action": "*dump_to_file", // action taken when cache when records in cache are timed-out <*dump_to_file|*post_cdr> -// "header_fields": [], // template of the import header fields -// "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": "~*req.2", "mandatory": true}, -// {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.3", "mandatory": true}, -// {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.4", "mandatory": true}, -// {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.6", "mandatory": true}, -// {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "~*req.7", "mandatory": true}, -// {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.8", "mandatory": true}, -// {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.9", "mandatory": true}, -// {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.10", "mandatory": true}, -// {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.11", "mandatory": true}, -// {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.12", "mandatory": true}, -// {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.13", "mandatory": true}, -// ], -// "trailer_fields": [], // template of the import trailer fields -// "cache_dump_fields": [ // template used when dumping cached CDR, eg: partial CDRs -// {"tag": "CGRID", "type": "*composed", "value": "~CGRID"}, -// {"tag": "RunID", "type": "*composed", "value": "~RunID"}, -// {"tag": "TOR", "type": "*composed", "value": "~ToR"}, -// {"tag": "OriginID", "type": "*composed", "value": "~OriginID"}, -// {"tag": "RequestType", "type": "*composed", "value": "~RequestType"}, -// {"tag": "Tenant", "type": "*composed", "value": "~Tenant"}, -// {"tag": "Category", "type": "*composed", "value": "~Category"}, -// {"tag": "Account", "type": "*composed", "value": "~Account"}, -// {"tag": "Subject", "type": "*composed", "value": "~Subject"}, -// {"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"}, -// ], -// }, -// ], - - // "ers": { // EventReaderService // "enabled": false, // starts the EventReader service: // "sessions_conns":["*internal"], // RPC Connections IDs @@ -355,17 +299,17 @@ // "flags": [], // flags to influence the event processing // "header_fields": [], // template of the import header fields // "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": "~*req.2", "mandatory": true}, -// {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.3", "mandatory": true}, -// {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.4", "mandatory": true}, -// {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.6", "mandatory": true}, -// {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "~*req.7", "mandatory": true}, -// {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.8", "mandatory": true}, -// {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.9", "mandatory": true}, -// {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.10", "mandatory": true}, -// {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.11", "mandatory": true}, -// {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.12", "mandatory": true}, -// {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.13", "mandatory": true}, +// {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "~*req.2", "mandatory": true}, +// {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.3", "mandatory": true}, +// {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.4", "mandatory": true}, +// {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.6", "mandatory": true}, +// {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "~*req.7", "mandatory": true}, +// {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.8", "mandatory": true}, +// {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.9", "mandatory": true}, +// {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.10", "mandatory": true}, +// {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.11", "mandatory": true}, +// {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.12", "mandatory": true}, +// {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.13", "mandatory": true}, // ], // "trailer_fields": [], // template of the import trailer fields // "continue": false, // continue to the next template if executed @@ -455,27 +399,27 @@ // "asr_template": "", // enable AbortSession message being sent to client on DisconnectSession // "templates":{ // default message templates // "*err": [ -// {"tag": "SessionId", "field_id": "Session-Id", "type": "*composed", +// {"tag": "SessionId", "field_id": "Session-Id", "type": "*variable", // "value": "~*req.Session-Id", "mandatory": true}, -// {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*composed", +// {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*variable", // "value": "~*vars.OriginHost", "mandatory": true}, -// {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*composed", +// {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*variable", // "value": "~*vars.OriginRealm", "mandatory": true}, // ], // "*cca": [ -// {"tag": "SessionId", "field_id": "Session-Id", "type": "*composed", +// {"tag": "SessionId", "field_id": "Session-Id", "type": "*variable", // "value": "~*req.Session-Id", "mandatory": true}, // {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", // "value": "2001"}, -// {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*composed", +// {"tag": "OriginHost", "field_id": "Origin-Host", "type": "*variable", // "value": "~*vars.OriginHost", "mandatory": true}, -// {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*composed", +// {"tag": "OriginRealm", "field_id": "Origin-Realm", "type": "*variable", // "value": "~*vars.OriginRealm", "mandatory": true}, -// {"tag": "AuthApplicationId", "field_id": "Auth-Application-Id", "type": "*composed", +// {"tag": "AuthApplicationId", "field_id": "Auth-Application-Id", "type": "*variable", // "value": "~*vars.*appid", "mandatory": true}, -// {"tag": "CCRequestType", "field_id": "CC-Request-Type", "type": "*composed", +// {"tag": "CCRequestType", "field_id": "CC-Request-Type", "type": "*variable", // "value": "~*req.CC-Request-Type", "mandatory": true}, -// {"tag": "CCRequestNumber", "field_id": "CC-Request-Number", "type": "*composed", +// {"tag": "CCRequestNumber", "field_id": "CC-Request-Number", "type": "*variable", // "value": "~*req.CC-Request-Number", "mandatory": true}, // ], // "*asr": [ diff --git a/data/conf/samples/diamagent_internal/data.json b/data/conf/samples/diamagent_internal/data.json index 6b191ed7a..58f084359 100644 --- a/data/conf/samples/diamagent_internal/data.json +++ b/data/conf/samples/diamagent_internal/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamagent_internal/dryrun.json b/data/conf/samples/diamagent_internal/dryrun.json index ca076d017..eb38962e3 100644 --- a/data/conf/samples/diamagent_internal/dryrun.json +++ b/data/conf/samples/diamagent_internal/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamagent_internal/message.json b/data/conf/samples/diamagent_internal/message.json index 559fc5754..df97f5342 100644 --- a/data/conf/samples/diamagent_internal/message.json +++ b/data/conf/samples/diamagent_internal/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamagent_internal/simpa.json b/data/conf/samples/diamagent_internal/simpa.json index ddc025359..ea592bab1 100644 --- a/data/conf/samples/diamagent_internal/simpa.json +++ b/data/conf/samples/diamagent_internal/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts", "*log"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamagent_internal/voice.json b/data/conf/samples/diamagent_internal/voice.json index 5f5bd32de..f9b5bef58 100644 --- a/data/conf/samples/diamagent_internal/voice.json +++ b/data/conf/samples/diamagent_internal/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamagent_mongo/data.json b/data/conf/samples/diamagent_mongo/data.json index 6b191ed7a..58f084359 100644 --- a/data/conf/samples/diamagent_mongo/data.json +++ b/data/conf/samples/diamagent_mongo/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamagent_mongo/dryrun.json b/data/conf/samples/diamagent_mongo/dryrun.json index ca076d017..eb38962e3 100644 --- a/data/conf/samples/diamagent_mongo/dryrun.json +++ b/data/conf/samples/diamagent_mongo/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamagent_mongo/message.json b/data/conf/samples/diamagent_mongo/message.json index 559fc5754..df97f5342 100644 --- a/data/conf/samples/diamagent_mongo/message.json +++ b/data/conf/samples/diamagent_mongo/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamagent_mongo/simpa.json b/data/conf/samples/diamagent_mongo/simpa.json index ddc025359..ea592bab1 100644 --- a/data/conf/samples/diamagent_mongo/simpa.json +++ b/data/conf/samples/diamagent_mongo/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts", "*log"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamagent_mongo/voice.json b/data/conf/samples/diamagent_mongo/voice.json index 5f5bd32de..f9b5bef58 100644 --- a/data/conf/samples/diamagent_mongo/voice.json +++ b/data/conf/samples/diamagent_mongo/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamagent_mysql/data.json b/data/conf/samples/diamagent_mysql/data.json index 6b191ed7a..58f084359 100644 --- a/data/conf/samples/diamagent_mysql/data.json +++ b/data/conf/samples/diamagent_mysql/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamagent_mysql/dryrun.json b/data/conf/samples/diamagent_mysql/dryrun.json index ca076d017..eb38962e3 100644 --- a/data/conf/samples/diamagent_mysql/dryrun.json +++ b/data/conf/samples/diamagent_mysql/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamagent_mysql/message.json b/data/conf/samples/diamagent_mysql/message.json index 559fc5754..df97f5342 100644 --- a/data/conf/samples/diamagent_mysql/message.json +++ b/data/conf/samples/diamagent_mysql/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamagent_mysql/simpa.json b/data/conf/samples/diamagent_mysql/simpa.json index ddc025359..ea592bab1 100644 --- a/data/conf/samples/diamagent_mysql/simpa.json +++ b/data/conf/samples/diamagent_mysql/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts", "*log"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamagent_mysql/voice.json b/data/conf/samples/diamagent_mysql/voice.json index 5f5bd32de..f9b5bef58 100644 --- a/data/conf/samples/diamagent_mysql/voice.json +++ b/data/conf/samples/diamagent_mysql/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_internal/data.json b/data/conf/samples/diamsctpagent_internal/data.json index 44dd19bab..667911987 100755 --- a/data/conf/samples/diamsctpagent_internal/data.json +++ b/data/conf/samples/diamsctpagent_internal/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamsctpagent_internal/dryrun.json b/data/conf/samples/diamsctpagent_internal/dryrun.json index ca076d017..eb38962e3 100755 --- a/data/conf/samples/diamsctpagent_internal/dryrun.json +++ b/data/conf/samples/diamsctpagent_internal/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamsctpagent_internal/message.json b/data/conf/samples/diamsctpagent_internal/message.json index 559fc5754..df97f5342 100755 --- a/data/conf/samples/diamsctpagent_internal/message.json +++ b/data/conf/samples/diamsctpagent_internal/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_internal/simpa.json b/data/conf/samples/diamsctpagent_internal/simpa.json index bbb483603..de72f0851 100755 --- a/data/conf/samples/diamsctpagent_internal/simpa.json +++ b/data/conf/samples/diamsctpagent_internal/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamsctpagent_internal/voice.json b/data/conf/samples/diamsctpagent_internal/voice.json index 5f5bd32de..f9b5bef58 100755 --- a/data/conf/samples/diamsctpagent_internal/voice.json +++ b/data/conf/samples/diamsctpagent_internal/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_mongo/data.json b/data/conf/samples/diamsctpagent_mongo/data.json index 44dd19bab..667911987 100755 --- a/data/conf/samples/diamsctpagent_mongo/data.json +++ b/data/conf/samples/diamsctpagent_mongo/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamsctpagent_mongo/dryrun.json b/data/conf/samples/diamsctpagent_mongo/dryrun.json index ca076d017..eb38962e3 100755 --- a/data/conf/samples/diamsctpagent_mongo/dryrun.json +++ b/data/conf/samples/diamsctpagent_mongo/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamsctpagent_mongo/message.json b/data/conf/samples/diamsctpagent_mongo/message.json index 559fc5754..df97f5342 100755 --- a/data/conf/samples/diamsctpagent_mongo/message.json +++ b/data/conf/samples/diamsctpagent_mongo/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_mongo/simpa.json b/data/conf/samples/diamsctpagent_mongo/simpa.json index bbb483603..de72f0851 100755 --- a/data/conf/samples/diamsctpagent_mongo/simpa.json +++ b/data/conf/samples/diamsctpagent_mongo/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamsctpagent_mongo/voice.json b/data/conf/samples/diamsctpagent_mongo/voice.json index 5f5bd32de..f9b5bef58 100755 --- a/data/conf/samples/diamsctpagent_mongo/voice.json +++ b/data/conf/samples/diamsctpagent_mongo/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_mysql/data.json b/data/conf/samples/diamsctpagent_mysql/data.json index 44dd19bab..667911987 100755 --- a/data/conf/samples/diamsctpagent_mysql/data.json +++ b/data/conf/samples/diamsctpagent_mysql/data.json @@ -10,16 +10,16 @@ "flags": ["*initiate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -37,19 +37,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -70,19 +70,19 @@ "flags": ["*update", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -102,18 +102,18 @@ "flags": ["*terminate", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/diamsctpagent_mysql/dryrun.json b/data/conf/samples/diamsctpagent_mysql/dryrun.json index ca076d017..eb38962e3 100755 --- a/data/conf/samples/diamsctpagent_mysql/dryrun.json +++ b/data/conf/samples/diamsctpagent_mysql/dryrun.json @@ -11,17 +11,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -46,17 +46,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/diamsctpagent_mysql/message.json b/data/conf/samples/diamsctpagent_mysql/message.json index 559fc5754..df97f5342 100755 --- a/data/conf/samples/diamsctpagent_mysql/message.json +++ b/data/conf/samples/diamsctpagent_mysql/message.json @@ -10,19 +10,19 @@ "flags": ["*message", "*accounts", "*cdrs","*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/diamsctpagent_mysql/simpa.json b/data/conf/samples/diamsctpagent_mysql/simpa.json index bbb483603..de72f0851 100755 --- a/data/conf/samples/diamsctpagent_mysql/simpa.json +++ b/data/conf/samples/diamsctpagent_mysql/simpa.json @@ -10,13 +10,13 @@ "flags": ["*message", "*accounts"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/diamsctpagent_mysql/voice.json b/data/conf/samples/diamsctpagent_mysql/voice.json index 5f5bd32de..f9b5bef58 100755 --- a/data/conf/samples/diamsctpagent_mysql/voice.json +++ b/data/conf/samples/diamsctpagent_mysql/voice.json @@ -10,27 +10,27 @@ "flags": ["*initiate", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -41,29 +41,29 @@ "flags": ["*update", "*accounts", "*attributes"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -74,21 +74,21 @@ "flags": ["*terminate", "*accounts", "*attributes", "*cdrs"], "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/dispatchers/diamagent/data.json b/data/conf/samples/dispatchers/diamagent/data.json index 522db8708..9ed9c3b34 100644 --- a/data/conf/samples/dispatchers/diamagent/data.json +++ b/data/conf/samples/dispatchers/diamagent/data.json @@ -11,16 +11,16 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(1)]", "mandatory": true}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, ], @@ -39,19 +39,19 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "_grp1"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*contant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -73,19 +73,19 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*composed", + {"tag": "InitialOriginID", "field_id": "InitialOriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginID", "field_id": "OriginID", "type": "*constant", "value": "_grp2"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*constant", "value": "2048"}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*sum", @@ -106,18 +106,18 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*data"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, - {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*composed", + {"tag": "OriginIDPrefix", "field_id": "OriginIDPrefix", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, {"tag": "Destination", "field_id": "Destination", "type": "*constant", "value": "data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "LastUsed", "field_id": "LastUsed", "type": "*handler", "handler_id": "*sum", "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Input-Octets;~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Output-Octets"}, diff --git a/data/conf/samples/dispatchers/diamagent/dryrun.json b/data/conf/samples/dispatchers/diamagent/dryrun.json index f6d6103f6..a8c0a3003 100644 --- a/data/conf/samples/dispatchers/diamagent/dryrun.json +++ b/data/conf/samples/dispatchers/diamagent/dryrun.json @@ -12,17 +12,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], @@ -48,17 +48,17 @@ {"tag": "Val1", "field_id": "Val1", "type": "*constant", "value": "1"}, {"tag": "Val2", "field_id": "Val2", "type": "*constant", "value": "2"}, {"tag": "Val3", "field_id": "Val3", "type": "*constant", "value": "3"}, - {"tag": "OptionalField", "field_id":"OptionalField", "type":"*composed", + {"tag": "OptionalField", "field_id":"OptionalField", "type":"*variable", "value":"~*req.Inexistent", "mandatory":false}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits1", "field_id": "UsedUnits1", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(1)]"}, - {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*composed", "mandatory": true, + {"tag": "UsedUnits2", "field_id": "UsedUnits2", "type": "*variable", "mandatory": true, "value": "~*req.Multiple-Services-Credit-Control.Used-Service-Unit.CC-Total-Octets[~Rating-Group(2)]"}, ], diff --git a/data/conf/samples/dispatchers/diamagent/message.json b/data/conf/samples/dispatchers/diamagent/message.json index fe2600129..fe8ddff0d 100644 --- a/data/conf/samples/dispatchers/diamagent/message.json +++ b/data/conf/samples/dispatchers/diamagent/message.json @@ -11,19 +11,19 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*sms"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "sms"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "mandatory": true, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "mandatory": true, "value": "~*req.Service-Information.SMS-Information.Recipient-Address.Address-Data"}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/dispatchers/diamagent/simpa.json b/data/conf/samples/dispatchers/diamagent/simpa.json index 5f4cadac5..ff2a92754 100644 --- a/data/conf/samples/dispatchers/diamagent/simpa.json +++ b/data/conf/samples/dispatchers/diamagent/simpa.json @@ -11,13 +11,13 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*generic"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*prepaid"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "generic"}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "mandatory": true, + {"tag": "Account", "field_id": "Account", "type": "*variable", "mandatory": true, "value": "~*req.Subscription-Id.Subscription-Id-Data[~Subscription-Id-Type(0)]"}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*value_exponent", "mandatory": true, "value": "~*req.Requested-Service-Unit.CC-Money.Unit-Value.Value-Digits;~*req.Requested-Service-Unit.CC-Money.Unit-Value.Exponent"}, diff --git a/data/conf/samples/dispatchers/diamagent/voice.json b/data/conf/samples/dispatchers/diamagent/voice.json index 25182a214..47fee708a 100644 --- a/data/conf/samples/dispatchers/diamagent/voice.json +++ b/data/conf/samples/dispatchers/diamagent/voice.json @@ -11,27 +11,27 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -43,29 +43,29 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.Requested-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], "field_id": "Result-Code", "type": "*constant", "value": "5030", "blocker": true}, {"tag": "ResultCode", "field_id": "Result-Code", "type": "*constant", "value": "2001"}, - {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*composed", + {"tag": "GrantedUnits", "field_id": "Granted-Service-Unit.CC-Time", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -77,21 +77,21 @@ "request_fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice"}, {"tag": "*api_key", "field_id": "*api_key", "type": "*constant", "value": "ses12345"}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Session-Id", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*attributes"}, {"tag": "Account", "field_id": "Account", "type": "*constant", "value": "*attributes"}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Service-Information.IN-Information.Real-Called-Number", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*cc_usage", "mandatory": true, "value": "~*req.CC-Request-Number;~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/;5m"}, - {"tag": "LastUsed", "field_id": "LastUsed", "type": "*composed", + {"tag": "LastUsed", "field_id": "LastUsed", "type": "*variable", "value": "~*req.Used-Service-Unit.CC-Time:s/(.*)/${1}s/", "mandatory": true}, - {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*composed", + {"tag": "SubscriberID", "field_id": "SubscriberId", "type": "*variable", "value": "~*req.Subscription-Id.Subscription-Id-Data", "mandatory": true}, ], "reply_fields":[ diff --git a/data/conf/samples/ers_example/cgrates.json b/data/conf/samples/ers_example/cgrates.json index 394926b3e..d5ec60610 100644 --- a/data/conf/samples/ers_example/cgrates.json +++ b/data/conf/samples/ers_example/cgrates.json @@ -75,18 +75,18 @@ "flags": ["*dryrun"], "source_path": "/tmp/ers/in", "processed_path": "/tmp/ers/out", - "fields":[ - {"tag": "TOR", "field_id": "ToR", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.4", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "~*req.7", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.8", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.9", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.10", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.11", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.12", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.13", "mandatory": true}, + "fields":[ + {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.4", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "~*req.7", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.8", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.9", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.10", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.11", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.12", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.13", "mandatory": true}, ], }, ], diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index 6b6f48e54..d1bf29499 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -94,19 +94,19 @@ "processed_path": "/tmp/ers2/out", "fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -181,20 +181,20 @@ "filters":["*string:~*req.3:1002"], "fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, {"tag": "Source", "field_id": "Source", "type": "*constant", "value": "ers_csv", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -334,7 +334,7 @@ "partial_record_cache": "2s", "fields":[ {"tag": "Tor", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.7", "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}, @@ -344,7 +344,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*variable", "mandatory": true}, // Value for Usage is composed based on record - {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*composed", "value": "~*req.4; ;~*req.5", "mandatory": true}, + {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*variable", "value": "~*req.4; ;~*req.5", "mandatory": true}, {"tag": "DialogId", "field_id": "DialogId", "type": "*variable", "value": "~*req.11"} ], } diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index d562f3a9c..35ea40b52 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -97,19 +97,19 @@ "processed_path": "/tmp/ers2/out", "fields":[ {"tag": "TOR", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -184,20 +184,20 @@ "filters":["*string:~*req.3:1002"], "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": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, {"tag": "Source", "field_id": "Source", "type": "*constant", "value": "ers_csv", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -283,15 +283,15 @@ {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"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}, + {"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}, ], }, { @@ -337,7 +337,7 @@ "partial_record_cache": "2s", "fields":[ {"tag": "Tor", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.7", "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}, @@ -347,7 +347,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*variable", "mandatory": true}, // Value for Usage is composed based on record - {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*composed", "value": "~*req.4; ;~*req.5", "mandatory": true}, + {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*variable", "value": "~*req.4; ;~*req.5", "mandatory": true}, {"tag": "DialogId", "field_id": "DialogId", "type": "*variable", "value": "~*req.11"} ], } diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index a5edafdfb..0f97a8abf 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -94,19 +94,19 @@ "processed_path": "/tmp/ers2/out", "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": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -181,20 +181,20 @@ "filters":["*string:~*req.3:1002"], "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": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, {"tag": "Source", "field_id": "Source", "type": "*constant", "value": "ers_csv", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -281,15 +281,15 @@ {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"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}, + {"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}, ], }, { @@ -335,7 +335,7 @@ "partial_record_cache": "2s", "fields":[ {"tag": "Tor", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.7", "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}, @@ -345,7 +345,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*variable", "mandatory": true}, // Value for Usage is composed based on record - {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*composed", "value": "~*req.4; ;~*req.5", "mandatory": true}, + {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*variable", "value": "~*req.4; ;~*req.5", "mandatory": true}, {"tag": "DialogId", "field_id": "DialogId", "type": "*variable", "value": "~*req.11"} ], } diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index 62d2861da..aeedaae30 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -91,19 +91,19 @@ "processed_path": "/tmp/ers2/out", "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": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -178,20 +178,20 @@ "filters":["*string:~*req.3:1002"], "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": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, {"tag": "Source", "field_id": "Source", "type": "*constant", "value": "ers_csv", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -277,15 +277,15 @@ {"tag": "Partial", "field_id": "Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"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}, + {"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}, ], }, { @@ -331,7 +331,7 @@ "partial_record_cache": "2s", "fields":[ {"tag": "Tor", "field_id": "ToR", "type": "*constant", "value": "*voice", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable","value":"~*req.3;~*req.1;~*req.2", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.7", "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}, @@ -341,7 +341,7 @@ {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.6", "mandatory": true}, {"tag": "Usage", "field_id": "Usage", "type": "*variable", "mandatory": true}, // Value for Usage is composed based on record - {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*composed", "value": "~*req.4; ;~*req.5", "mandatory": true}, + {"tag": "DisconnectCause", "field_id": "DisconnectCause", "type": "*variable", "value": "~*req.4; ;~*req.5", "mandatory": true}, {"tag": "DialogId", "field_id": "DialogId", "type": "*variable", "value": "~*req.11"} ], } diff --git a/data/conf/samples/ers_reload/first_reload/cgrates.json b/data/conf/samples/ers_reload/first_reload/cgrates.json index 08912bc04..1c530752c 100644 --- a/data/conf/samples/ers_reload/first_reload/cgrates.json +++ b/data/conf/samples/ers_reload/first_reload/cgrates.json @@ -85,20 +85,20 @@ "flags": ["*cdrs","*log"], "processed_path": "/tmp/ers2/out", "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": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "*voice", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, ], diff --git a/data/conf/samples/ers_reload/internal/cgrates.json b/data/conf/samples/ers_reload/internal/cgrates.json index 980056792..96b0160d1 100644 --- a/data/conf/samples/ers_reload/internal/cgrates.json +++ b/data/conf/samples/ers_reload/internal/cgrates.json @@ -76,17 +76,17 @@ "source_path": "/tmp/ers/in", "processed_path": "/tmp/ers/out", "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": "~*req.2", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.4", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "~*req.7", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.8", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.9", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.10", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.11", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.12", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.13", "mandatory": true}, + {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.4", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "~*req.7", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.8", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.9", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.10", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.11", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.12", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.13", "mandatory": true}, ], }, ], diff --git a/data/conf/samples/ers_reload/second_reload/cgrates.json b/data/conf/samples/ers_reload/second_reload/cgrates.json index 2bd726030..435245b76 100644 --- a/data/conf/samples/ers_reload/second_reload/cgrates.json +++ b/data/conf/samples/ers_reload/second_reload/cgrates.json @@ -85,20 +85,20 @@ "flags": ["*dryrun"], "processed_path": "/tmp/ers2/out", "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": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "*voice", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, { @@ -173,21 +173,21 @@ "flags": ["*cdrs","*log"], "filters":["*string:~*req.3: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": "~*req.0", "mandatory": true}, - {"tag": "RequestType", "field_id": "RequestType", "type": "*composed", "value": "~*req.1", "mandatory": true}, - {"tag": "Tenant", "field_id": "Tenant", "type": "*composed", "value": "~*req.2", "mandatory": true}, - {"tag": "Category", "field_id": "Category", "type": "*composed", "value": "call", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Source", "field_id": "Source", "type": "*composed", "value": "ers_csv", "mandatory": true}, - {"tag": "Subject", "field_id": "Subject", "type": "*composed", "value": "~*req.3", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", "value": "~*req.5", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*composed", "value": "~*req.6", "mandatory": true}, - {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*composed", "value": "~*req.6", "mandatory": true}, + {"tag": "TOR", "field_id": "ToR", "type": "*variable", "value": "*voice", "mandatory": true}, + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.0", "mandatory": true}, + {"tag": "RequestType", "field_id": "RequestType", "type": "*variable", "value": "~*req.1", "mandatory": true}, + {"tag": "Tenant", "field_id": "Tenant", "type": "*variable", "value": "~*req.2", "mandatory": true}, + {"tag": "Category", "field_id": "Category", "type": "*variable", "value": "call", "mandatory": true}, + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Source", "field_id": "Source", "type": "*variable", "value": "ers_csv", "mandatory": true}, + {"tag": "Subject", "field_id": "Subject", "type": "*variable", "value": "~*req.3", "mandatory": true}, + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.4:s/0([1-9]\\d+)/+49${1}/", "mandatory": true}, + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.5", "mandatory": true}, + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra3", "field_id": "HDRExtra3", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra2", "field_id": "HDRExtra2", "type": "*variable", "value": "~*req.6", "mandatory": true}, + {"tag": "HDRExtra1", "field_id": "HDRExtra1", "type": "*variable", "value": "~*req.6", "mandatory": true}, ], }, ], diff --git a/data/conf/samples/httpagent_internal/httpagent.json b/data/conf/samples/httpagent_internal/httpagent.json index 48c2d4f3f..2a3af6db1 100644 --- a/data/conf/samples/httpagent_internal/httpagent.json +++ b/data/conf/samples/httpagent_internal/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagent_internal_gob/httpagent.json b/data/conf/samples/httpagent_internal_gob/httpagent.json index 708fa58d4..1a347a29c 100644 --- a/data/conf/samples/httpagent_internal_gob/httpagent.json +++ b/data/conf/samples/httpagent_internal_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagent_mongo/httpagent.json b/data/conf/samples/httpagent_mongo/httpagent.json index 48c2d4f3f..2a3af6db1 100644 --- a/data/conf/samples/httpagent_mongo/httpagent.json +++ b/data/conf/samples/httpagent_mongo/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagent_mongo_gob/httpagent.json b/data/conf/samples/httpagent_mongo_gob/httpagent.json index 708fa58d4..1a347a29c 100644 --- a/data/conf/samples/httpagent_mongo_gob/httpagent.json +++ b/data/conf/samples/httpagent_mongo_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagent_mysql/httpagent.json b/data/conf/samples/httpagent_mysql/httpagent.json index 48c2d4f3f..2a3af6db1 100644 --- a/data/conf/samples/httpagent_mysql/httpagent.json +++ b/data/conf/samples/httpagent_mysql/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagent_mysql_gob/httpagent.json b/data/conf/samples/httpagent_mysql_gob/httpagent.json index 708fa58d4..1a347a29c 100644 --- a/data/conf/samples/httpagent_mysql_gob/httpagent.json +++ b/data/conf/samples/httpagent_mysql_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_internal/httpagent.json b/data/conf/samples/httpagenttls_internal/httpagent.json index 7df9f5e06..447fa298b 100755 --- a/data/conf/samples/httpagenttls_internal/httpagent.json +++ b/data/conf/samples/httpagenttls_internal/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_internal_gob/httpagent.json b/data/conf/samples/httpagenttls_internal_gob/httpagent.json index e2e9ea92f..32640dfe2 100755 --- a/data/conf/samples/httpagenttls_internal_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_internal_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_mongo/httpagent.json b/data/conf/samples/httpagenttls_mongo/httpagent.json index 7df9f5e06..447fa298b 100755 --- a/data/conf/samples/httpagenttls_mongo/httpagent.json +++ b/data/conf/samples/httpagenttls_mongo/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_mongo_gob/httpagent.json b/data/conf/samples/httpagenttls_mongo_gob/httpagent.json index e2e9ea92f..32640dfe2 100755 --- a/data/conf/samples/httpagenttls_mongo_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_mongo_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_mysql/httpagent.json b/data/conf/samples/httpagenttls_mysql/httpagent.json index 7df9f5e06..447fa298b 100755 --- a/data/conf/samples/httpagenttls_mysql/httpagent.json +++ b/data/conf/samples/httpagenttls_mysql/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/httpagenttls_mysql_gob/httpagent.json b/data/conf/samples/httpagenttls_mysql_gob/httpagent.json index e2e9ea92f..32640dfe2 100755 --- a/data/conf/samples/httpagenttls_mysql_gob/httpagent.json +++ b/data/conf/samples/httpagenttls_mysql_gob/httpagent.json @@ -38,11 +38,11 @@ {"tag": "Category", "field_id": "Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CallID", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.Msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Destination", "mandatory": true}, {"tag": "SetupTime", "field_id": "SetupTime", "type": "*constant", "value": "*now", "mandatory": true}, @@ -50,7 +50,7 @@ "reply_fields":[ {"tag": "Allow", "field_id": "response.Allow", "type": "*constant", "value": "1", "mandatory": true}, - {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", + {"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*variable", "value": "~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -62,25 +62,25 @@ "request_fields":[ {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "OriginHost", "field_id": "OriginHost", "type": "*remote_host", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.msisdn", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.destination", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.timestamp", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.leg_duration;s", "mandatory": true}, ], "reply_fields":[ {"tag": "ResultCode", "filters": ["*rsr::~*cgrep.Error(!^$)"], - "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*composed", "value": "~*cgrep.Error", "blocker": true}, - {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*composed", + "field_id": "CDR_RESPONSE.RESULT_CODE", "type": "*variable", "value": "~*cgrep.Error", "blocker": true}, + {"tag": "CDR_ID", "field_id": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, {"tag": "CDR_STATUS", "field_id": "CDR_RESPONSE.CDR_STATUS", "type": "*constant", "value": "1", "mandatory": true}, @@ -104,17 +104,17 @@ "value": "*data", "mandatory": true}, {"tag": "RequestType", "field_id": "RequestType", "type": "*constant", "value": "*pseudoprepaid", "mandatory": true}, - {"tag": "OriginID", "field_id": "OriginID", "type": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.complete-datasession-notification.customerid", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "value": "~*req.complete-datasession-notification.username", "mandatory": true}, - {"tag": "Destination", "field_id": "Destination", "type": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.complete-datasession-notification.userid", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.complete-datasession-notification.createtime", "mandatory": true}, - {"tag": "Usage", "field_id": "Usage", "type": "*composed", + {"tag": "Usage", "field_id": "Usage", "type": "*variable", "value": "~*req.complete-datasession-notification.callleg.bytes", "mandatory": true}, ], "reply_fields":[], diff --git a/data/conf/samples/radagent_mysql/cgrates.json b/data/conf/samples/radagent_mysql/cgrates.json index 540cbb331..444cd3216 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": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "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": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*variable", "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": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "field_id": "OriginHost", "type": "*composed", + {"tag": "OriginHost", "field_id": "OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "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": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "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": "*composed", + {"tag": "OriginID", "field_id": "OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "field_id": "OriginHost", "type": "*composed", + {"tag": "OriginHost", "field_id": "OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "field_id": "Account", "type": "*composed", + {"tag": "Account", "field_id": "Account", "type": "*variable", "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": "*composed", + {"tag": "Destination", "field_id": "Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "field_id": "SetupTime", "type": "*composed", + {"tag": "SetupTime", "field_id": "SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "field_id": "AnswerTime", "type": "*variable", "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}, diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index f28a229e4..81c1fc72c 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -55,7 +55,6 @@ var ( testSes3ItAddVoiceBalance, testSes3ItTerminatWithoutInit, - // testSes3ItInitAfterTerminate, testSes3ItBalance, testSes3ItCDRs,