From 6fea2b3e6ba4fcc697dad8c0620317a31534aec9 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 15 Mar 2019 16:00:07 +0200 Subject: [PATCH] Updated configs samples --- .../samples/acc_balance_keep/cgrates.json | 30 ---------------- data/conf/samples/apier/apier.json | 20 ----------- data/conf/samples/cdrewithfilter/cgrates.json | 34 ------------------- data/conf/samples/mongoreplica/cgrates.json | 28 --------------- data/conf/samples/smgeneric/cgrates.json | 21 ------------ data/conf/samples/tutmongo/cgrates.json | 28 --------------- data/conf/samples/tutmongojson/cgrates.json | 28 --------------- data/conf/samples/tutmongonew/cgrates.json | 28 --------------- data/conf/samples/tutmysql/cgrates.json | 28 --------------- data/conf/samples/tutmysql2/cgrates.json | 27 --------------- .../samples/tutmysql_internal/cgrates.json | 28 --------------- data/conf/samples/tutmysqljson/cgrates.json | 28 --------------- general_tests/cdre_it_test.go | 1 - general_tests/costs1_test.go | 3 ++ 14 files changed, 3 insertions(+), 329 deletions(-) diff --git a/data/conf/samples/acc_balance_keep/cgrates.json b/data/conf/samples/acc_balance_keep/cgrates.json index e1c11d4b2..e9e085523 100644 --- a/data/conf/samples/acc_balance_keep/cgrates.json +++ b/data/conf/samples/acc_balance_keep/cgrates.json @@ -29,36 +29,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "aliases": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_aliases": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/apier/apier.json b/data/conf/samples/apier/apier.json index bec74b10c..6d6c96f60 100644 --- a/data/conf/samples/apier/apier.json +++ b/data/conf/samples/apier/apier.json @@ -10,26 +10,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "lcr_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, -}, - "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/data/conf/samples/cdrewithfilter/cgrates.json b/data/conf/samples/cdrewithfilter/cgrates.json index 483e0881b..4953f4cad 100755 --- a/data/conf/samples/cdrewithfilter/cgrates.json +++ b/data/conf/samples/cdrewithfilter/cgrates.json @@ -26,40 +26,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "lcr_rules": {"limit": 10000, "ttl":"0s", "precache": true}, - "cdr_stats": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "resource_filter_revindexes" : {"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "stat_filter_revindexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_revindexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_revindexes" :{"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_revindexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/mongoreplica/cgrates.json b/data/conf/samples/mongoreplica/cgrates.json index 0e63ab041..07c5272dc 100755 --- a/data/conf/samples/mongoreplica/cgrates.json +++ b/data/conf/samples/mongoreplica/cgrates.json @@ -36,34 +36,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/smgeneric/cgrates.json b/data/conf/samples/smgeneric/cgrates.json index 835c9ec0c..59745303a 100644 --- a/data/conf/samples/smgeneric/cgrates.json +++ b/data/conf/samples/smgeneric/cgrates.json @@ -18,27 +18,6 @@ }, - -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, -}, - - "rals": { "enabled": true, // enable Rater service: }, diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index 81ee3f368..0c9c2e97e 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -29,34 +29,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/tutmongojson/cgrates.json b/data/conf/samples/tutmongojson/cgrates.json index fa7044d27..430f0d77e 100644 --- a/data/conf/samples/tutmongojson/cgrates.json +++ b/data/conf/samples/tutmongojson/cgrates.json @@ -30,32 +30,4 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - } \ No newline at end of file diff --git a/data/conf/samples/tutmongonew/cgrates.json b/data/conf/samples/tutmongonew/cgrates.json index 7458ca1ee..351b7de23 100644 --- a/data/conf/samples/tutmongonew/cgrates.json +++ b/data/conf/samples/tutmongonew/cgrates.json @@ -29,34 +29,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/tutmysql/cgrates.json b/data/conf/samples/tutmysql/cgrates.json index 66896b054..2bc2120eb 100644 --- a/data/conf/samples/tutmysql/cgrates.json +++ b/data/conf/samples/tutmysql/cgrates.json @@ -25,34 +25,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/tutmysql2/cgrates.json b/data/conf/samples/tutmysql2/cgrates.json index 5bf088697..9a0cb8382 100644 --- a/data/conf/samples/tutmysql2/cgrates.json +++ b/data/conf/samples/tutmysql2/cgrates.json @@ -51,33 +51,6 @@ }, -"cdre": { - "amqp_localhost": { - "export_format": "*amqp_json_map", - "export_path": "amqp://guest:guest@localhost:5672/?queue_id=cgrates_cdrs", - "content_fields": [ - {"field_id": "CGRID", "type": "*variable", "value": "~CGRID"}, - {"field_id": "RunID", "type": "*variable", "value": "~RunID"}, - {"field_id": "ToR", "type": "*variable", "value": "~ToR"}, - {"field_id": "OriginID", "type": "*variable", "value": "~OriginID"}, - {"field_id": "OriginHost", "type": "*variable", "value": "~OriginHost"}, - {"field_id": "RequestType", "type": "*variable", "value": "~RequestType", }, - {"field_id": "Tenant", "type": "*variable", "value": "~Tenant"}, - {"field_id": "Category", "type": "*variable", "value": "~Category"}, - {"field_id": "Account", "type": "*variable", "value": "~Account"}, - {"field_id": "Destination", "type": "*variable", "value": "~Destination"}, - {"field_id": "SetupTime", "type": "*variable", "value": "~SetupTime"}, - {"field_id": "AnswerTime", "type": "*variable", "value": "~AnswerTime"}, - {"field_id": "Usage", "type": "*variable", "value": "~Usage"}, - {"field_id": "Cost", "type": "*variable", "value": "~Cost"}, - {"field_id": "PayPalAccount", "type": "*variable", "value": "~PayPalAccount"}, - {"field_id": "LCRProfile", "type": "*variable", "value": "~LCRProfile", }, - {"field_id": "ResourceID", "type": "*variable", "value": "~ResourceID", }, - ], - }, -}, - - "cdrc": [ { "id": "tutorial_csv_cdr", diff --git a/data/conf/samples/tutmysql_internal/cgrates.json b/data/conf/samples/tutmysql_internal/cgrates.json index e4a29daa8..544e64943 100644 --- a/data/conf/samples/tutmysql_internal/cgrates.json +++ b/data/conf/samples/tutmysql_internal/cgrates.json @@ -25,34 +25,6 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - "rals": { "enabled": true, "thresholds_conns": [ diff --git a/data/conf/samples/tutmysqljson/cgrates.json b/data/conf/samples/tutmysqljson/cgrates.json index 88eeb07c5..10993496d 100644 --- a/data/conf/samples/tutmysqljson/cgrates.json +++ b/data/conf/samples/tutmysqljson/cgrates.json @@ -27,32 +27,4 @@ }, -"cache":{ - "destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, -}, - - } \ No newline at end of file diff --git a/general_tests/cdre_it_test.go b/general_tests/cdre_it_test.go index 77e239c98..b287cba9b 100644 --- a/general_tests/cdre_it_test.go +++ b/general_tests/cdre_it_test.go @@ -77,7 +77,6 @@ func testCDREInitCfg(t *testing.T) { t.Error(err) } cdreCfg.DataFolderPath = cdreDataDir - config.SetCgrConfig(cdreCfg) cdreDelay = 1000 } diff --git a/general_tests/costs1_test.go b/general_tests/costs1_test.go index d36a407d4..e0122f28b 100644 --- a/general_tests/costs1_test.go +++ b/general_tests/costs1_test.go @@ -20,11 +20,14 @@ package general_tests import ( "testing" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" ) func TestCosts1SetStorage(t *testing.T) { + config.CgrConfig().CacheCfg()[utils.CacheRatingPlans].Precache = true // precache rating plan + data, _ := engine.NewMapStorageJson() dataDB = engine.NewDataManager(data) engine.SetDataStorage(dataDB)