From 6c084bef7066ed6e6e73ca863832959955a7ee97 Mon Sep 17 00:00:00 2001 From: TeoV Date: Sat, 29 Feb 2020 09:46:06 +0200 Subject: [PATCH] Remove duplicate configurations --- .../samples/sessions_internal/cgrates.json | 1 + data/conf/samples/sessions_mongo/cgrates.json | 1 + data/conf/samples/sessions_mysql/cgrates.json | 1 + data/conf/samples/smg_internal/cgrates.json | 78 ---------------- .../samples/smg_internal_gob/cgrates.json | 85 ------------------ data/conf/samples/smg_mongo/cgrates.json | 82 ----------------- data/conf/samples/smg_mongo_gob/cgrates.json | 89 ------------------- data/conf/samples/smg_mysql/cgrates.json | 78 ---------------- data/conf/samples/smg_mysql_gob/cgrates.json | 85 ------------------ .../conf/samples/smgeneric_mysql/cgrates.json | 75 ---------------- general_tests/tut_smgeneric_it_test.go | 2 +- sessions/sessions_data_it_test.go | 6 +- sessions/sessions_it_test.go | 6 +- sessions/sessions_voice_it_test.go | 6 +- 14 files changed, 13 insertions(+), 582 deletions(-) delete mode 100644 data/conf/samples/smg_internal/cgrates.json delete mode 100644 data/conf/samples/smg_internal_gob/cgrates.json delete mode 100644 data/conf/samples/smg_mongo/cgrates.json delete mode 100644 data/conf/samples/smg_mongo_gob/cgrates.json delete mode 100644 data/conf/samples/smg_mysql/cgrates.json delete mode 100644 data/conf/samples/smg_mysql_gob/cgrates.json delete mode 100644 data/conf/samples/smgeneric_mysql/cgrates.json diff --git a/data/conf/samples/sessions_internal/cgrates.json b/data/conf/samples/sessions_internal/cgrates.json index 13547275a..8ade0d271 100644 --- a/data/conf/samples/sessions_internal/cgrates.json +++ b/data/conf/samples/sessions_internal/cgrates.json @@ -89,6 +89,7 @@ "stats_conns": ["*internal"], "suppliers_conns": ["*internal"], "attributes_conns": ["*internal"], + "alterable_fields": ["Extra1"] }, diff --git a/data/conf/samples/sessions_mongo/cgrates.json b/data/conf/samples/sessions_mongo/cgrates.json index 247adb773..980598061 100644 --- a/data/conf/samples/sessions_mongo/cgrates.json +++ b/data/conf/samples/sessions_mongo/cgrates.json @@ -94,6 +94,7 @@ "stats_conns": ["*internal"], "suppliers_conns": ["*internal"], "attributes_conns": ["*internal"], + "alterable_fields": ["Extra1"], }, diff --git a/data/conf/samples/sessions_mysql/cgrates.json b/data/conf/samples/sessions_mysql/cgrates.json index bb384275e..bf8a7da6b 100644 --- a/data/conf/samples/sessions_mysql/cgrates.json +++ b/data/conf/samples/sessions_mysql/cgrates.json @@ -90,6 +90,7 @@ "stats_conns": ["*internal"], "suppliers_conns": ["*internal"], "attributes_conns": ["*internal"], + "alterable_fields": ["Extra1"] }, diff --git a/data/conf/samples/smg_internal/cgrates.json b/data/conf/samples/smg_internal/cgrates.json deleted file mode 100644 index 05f686459..000000000 --- a/data/conf/samples/smg_internal/cgrates.json +++ /dev/null @@ -1,78 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"data_db": { - "db_type": "*internal", -}, - - -"stor_db": { - "db_type": "*internal", -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, - "store_interval": "-1", -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["*localhost"], - "cdrs_conns": ["*localhost"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smg_internal_gob/cgrates.json b/data/conf/samples/smg_internal_gob/cgrates.json deleted file mode 100644 index db7f064ef..000000000 --- a/data/conf/samples/smg_internal_gob/cgrates.json +++ /dev/null @@ -1,85 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"rpc_conns": { - "conn1": { - "strategy": "*first", - "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], - }, -}, - -"data_db": { - "db_type": "*internal", -}, - - -"stor_db": { - "db_type": "*internal", -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, - "store_interval": "-1", -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["conn1"], - "cdrs_conns": ["conn1"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smg_mongo/cgrates.json b/data/conf/samples/smg_mongo/cgrates.json deleted file mode 100644 index caff0235d..000000000 --- a/data/conf/samples/smg_mongo/cgrates.json +++ /dev/null @@ -1,82 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"data_db": { // database used to store runtime data (eg: accounts, cdr stats) - "db_type": "mongo", // stor database type to use: - "db_port": 27017, // the port to reach the stordb - "db_name": "datadb", - "db_password": "", -}, - -"stor_db": { - "db_type": "mongo", // stor database type to use: - "db_port": 27017, // the port to reach the stordb - "db_name": "stordb", - "db_password": "", -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["*localhost"], - "cdrs_conns": ["*localhost"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smg_mongo_gob/cgrates.json b/data/conf/samples/smg_mongo_gob/cgrates.json deleted file mode 100644 index 0c06dc028..000000000 --- a/data/conf/samples/smg_mongo_gob/cgrates.json +++ /dev/null @@ -1,89 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"rpc_conns": { - "conn1": { - "strategy": "*first", - "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], - }, -}, - -"data_db": { // database used to store runtime data (eg: accounts, cdr stats) - "db_type": "mongo", // stor database type to use: - "db_port": 27017, // the port to reach the stordb - "db_name": "datadb", - "db_password": "", -}, - -"stor_db": { - "db_type": "mongo", // stor database type to use: - "db_port": 27017, // the port to reach the stordb - "db_name": "stordb", - "db_password": "", -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["conn1"], - "cdrs_conns": ["conn1"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smg_mysql/cgrates.json b/data/conf/samples/smg_mysql/cgrates.json deleted file mode 100644 index 7f1d7170f..000000000 --- a/data/conf/samples/smg_mysql/cgrates.json +++ /dev/null @@ -1,78 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"data_db": { - "db_type": "redis", - "db_port": 6379, - "db_name": "10", -}, - -"stor_db": { // database used to store offline tariff plans and CDRs - "db_password": "CGRateS.org", // password to use when connecting to stordb -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["*localhost"], - "cdrs_conns": ["*localhost"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smg_mysql_gob/cgrates.json b/data/conf/samples/smg_mysql_gob/cgrates.json deleted file mode 100644 index 29cc00172..000000000 --- a/data/conf/samples/smg_mysql_gob/cgrates.json +++ /dev/null @@ -1,85 +0,0 @@ -{ -// CGRateS Configuration file -// -// Used for cgradmin -// Starts rater, scheduler - -"general": { - "log_level": 7, -}, - -"listen": { - "rpc_json": ":2012", // RPC JSON listening address - "rpc_gob": ":2013", // RPC GOB listening address - "http": ":2080", // HTTP listening address -}, - -"rpc_conns": { - "conn1": { - "strategy": "*first", - "conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}], - }, -}, - -"data_db": { - "db_type": "redis", - "db_port": 6379, - "db_name": "10", -}, - -"stor_db": { // database used to store offline tariff plans and CDRs - "db_password": "CGRateS.org", // password to use when connecting to stordb -}, - -"rals": { - "enabled": true, // enable Rater service: - "max_computed_usage": { // do not compute usage higher than this, prevents memory overload - "*any": "189h", - "*voice": "72h", - "*data": "102400", - "*sms": "10000" - }, -}, - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - -"resources": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - -"suppliers": { - "enabled": true, -}, - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - -"sessions": { - "enabled": true, - "session_ttl": "50ms", - "rals_conns": ["conn1"], - "cdrs_conns": ["conn1"], - "chargers_conns": ["*internal"], - "alterable_fields": ["Extra1"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/data/conf/samples/smgeneric_mysql/cgrates.json b/data/conf/samples/smgeneric_mysql/cgrates.json deleted file mode 100644 index 18ffa7597..000000000 --- a/data/conf/samples/smgeneric_mysql/cgrates.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - -// Real-time Charging System for Telecom & ISP environments -// Copyright (C) ITsysCOM GmbH -// -// This file contains the default configuration hardcoded into CGRateS. -// This is what you get when you load CGRateS with an empty configuration file. - - "listen": { - "rpc_json": "0.0.0.0:3012", // RPC JSON listening address - "rpc_gob": "0.0.0.0:3013", // RPC GOB listening address - "http": "0.0.0.0:3080", // HTTP listening address - }, - -"rpc_conns": { - "conn1": { - "strategy": "*first", - "conns": [ - {"address": "127.0.0.1:3012", "transport":"*json"} - ], - }, -}, - - -"stor_db": { // database used to store offline tariff plans and CDRs - "db_password": "CGRateS.org", // password to use when connecting to stordb -}, - - -"rals": { - "enabled": true, // enable Rater service: -}, - - -"schedulers": { - "enabled": true, // start Scheduler service: -}, - - -"cdrs": { - "enabled": true, // start the CDR Server service: -}, - - -"attributes": { - "enabled": true, -}, - - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - - -"sessions": { - "enabled": true, // starts SessionManager service: - "rals_conns": ["*internal"], - "cdrs_conns": ["*internal"], - "chargers_conns": ["*internal"], -}, - - -"users": { - "enabled": true, // starts User service: . -}, - -"apiers": { - "enabled": true, - "caches_conns":["conn1"], - "scheduler_conns": ["*internal"], -}, - - -} diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index ae2394b2b..058bbcc66 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -57,7 +57,7 @@ func TestTutSMG(t *testing.T) { case utils.MetaInternal: t.SkipNow() case utils.MetaMySQL: - tutSMGCfgDIR = "smgeneric_mysql" + tutSMGCfgDIR = "sessions_mysql" case utils.MetaMongo: t.SkipNow() case utils.MetaPostgres: diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index c5e0dc243..6fbd8799c 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -57,11 +57,11 @@ var ( func TestSessionsData(t *testing.T) { switch *dbType { case utils.MetaInternal: - dataCfgDIR = "smg_internal" + dataCfgDIR = "sessions_internal" case utils.MetaMySQL: - dataCfgDIR = "smg_mysql" + dataCfgDIR = "sessions_mysql" case utils.MetaMongo: - dataCfgDIR = "smg_mongo" + dataCfgDIR = "sessions_mongo" case utils.MetaPostgres: t.SkipNow() default: diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index b0ea9e085..361928a6d 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -55,11 +55,11 @@ var ( func TestSessionsIt(t *testing.T) { switch *dbType { case utils.MetaInternal: - sItCfgDIR = "smg_internal" + sItCfgDIR = "sessions_internal" case utils.MetaMySQL: - sItCfgDIR = "smg_mysql" + sItCfgDIR = "sessions_mysql" case utils.MetaMongo: - sItCfgDIR = "smg_mongo" + sItCfgDIR = "sessions_mongo" case utils.MetaPostgres: t.SkipNow() default: diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 620304c38..6d7e60ed9 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -60,11 +60,11 @@ var ( func TestSessionsVoice(t *testing.T) { switch *dbType { case utils.MetaInternal: - voiceCfgDIR = "smg_internal" + voiceCfgDIR = "sessions_internal" case utils.MetaMySQL: - voiceCfgDIR = "smg_mysql" + voiceCfgDIR = "sessions_mysql" case utils.MetaMongo: - voiceCfgDIR = "smg_mongo" + voiceCfgDIR = "sessions_mongo" case utils.MetaPostgres: t.SkipNow() default: