diff --git a/data/conf/samples/session_volume_discount_internal/cgrates.json b/data/conf/samples/session_volume_discount_internal/cgrates.json index bf4210a05..69da052a4 100644 --- a/data/conf/samples/session_volume_discount_internal/cgrates.json +++ b/data/conf/samples/session_volume_discount_internal/cgrates.json @@ -17,13 +17,12 @@ "sessions": { "enabled": true, - "routes_conns": ["*internal"], - "cdrs_conns": ["*internal"], + "routes_conns": ["*localhost"], + "cdrs_conns": ["*localhost"], }, "attributes": { "enabled": true, - "indexed_selects": false, "opts":{ // "*processRuns": { // number of run loops when processing event "": 2, @@ -34,30 +33,41 @@ "cdrs": { // CDRs config "enabled": true, "accounts_conns":["*localhost"], - "rates_conns": ["*internal"], - "chargers_conns":["*internal"], - "opts": { // + "rates_conns": ["*localhost"], + "chargers_conns":["*localhost"], + "opts": { + /* // "*chargerS": { // "": true, }, + */ + "*chargerS": { // + "": true, + }, + "*rateS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": false, + "": true, + }, + "*accountS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": true, + "": false, + }, }, }, "chargers": { "enabled": true, - "attributes_conns": ["*internal"], - "indexed_selects": false, + "attributes_conns": ["*localhost"], }, "rates": { "enabled": true, - "rate_indexed_selects": false, + }, "accounts": { "enabled": true, - "rates_conns": ["*internal"], - "indexed_selects": false, + "rates_conns": ["*localhost"], }, "loaders": [ @@ -71,12 +81,14 @@ }, ], - "routes": { - "enabled": true, - "indexed_selects": false, - "rates_conns": ["*internal"], // connections to RateS - "accounts_conns": ["*localhost"], // connections to AccountS - }, + "routes": { + "enabled": true, + "accounts_conns": ["*localhost"], + "rates_conns": ["*localhost"], + "default_opts":{ + "*ignoreErrors": true + } + }, "admins": { "enabled": true, diff --git a/data/conf/samples/session_volume_discount_mongo/cgrates.json b/data/conf/samples/session_volume_discount_mongo/cgrates.json index 045a88567..712446668 100644 --- a/data/conf/samples/session_volume_discount_mongo/cgrates.json +++ b/data/conf/samples/session_volume_discount_mongo/cgrates.json @@ -21,13 +21,12 @@ "sessions": { "enabled": true, - "routes_conns": ["*internal"], - "cdrs_conns": ["*internal"], + "routes_conns": ["*localhost"], + "cdrs_conns": ["*localhost"], }, "attributes": { "enabled": true, - "indexed_selects": false, "opts":{ // "*processRuns": { // number of run loops when processing event "": 2, @@ -38,30 +37,36 @@ "cdrs": { // CDRs config "enabled": true, "accounts_conns":["*localhost"], - "rates_conns": ["*internal"], - "chargers_conns":["*internal"], - "opts": { // + "rates_conns": ["*localhost"], + "chargers_conns":["*localhost"], + "opts": + { // "*chargerS": { // "": true, + }, + "*rateS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": false, + "": true, }, + "*accountS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": true, + "": false, + }, }, }, "chargers": { "enabled": true, - "attributes_conns": ["*internal"], - "indexed_selects": false, + "attributes_conns": ["*localhost"], }, "rates": { "enabled": true, - "rate_indexed_selects": false, }, "accounts": { "enabled": true, - "rates_conns": ["*internal"], - "indexed_selects": false, + "rates_conns": ["*localhost"], }, "loaders": [ @@ -78,8 +83,11 @@ "routes": { "enabled": true, "indexed_selects": false, - "rates_conns": ["*internal"], // connections to RateS - "accounts_conns": ["*localhost"], // connections to AccountS + "accounts_conns": ["*localhost"], + "rates_conns": ["*localhost"], + "default_opts":{ + "*ignoreErrors": true + } }, "admins": { diff --git a/data/conf/samples/session_volume_discount_mysql/cgrates.json b/data/conf/samples/session_volume_discount_mysql/cgrates.json index 69527b41b..4d7715b95 100644 --- a/data/conf/samples/session_volume_discount_mysql/cgrates.json +++ b/data/conf/samples/session_volume_discount_mysql/cgrates.json @@ -19,13 +19,12 @@ "sessions": { "enabled": true, - "routes_conns": ["*internal"], - "cdrs_conns": ["*internal"], + "routes_conns": ["*localhost"], + "cdrs_conns": ["*localhost"], }, "attributes": { "enabled": true, - "indexed_selects": false, "opts":{ // "*processRuns": { // number of run loops when processing event "": 2, @@ -36,30 +35,40 @@ "cdrs": { // CDRs config "enabled": true, "accounts_conns":["*localhost"], - "rates_conns": ["*internal"], - "chargers_conns":["*internal"], - "opts": { // + "rates_conns": ["*localhost"], + "chargers_conns":["*localhost"], + "opts": { + /* // "*chargerS": { // "": true, }, + */ + "*chargerS": { // + "": true, + }, + "*rateS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": false, + "": true, + }, + "*accountS": { + "*string:~*req.Account:dan.bogos;*string:~*req.RunID:supplier": true, + "": false, + }, }, }, "chargers": { "enabled": true, - "attributes_conns": ["*internal"], - "indexed_selects": false, + "attributes_conns": ["*localhost"], }, "rates": { "enabled": true, - "rate_indexed_selects": false, }, "accounts": { "enabled": true, - "rates_conns": ["*internal"], - "indexed_selects": false, + "rates_conns": ["*localhost"], }, "loaders": [ @@ -72,15 +81,18 @@ "lockfile_path": "", }, ], + + "routes": { + "enabled": true, + "indexed_selects": false, + "accounts_conns": ["*localhost"], + "rates_conns": ["*localhost"], + "default_opts":{ + "*ignoreErrors": true + } + }, - "routes": { - "enabled": true, - "indexed_selects": false, - "rates_conns": ["*internal"], // connections to RateS - "accounts_conns": ["*localhost"], // connections to AccountS - }, - - "admins": { - "enabled": true, - }, + "admins": { + "enabled": true, + }, } \ No newline at end of file diff --git a/data/tariffplans/sessions_discount_volume/Chargers.csv b/data/tariffplans/sessions_discount_volume/Chargers.csv index 19839819e..9833d16d2 100644 --- a/data/tariffplans/sessions_discount_volume/Chargers.csv +++ b/data/tariffplans/sessions_discount_volume/Chargers.csv @@ -1,5 +1,5 @@ #Tenant,ID,FilterIDs,Weight,RunID,AttributeIDs -cgrates.org,CHRG_SUPPLIER,,20,supplier,*constant:*opts.*rateS:true +cgrates.org,CHRG_SUPPLIER,,20,supplier,*none -cgrates.org,CHRG_CUSTOMER,,10,customer,ATTR_ACCOUNTS;ATTR_RATES +cgrates.org,CHRG_CUSTOMER,,10,customer,*none diff --git a/data/tariffplans/sessions_discount_volume/Routes.csv b/data/tariffplans/sessions_discount_volume/Routes.csv index c777ba610..9252fb4e4 100644 --- a/data/tariffplans/sessions_discount_volume/Routes.csv +++ b/data/tariffplans/sessions_discount_volume/Routes.csv @@ -1,6 +1,6 @@ #Tenant,ID,FilterIDs,Weight,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRateProfileIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters -cgrates.org,RP1,*string:~*req.Account:ACCOUNT1,,*lc,,,,,,,,,, +cgrates.org,RP1,*string:~*req.Account:dan.bogos,,*lc,,,,,,,,,, cgrates.org,RP1,,,,,ROUTE1,,ACCOUNT1,,,,,, cgrates.org,RP1,,,,,ROUTE2,,,RP_ROUTE2,,,,,