From 917ecb62abe74281c48c541f75807b36b13af22e Mon Sep 17 00:00:00 2001 From: gezimbll Date: Thu, 6 Nov 2025 11:53:37 +0100 Subject: [PATCH] disabling offline internal in integration tests --- agents/agent_caps_it_test.go | 6 +- agents/diam_prom_it_test.go | 10 ++-- agents/diambench_test.go | 10 ++-- apis/cores_it_test.go | 21 +++---- attributes/attributes_it_test.go | 10 ++-- cdrs/cdrs_it_test.go | 10 ++-- cmd/cgr-loader/cgr-loader_it_test.go | 58 ++++++++++++++----- config/config.go | 12 +++- config/datadbcfg.go | 4 +- .../acc_generaltest_internal/cgrates.json | 10 ++-- .../samples/actions_internal/cgradmin.json | 6 +- .../actions_internal_gob/cgradmin.json | 6 +- .../apis_actions_internal/cgrates.json | 10 ++-- .../apis_chargers_internal/cgrates.json | 10 ++-- .../samples/apis_config_internal/cgrates.json | 10 ++-- .../apis_loaders_internal/cgrates.json | 8 +-- .../samples/apis_srvmng_internal/cgrates.json | 8 +-- .../samples/attr_test_internal/cgrates.json | 10 ++-- .../samples/attributes_internal/cgrates.json | 10 ++-- .../samples/cdrsv1processevent/cgrates.json | 8 +-- data/conf/samples/cdrsv2internal/cgrates.json | 6 +- .../cdrsv_failover_internal/cgrates.json | 8 +-- .../cfg_rld_rates_internal/cgrates.json | 8 +-- data/conf/samples/core_config/cgrates.json | 8 +-- .../dataconverter_internal/cgrates.json | 8 +-- .../cgrates.json | 12 ++-- .../diamagent_internal_gobbirpc/cgrates.json | 6 +- .../diamagent_internal_jsonbirpc/cgrates.json | 6 +- .../diamagent_internal_supp_apps/cgrates.json | 7 +-- .../diamsctpagent_internal/cgrates.json | 6 +- .../samples/dnsagent_internal/cgrates.json | 8 +-- .../samples/ees_blocker_internal/cgrates.json | 8 +-- data/conf/samples/ees_cloud/cgrates.json | 8 +-- data/conf/samples/ees_elastic/cgrates.json | 10 ++-- data/conf/samples/ees_internal/cgrates.json | 6 +- .../samples/efs/efs_internal/cgrates.json | 8 +-- data/conf/samples/ers_internal/cgrates.json | 10 ++-- .../cgrates.json | 8 +-- .../samples/ers_mysql_filters/cgrates.json | 8 +-- .../ers_mysql_meta_delete/cgrates.json | 8 +-- data/conf/samples/ers_mysql_move/cgrates.json | 9 ++- .../samples/ers_mysql_raw_update/cgrates.json | 8 +-- .../samples/ers_mysql_update/cgrates.json | 8 +-- data/conf/samples/ers_nats/cgrates.json | 10 ++-- .../ers_reload/disabled_internal/cgrates.json | 8 +-- .../export_it_test_internal/cgrates.json | 8 +-- .../filter_indexes_internal/cgrates.json | 8 +-- .../internal/cgrates.json | 8 +-- .../samples/filters_internal/cgrates.json | 8 +-- .../samples/fltr_sep_internal/cgrates.json | 12 ++-- data/conf/samples/gocs/au_site/cgrates.json | 10 ++-- .../samples/httpagent_internal/cgrates.json | 10 ++-- .../httpagenttls_internal/cgrates.json | 10 ++-- .../cgrates.json | 6 +- data/conf/samples/janus_agent/cgrates.json | 8 +-- .../samples/loaders/tutinternal/cgrates.json | 8 +-- .../loaders_indexes_internal_db/cgrates.json | 10 ++-- .../loaders_old2new_internal/cgrates.json | 8 +-- data/conf/samples/multiple_dbs/cgrates.json | 12 ++-- .../samples/multiple_dbs_mongo/cgrates.json | 10 ++-- .../samples/multiral1_internal/cgrates.json | 9 +-- .../samples/multiral2_internal/cgrates.json | 8 +-- .../samples/offline_internal/cgrates.json | 12 ++-- .../offline_internal_limit/cgrates.json | 14 ++--- .../samples/offline_internal_ms/cgrates.json | 12 ++-- .../offline_internal_ms_limit/cgrates.json | 14 ++--- .../offline_internal_ms_rewrite/cgrates.json | 12 ++-- .../cgrates.json | 12 ++-- .../cgrates.json | 12 ++-- .../cgrates.json | 12 ++-- .../offline_internal_rewrite/cgrates.json | 12 ++-- .../cgrates.json | 14 ++--- .../offline_internal_rewrite_ms/cgrates.json | 12 ++-- .../cgrates.json | 14 ++--- .../samples/preload_internal/cgrates.json | 10 ++-- .../samples/radagent_internal/cgrates.json | 8 +-- .../radagent_internal_gob/cgrates.json | 6 +- data/conf/samples/radius_ipam/cgrates.json | 8 +-- data/conf/samples/radius_status/cgrates.json | 8 +-- .../samples/rankings_internal/cgrates.json | 8 +-- data/conf/samples/rates_internal/cgrates.json | 8 +-- .../samples/resources_internal/cgrates.json | 8 +-- .../routes_cases_internal/cgrates.json | 8 +-- .../routes_generaltests_internal/cgrates.json | 8 +-- .../conf/samples/routes_internal/cgrates.json | 10 ++-- data/conf/samples/sessinternal/cgrates.json | 8 +-- .../cgrates.json | 8 +-- .../samples/sessions_internal/cgrates.json | 10 ++-- .../cgrates.json | 8 +-- .../cgrates.json | 8 +-- .../samples/sipagent_internal/cgrates.json | 8 +-- .../cgrates.json | 8 +-- data/conf/samples/stats_internal/cgrates.json | 8 +-- .../samples/thresholds_internal/cgrates.json | 8 +-- data/conf/samples/tp_internal/cgrates.json | 10 ++-- data/conf/samples/tpe_internal/cgrates.json | 8 +-- .../samples/tut_session_internal/cgrates.json | 8 +-- data/conf/samples/tutinternal/cgrates.json | 10 ++-- .../conf/samples/tutinternal_gob/cgrates.json | 6 +- .../conf/samples/tutinternal_new/cgrates.json | 9 ++- data/conf/samples/tutmongo/cgrates.json | 4 +- efs/efs_it_test.go | 8 +-- ers/ers_it_test.go | 10 ++-- ers/nats_it_test.go | 10 ++-- general_tests/analyzers_doc_it_test.go | 10 ++-- general_tests/ers_sql_filters_it_test.go | 8 +-- general_tests/ers_start_delay_it_test.go | 10 ++-- general_tests/ips_load_test.go | 21 +++---- general_tests/ips_prf_it_test.go | 9 +-- general_tests/kafka_ssl_it_test.go | 8 +-- general_tests/multiple_dbs_it_test.go | 4 +- general_tests/prometheus_it_test.go | 16 ++--- general_tests/radius_ipam_it_test.go | 8 +-- general_tests/rpcexp_opts_it_test.go | 16 ++--- general_tests/service_toggle_it_test.go | 8 +-- general_tests/shared_client_lock_it_test.go | 8 +-- general_tests/trends_schedule_it_test.go | 8 +-- ips/ips_it_test.go | 10 ++-- sessions/basics_it_test.go | 20 +++---- 119 files changed, 598 insertions(+), 555 deletions(-) diff --git a/agents/agent_caps_it_test.go b/agents/agent_caps_it_test.go index 2172a971c..37bf209fb 100644 --- a/agents/agent_caps_it_test.go +++ b/agents/agent_caps_it_test.go @@ -57,7 +57,11 @@ func TestDiameterAgentCapsIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBDumpInterval": "0", + "internalDBRewriteInterval": "0" + } } }, }, diff --git a/agents/diam_prom_it_test.go b/agents/diam_prom_it_test.go index 20066cdee..77172075f 100644 --- a/agents/diam_prom_it_test.go +++ b/agents/diam_prom_it_test.go @@ -55,12 +55,12 @@ func TestDiamPrometheus(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, "sessions": { diff --git a/agents/diambench_test.go b/agents/diambench_test.go index db186be8a..52bc774bd 100644 --- a/agents/diambench_test.go +++ b/agents/diambench_test.go @@ -60,13 +60,13 @@ func BenchmarkDiameterCaps(b *testing.B) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "cores": { "caps": %d, diff --git a/apis/cores_it_test.go b/apis/cores_it_test.go index 9dd549170..cb3e87649 100644 --- a/apis/cores_it_test.go +++ b/apis/cores_it_test.go @@ -53,13 +53,14 @@ func TestCoreSProfilingFlags(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } + } }` @@ -188,12 +189,12 @@ func TestCoreSProfilingAPI(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } },}`, Encoding: *utils.Encoding, diff --git a/attributes/attributes_it_test.go b/attributes/attributes_it_test.go index 834803c5d..ad5724088 100644 --- a/attributes/attributes_it_test.go +++ b/attributes/attributes_it_test.go @@ -2249,13 +2249,13 @@ func TestAttributesArith(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "admins": { "enabled": true diff --git a/cdrs/cdrs_it_test.go b/cdrs/cdrs_it_test.go index d31a4d1f2..633f65a2e 100644 --- a/cdrs/cdrs_it_test.go +++ b/cdrs/cdrs_it_test.go @@ -73,13 +73,13 @@ cgrates.org,DEFAULT_RATE,,;0,0,0,*free,RT_ALWAYS,,"* * * * *",;0,false,0s,,0.1,1 "db_conns": { "*default": { "db_type": "*internal", - "string_indexed_fields": ["RunID"] + "string_indexed_fields": ["RunID"], + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "rates": { diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index 25780e33b..84a95e814 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -54,20 +54,52 @@ func TestLoadConfig(t *testing.T) { expDBcfg := &config.DbCfg{ DBConns: config.DBConns{ utils.StorDB: &config.DBConn{ - Type: utils.MetaMySQL, - Host: "127.0.0.1", - Port: "3306", - Name: utils.CGRateSLwr, - User: utils.CGRateSLwr, - Password: "CGRateS.org", + Type: utils.MetaMySQL, + Host: "127.0.0.1", + Port: "3306", + Name: utils.CGRateSLwr, + User: utils.CGRateSLwr, + Password: "CGRateS.org", + StringIndexedFields: []string{}, + PrefixIndexedFields: []string{}, + RmtConns: []string{}, + RplConns: []string{}, + Opts: &config.DBOpts{ + InternalDBDumpPath: "/var/lib/cgrates/internal_db/db", + InternalDBBackupPath: "/var/lib/cgrates/internal_db/backup/db", + InternalDBStartTimeout: 300000000000, + InternalDBDumpInterval: time.Minute, + InternalDBRewriteInterval: time.Hour, + InternalDBFileSizeLimit: 1073741824, + RedisMaxConns: 10, + RedisConnectAttempts: 20, + MongoQueryTimeout: 10 * time.Second, + MongoConnScheme: "mongodb", + RedisClusterSync: 5 * time.Second, + RedisClusterOndownDelay: 0, + RedisCluster: false, + RedisPoolPipelineWindow: 150 * time.Microsecond, + RedisTLS: false, + SQLMaxOpenConns: 100, + SQLMaxIdleConns: 10, + SQLLogLevel: 3, + SQLConnMaxLifetime: 0, + SQLDSNParams: map[string]string{}, + PgSSLMode: "disable", + MySQLLocation: "Local", + }, }, utils.MetaDefault: &config.DBConn{ - Type: utils.MetaRedis, - Host: "localhost", - Port: "2012", - Name: "100", - User: "cgrates2", - Password: "toor", + Type: utils.MetaRedis, + Host: "localhost", + Port: "2012", + Name: "100", + User: "cgrates2", + StringIndexedFields: []string{}, + PrefixIndexedFields: []string{}, + RmtConns: []string{}, + RplConns: []string{}, + Password: "toor", Opts: &config.DBOpts{ InternalDBDumpPath: "/var/lib/cgrates/internal_db/db", InternalDBBackupPath: "/var/lib/cgrates/internal_db/backup/db", @@ -111,7 +143,7 @@ func TestLoadConfig(t *testing.T) { ldrCfg := loadConfig() ldrCfg.DbCfg().Items = nil if !reflect.DeepEqual(ldrCfg.DbCfg(), expDBcfg) { - t.Errorf("Expected %s received %s", utils.ToJSON(expDBcfg), utils.ToJSON(ldrCfg.DbCfg())) + t.Errorf("Expected %s \nreceived %s", utils.ToJSON(expDBcfg), utils.ToJSON(ldrCfg.DbCfg())) } if ldrCfg.GeneralCfg().DBDataEncoding != utils.MetaJSON { t.Errorf("Expected %s received %s", utils.MetaJSON, ldrCfg.GeneralCfg().DBDataEncoding) diff --git a/config/config.go b/config/config.go index ff68f66ad..83646e287 100644 --- a/config/config.go +++ b/config/config.go @@ -46,8 +46,9 @@ var ( } getDftRemHstCfg = func() *RemoteHost { return new(RemoteHost) } - getDftEvExpCfg = func() *EventExporterCfg { return &EventExporterCfg{Opts: &EventExporterOpts{}} } - getDftEvRdrCfg = func() *EventReaderCfg { return &EventReaderCfg{Opts: &EventReaderOpts{}} } + getDftEvExpCfg = func() *EventExporterCfg { return &EventExporterCfg{Opts: &EventExporterOpts{}} } + getDftEvRdrCfg = func() *EventReaderCfg { return &EventReaderCfg{Opts: &EventReaderOpts{}} } + getDftDBConnCfg = func() *DBConn { return &DBConn{} } ) func init() { @@ -68,6 +69,13 @@ func init() { } } + for id, dbconnCfg := range cgrCfg.dbCfg.DBConns { + if id == utils.MetaDefault { + getDftDBConnCfg = dbconnCfg.Clone + break + } + } + getDftFsConnCfg = cgrCfg.fsAgentCfg.EventSocketConns[0].Clone // We leave it crashing here on purpose if no Connection defaults defined getDftKamConnCfg = cgrCfg.kamAgentCfg.EvapiConns[0].Clone getDftAstConnCfg = cgrCfg.asteriskAgentCfg.AsteriskConns[0].Clone diff --git a/config/datadbcfg.go b/config/datadbcfg.go index 18790307e..9e4768ac3 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -362,9 +362,7 @@ func (dbcfg *DbCfg) loadFromJSONCfg(jsnDbCfg *DbJsonCfg) (err error) { } for kJsn, vJsn := range jsnDbCfg.Db_conns { if _, exists := dbcfg.DBConns[kJsn]; !exists { - dbcfg.DBConns[kJsn] = &DBConn{ - Opts: &DBOpts{}, - } + dbcfg.DBConns[kJsn] = getDftDBConnCfg() } if err = dbcfg.DBConns[kJsn].loadFromJSONCfg(vJsn); err != nil { return err diff --git a/data/conf/samples/acc_generaltest_internal/cgrates.json b/data/conf/samples/acc_generaltest_internal/cgrates.json index f73ef7357..553973631 100644 --- a/data/conf/samples/acc_generaltest_internal/cgrates.json +++ b/data/conf/samples/acc_generaltest_internal/cgrates.json @@ -21,12 +21,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/actions_internal/cgradmin.json b/data/conf/samples/actions_internal/cgradmin.json index f51f478b4..5fe23a854 100644 --- a/data/conf/samples/actions_internal/cgradmin.json +++ b/data/conf/samples/actions_internal/cgradmin.json @@ -23,12 +23,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, diff --git a/data/conf/samples/actions_internal_gob/cgradmin.json b/data/conf/samples/actions_internal_gob/cgradmin.json index 78dfc9139..bc689aab7 100644 --- a/data/conf/samples/actions_internal_gob/cgradmin.json +++ b/data/conf/samples/actions_internal_gob/cgradmin.json @@ -31,12 +31,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + }, }, "cdrs": { diff --git a/data/conf/samples/apis_actions_internal/cgrates.json b/data/conf/samples/apis_actions_internal/cgrates.json index d8c7c2ce7..56ab8715e 100644 --- a/data/conf/samples/apis_actions_internal/cgrates.json +++ b/data/conf/samples/apis_actions_internal/cgrates.json @@ -10,11 +10,11 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } + } } }, diff --git a/data/conf/samples/apis_chargers_internal/cgrates.json b/data/conf/samples/apis_chargers_internal/cgrates.json index 887a9e1dd..43239fd02 100644 --- a/data/conf/samples/apis_chargers_internal/cgrates.json +++ b/data/conf/samples/apis_chargers_internal/cgrates.json @@ -13,13 +13,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "attributes": { diff --git a/data/conf/samples/apis_config_internal/cgrates.json b/data/conf/samples/apis_config_internal/cgrates.json index 2d04af41c..4bdd5261a 100644 --- a/data/conf/samples/apis_config_internal/cgrates.json +++ b/data/conf/samples/apis_config_internal/cgrates.json @@ -21,13 +21,13 @@ "db": { // database used to store runtime data (eg: accounts, cdr stats) "db_conns": { "*default": { - "db_type": "*internal", - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" - } + } + }, + }, }, "cdrs": { diff --git a/data/conf/samples/apis_loaders_internal/cgrates.json b/data/conf/samples/apis_loaders_internal/cgrates.json index 47f7a9b70..d270d7baf 100644 --- a/data/conf/samples/apis_loaders_internal/cgrates.json +++ b/data/conf/samples/apis_loaders_internal/cgrates.json @@ -10,11 +10,11 @@ "db_conns": { "*default": { "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/apis_srvmng_internal/cgrates.json b/data/conf/samples/apis_srvmng_internal/cgrates.json index 0b5ff3d03..14c9a4087 100644 --- a/data/conf/samples/apis_srvmng_internal/cgrates.json +++ b/data/conf/samples/apis_srvmng_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, } \ No newline at end of file diff --git a/data/conf/samples/attr_test_internal/cgrates.json b/data/conf/samples/attr_test_internal/cgrates.json index 5a7446273..8dce805ba 100644 --- a/data/conf/samples/attr_test_internal/cgrates.json +++ b/data/conf/samples/attr_test_internal/cgrates.json @@ -21,12 +21,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/attributes_internal/cgrates.json b/data/conf/samples/attributes_internal/cgrates.json index 6087e2b7c..1800c0c2f 100644 --- a/data/conf/samples/attributes_internal/cgrates.json +++ b/data/conf/samples/attributes_internal/cgrates.json @@ -3,12 +3,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index 54012d295..61df1fb44 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -15,13 +15,13 @@ "db":{ "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, diff --git a/data/conf/samples/cdrsv2internal/cgrates.json b/data/conf/samples/cdrsv2internal/cgrates.json index 4d494e040..5306d9399 100644 --- a/data/conf/samples/cdrsv2internal/cgrates.json +++ b/data/conf/samples/cdrsv2internal/cgrates.json @@ -9,12 +9,12 @@ "*default": { "db_type": "*internal", "string_indexed_fields": ["RunID"], - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/cdrsv_failover_internal/cgrates.json b/data/conf/samples/cdrsv_failover_internal/cgrates.json index cf35395b9..602a4e040 100644 --- a/data/conf/samples/cdrsv_failover_internal/cgrates.json +++ b/data/conf/samples/cdrsv_failover_internal/cgrates.json @@ -11,13 +11,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/cfg_rld_rates_internal/cgrates.json b/data/conf/samples/cfg_rld_rates_internal/cgrates.json index fdc1198db..8ce8318f0 100644 --- a/data/conf/samples/cfg_rld_rates_internal/cgrates.json +++ b/data/conf/samples/cfg_rld_rates_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, } diff --git a/data/conf/samples/core_config/cgrates.json b/data/conf/samples/core_config/cgrates.json index f6ca4e7b6..0b1b50e73 100644 --- a/data/conf/samples/core_config/cgrates.json +++ b/data/conf/samples/core_config/cgrates.json @@ -11,13 +11,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "admins": { diff --git a/data/conf/samples/dataconverter_internal/cgrates.json b/data/conf/samples/dataconverter_internal/cgrates.json index de1631575..751fce015 100644 --- a/data/conf/samples/dataconverter_internal/cgrates.json +++ b/data/conf/samples/dataconverter_internal/cgrates.json @@ -7,13 +7,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "attributes": { diff --git a/data/conf/samples/diamagent_internal_empty_apps/cgrates.json b/data/conf/samples/diamagent_internal_empty_apps/cgrates.json index a81e2c5fe..480dd4555 100644 --- a/data/conf/samples/diamagent_internal_empty_apps/cgrates.json +++ b/data/conf/samples/diamagent_internal_empty_apps/cgrates.json @@ -21,13 +21,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0", + "internalDBDumpInterval": "0" } + } + }, }, "cdrs": { diff --git a/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json b/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json index 35af25a5e..13904d952 100644 --- a/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json +++ b/data/conf/samples/diamagent_internal_gobbirpc/cgrates.json @@ -28,12 +28,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, diff --git a/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json b/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json index 3ab03b293..0c4eeb348 100644 --- a/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json +++ b/data/conf/samples/diamagent_internal_jsonbirpc/cgrates.json @@ -28,12 +28,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + }, }, "cdrs": { diff --git a/data/conf/samples/diamagent_internal_supp_apps/cgrates.json b/data/conf/samples/diamagent_internal_supp_apps/cgrates.json index 414385cf4..16224ad3c 100644 --- a/data/conf/samples/diamagent_internal_supp_apps/cgrates.json +++ b/data/conf/samples/diamagent_internal_supp_apps/cgrates.json @@ -21,13 +21,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } }, "cdrs": { diff --git a/data/conf/samples/diamsctpagent_internal/cgrates.json b/data/conf/samples/diamsctpagent_internal/cgrates.json index e8e42e3f2..69dab79ec 100644 --- a/data/conf/samples/diamsctpagent_internal/cgrates.json +++ b/data/conf/samples/diamsctpagent_internal/cgrates.json @@ -22,12 +22,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/dnsagent_internal/cgrates.json b/data/conf/samples/dnsagent_internal/cgrates.json index 8133aca7f..f62a49938 100644 --- a/data/conf/samples/dnsagent_internal/cgrates.json +++ b/data/conf/samples/dnsagent_internal/cgrates.json @@ -7,13 +7,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "schedulers": { diff --git a/data/conf/samples/ees_blocker_internal/cgrates.json b/data/conf/samples/ees_blocker_internal/cgrates.json index 9623bf887..82b905c84 100644 --- a/data/conf/samples/ees_blocker_internal/cgrates.json +++ b/data/conf/samples/ees_blocker_internal/cgrates.json @@ -13,13 +13,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "ees": { diff --git a/data/conf/samples/ees_cloud/cgrates.json b/data/conf/samples/ees_cloud/cgrates.json index f4b71fec6..62d635e7f 100644 --- a/data/conf/samples/ees_cloud/cgrates.json +++ b/data/conf/samples/ees_cloud/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "ees": { diff --git a/data/conf/samples/ees_elastic/cgrates.json b/data/conf/samples/ees_elastic/cgrates.json index 23b26cb4e..4013d08a3 100644 --- a/data/conf/samples/ees_elastic/cgrates.json +++ b/data/conf/samples/ees_elastic/cgrates.json @@ -3,12 +3,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/ees_internal/cgrates.json b/data/conf/samples/ees_internal/cgrates.json index df25474f1..e770ea216 100644 --- a/data/conf/samples/ees_internal/cgrates.json +++ b/data/conf/samples/ees_internal/cgrates.json @@ -18,12 +18,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/efs/efs_internal/cgrates.json b/data/conf/samples/efs/efs_internal/cgrates.json index 57117ffa9..fde918542 100644 --- a/data/conf/samples/efs/efs_internal/cgrates.json +++ b/data/conf/samples/efs/efs_internal/cgrates.json @@ -13,13 +13,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "efs": { diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index 10d1f8cc8..0c66ff6a8 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -18,12 +18,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/ers_mysql_delete_indexed_fields/cgrates.json b/data/conf/samples/ers_mysql_delete_indexed_fields/cgrates.json index 67ea3ab89..c4266e521 100644 --- a/data/conf/samples/ers_mysql_delete_indexed_fields/cgrates.json +++ b/data/conf/samples/ers_mysql_delete_indexed_fields/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/ers_mysql_filters/cgrates.json b/data/conf/samples/ers_mysql_filters/cgrates.json index d5dae9685..65517efa1 100644 --- a/data/conf/samples/ers_mysql_filters/cgrates.json +++ b/data/conf/samples/ers_mysql_filters/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/ers_mysql_meta_delete/cgrates.json b/data/conf/samples/ers_mysql_meta_delete/cgrates.json index 4e3821052..7ed1e08e2 100644 --- a/data/conf/samples/ers_mysql_meta_delete/cgrates.json +++ b/data/conf/samples/ers_mysql_meta_delete/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/ers_mysql_move/cgrates.json b/data/conf/samples/ers_mysql_move/cgrates.json index 5e31708e3..f3888f936 100644 --- a/data/conf/samples/ers_mysql_move/cgrates.json +++ b/data/conf/samples/ers_mysql_move/cgrates.json @@ -12,15 +12,14 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } }, - + } + }, "sessions": { "enabled": true, }, diff --git a/data/conf/samples/ers_mysql_raw_update/cgrates.json b/data/conf/samples/ers_mysql_raw_update/cgrates.json index 65963e897..f9273581b 100644 --- a/data/conf/samples/ers_mysql_raw_update/cgrates.json +++ b/data/conf/samples/ers_mysql_raw_update/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/ers_mysql_update/cgrates.json b/data/conf/samples/ers_mysql_update/cgrates.json index 52247aa07..4f8df6d62 100644 --- a/data/conf/samples/ers_mysql_update/cgrates.json +++ b/data/conf/samples/ers_mysql_update/cgrates.json @@ -12,13 +12,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/ers_nats/cgrates.json b/data/conf/samples/ers_nats/cgrates.json index dbc67a76e..c33865e3c 100644 --- a/data/conf/samples/ers_nats/cgrates.json +++ b/data/conf/samples/ers_nats/cgrates.json @@ -2,13 +2,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "ees": { diff --git a/data/conf/samples/ers_reload/disabled_internal/cgrates.json b/data/conf/samples/ers_reload/disabled_internal/cgrates.json index 7f1f59d3f..7f3eaf3a4 100644 --- a/data/conf/samples/ers_reload/disabled_internal/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_internal/cgrates.json @@ -20,12 +20,12 @@ "db_conns": { "*default": { "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "rates": { diff --git a/data/conf/samples/export_it_test_internal/cgrates.json b/data/conf/samples/export_it_test_internal/cgrates.json index b1546c9bd..06584f624 100644 --- a/data/conf/samples/export_it_test_internal/cgrates.json +++ b/data/conf/samples/export_it_test_internal/cgrates.json @@ -21,13 +21,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "cdrs": { diff --git a/data/conf/samples/filter_indexes_internal/cgrates.json b/data/conf/samples/filter_indexes_internal/cgrates.json index 029817112..0ca712699 100644 --- a/data/conf/samples/filter_indexes_internal/cgrates.json +++ b/data/conf/samples/filter_indexes_internal/cgrates.json @@ -10,11 +10,11 @@ "db_conns": { "*default": { "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/filtered_replication/internal/cgrates.json b/data/conf/samples/filtered_replication/internal/cgrates.json index bfa87a32a..9bd32bd19 100644 --- a/data/conf/samples/filtered_replication/internal/cgrates.json +++ b/data/conf/samples/filtered_replication/internal/cgrates.json @@ -30,6 +30,10 @@ "db_type": "*internal", "replication_conns": ["conn2"], "replication_filtered": true, + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, "items":{ @@ -48,10 +52,6 @@ "*load_ids":{"remote":false,"replicate":true}, "*action_profiles":{"remote":false,"replicate":true}, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, diff --git a/data/conf/samples/filters_internal/cgrates.json b/data/conf/samples/filters_internal/cgrates.json index fcc351bf0..587202df9 100644 --- a/data/conf/samples/filters_internal/cgrates.json +++ b/data/conf/samples/filters_internal/cgrates.json @@ -18,13 +18,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/fltr_sep_internal/cgrates.json b/data/conf/samples/fltr_sep_internal/cgrates.json index 593468022..97ca40c67 100644 --- a/data/conf/samples/fltr_sep_internal/cgrates.json +++ b/data/conf/samples/fltr_sep_internal/cgrates.json @@ -7,12 +7,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } + } } }, diff --git a/data/conf/samples/gocs/au_site/cgrates.json b/data/conf/samples/gocs/au_site/cgrates.json index 8bcca51e4..f1aa2d423 100644 --- a/data/conf/samples/gocs/au_site/cgrates.json +++ b/data/conf/samples/gocs/au_site/cgrates.json @@ -36,6 +36,10 @@ "*default": { "db_type": "*internal", "remote_conns": ["rmtConn"], + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, "StorDB": { "db_type": "mysql", @@ -54,11 +58,7 @@ "*charger_profiles": {"remote":true, "dbConn": "*default"}, "*load_ids":{"remote":true, "dbConn": "*default"}, "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"} - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } + } }, "rates": { diff --git a/data/conf/samples/httpagent_internal/cgrates.json b/data/conf/samples/httpagent_internal/cgrates.json index 5bd834057..af3f40ab2 100644 --- a/data/conf/samples/httpagent_internal/cgrates.json +++ b/data/conf/samples/httpagent_internal/cgrates.json @@ -22,15 +22,15 @@ "db_name": "10" }, "StorDB": { - "db_type": "internal" + "db_type": "internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, "items": { "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"} - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/httpagenttls_internal/cgrates.json b/data/conf/samples/httpagenttls_internal/cgrates.json index 267f7eac2..7ec00749d 100644 --- a/data/conf/samples/httpagenttls_internal/cgrates.json +++ b/data/conf/samples/httpagenttls_internal/cgrates.json @@ -33,15 +33,15 @@ "db_name": "10" }, "StorDB": { - "db_type": "internal" + "db_type": "internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, "items": { "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"} - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/internal_broadcast_replication/cgrates.json b/data/conf/samples/internal_broadcast_replication/cgrates.json index dd9937828..b12810457 100644 --- a/data/conf/samples/internal_broadcast_replication/cgrates.json +++ b/data/conf/samples/internal_broadcast_replication/cgrates.json @@ -33,12 +33,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "rates": { diff --git a/data/conf/samples/janus_agent/cgrates.json b/data/conf/samples/janus_agent/cgrates.json index 8d5a0e00c..e9b6bc41c 100644 --- a/data/conf/samples/janus_agent/cgrates.json +++ b/data/conf/samples/janus_agent/cgrates.json @@ -20,13 +20,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, "cdrs": { diff --git a/data/conf/samples/loaders/tutinternal/cgrates.json b/data/conf/samples/loaders/tutinternal/cgrates.json index c753118a8..d288f9cd7 100644 --- a/data/conf/samples/loaders/tutinternal/cgrates.json +++ b/data/conf/samples/loaders/tutinternal/cgrates.json @@ -22,11 +22,11 @@ "db_conns": { "*default": { "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + }, }, - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" }, }, diff --git a/data/conf/samples/loaders_indexes_internal_db/cgrates.json b/data/conf/samples/loaders_indexes_internal_db/cgrates.json index 5882b05e1..ea353e7de 100644 --- a/data/conf/samples/loaders_indexes_internal_db/cgrates.json +++ b/data/conf/samples/loaders_indexes_internal_db/cgrates.json @@ -26,6 +26,10 @@ "db_type": "*internal", "remote_conns": ["engine"], "replication_conns": ["engine"], + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, "items":{ @@ -57,11 +61,7 @@ "*rate_filter_indexes" : {"replicate": true}, "*action_profile_filter_indexes" : {"replicate": true}, "*account_filter_indexes" : {"replicate": true} - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } + } }, diff --git a/data/conf/samples/loaders_old2new_internal/cgrates.json b/data/conf/samples/loaders_old2new_internal/cgrates.json index 67486d539..3517347ff 100644 --- a/data/conf/samples/loaders_old2new_internal/cgrates.json +++ b/data/conf/samples/loaders_old2new_internal/cgrates.json @@ -10,13 +10,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "loaders": [ diff --git a/data/conf/samples/multiple_dbs/cgrates.json b/data/conf/samples/multiple_dbs/cgrates.json index b471edae6..9a2b2d931 100644 --- a/data/conf/samples/multiple_dbs/cgrates.json +++ b/data/conf/samples/multiple_dbs/cgrates.json @@ -20,10 +20,14 @@ "*default": { "db_type": "*redis", "db_port": 6379, - "db_name": "10" + "db_name": "10", }, "intrnl": { - "db_type": "*internal" + "db_type": "*internal", + "opts": { + "internalDBDumpPath": "/tmp/internal_db/db", + "internalDBRewriteInterval": "0s" + } }, "redis2": { "db_type": "*redis", @@ -43,10 +47,6 @@ "*charger_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "redis2"}, "*charger_filter_indexes" : {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate": false, "dbConn": "intrnl"}, "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"} - }, - "opts": { - "internalDBDumpPath": "/tmp/internal_db/db", - "internalDBRewriteInterval": "0s" } }, diff --git a/data/conf/samples/multiple_dbs_mongo/cgrates.json b/data/conf/samples/multiple_dbs_mongo/cgrates.json index ec3bb12d5..caa7924d3 100644 --- a/data/conf/samples/multiple_dbs_mongo/cgrates.json +++ b/data/conf/samples/multiple_dbs_mongo/cgrates.json @@ -23,7 +23,11 @@ "db_name": "10" }, "internalDBConn": { - "db_type": "*internal" + "db_type": "*internal", + "opts": { + "internalDBDumpPath": "/tmp/internal_db/db", + "internalDBRewriteInterval": "0s" + } }, "mongoDBConn": { "db_type": "mongo", @@ -37,10 +41,6 @@ "*charger_profiles": {"dbConn": "mongoDBConn"}, "*charger_filter_indexes" : {"dbConn": "internalDBConn"}, "*cdrs": {"dbConn": "mongoDBConn"} - }, - "opts": { - "internalDBDumpPath": "/tmp/internal_db/db", - "internalDBRewriteInterval": "0s" } }, diff --git a/data/conf/samples/multiral1_internal/cgrates.json b/data/conf/samples/multiral1_internal/cgrates.json index 38e7031ce..0aa7e8cfc 100644 --- a/data/conf/samples/multiral1_internal/cgrates.json +++ b/data/conf/samples/multiral1_internal/cgrates.json @@ -18,12 +18,13 @@ "db_conns": { "*default": { "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } + }, diff --git a/data/conf/samples/multiral2_internal/cgrates.json b/data/conf/samples/multiral2_internal/cgrates.json index 0f1e8b20f..d468a7885 100644 --- a/data/conf/samples/multiral2_internal/cgrates.json +++ b/data/conf/samples/multiral2_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rates": { diff --git a/data/conf/samples/offline_internal/cgrates.json b/data/conf/samples/offline_internal/cgrates.json index c54613489..1aa04e965 100644 --- a/data/conf/samples/offline_internal/cgrates.json +++ b/data/conf/samples/offline_internal/cgrates.json @@ -9,17 +9,17 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts": { + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBRewriteInterval": "0s" + } } }, "items": { "*charger_profiles": {"limit": -1,"ttl": "1s","static_ttl": false,"remote": false,"replicate": false} - }, - "opts": { - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBRewriteInterval": "0s" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_limit/cgrates.json b/data/conf/samples/offline_internal_limit/cgrates.json index 1db975a1f..b670c3e7e 100644 --- a/data/conf/samples/offline_internal_limit/cgrates.json +++ b/data/conf/samples/offline_internal_limit/cgrates.json @@ -9,17 +9,17 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBFileSizeLimit": "4KB", + "internalDBRewriteInterval": "0s" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBFileSizeLimit": "4KB", - "internalDBRewriteInterval": "0s" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms/cgrates.json b/data/conf/samples/offline_internal_ms/cgrates.json index ef879dd98..2e9e525a2 100644 --- a/data/conf/samples/offline_internal_ms/cgrates.json +++ b/data/conf/samples/offline_internal_ms/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "500ms", + "internalDBRewriteInterval": "0s" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "500ms", - "internalDBRewriteInterval": "0s" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms_limit/cgrates.json b/data/conf/samples/offline_internal_ms_limit/cgrates.json index a2c3ba59e..df7cf87a0 100644 --- a/data/conf/samples/offline_internal_ms_limit/cgrates.json +++ b/data/conf/samples/offline_internal_ms_limit/cgrates.json @@ -9,17 +9,17 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "500ms", + "internalDBFileSizeLimit": "4KB", + "internalDBRewriteInterval": "0s" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "500ms", - "internalDBFileSizeLimit": "4KB", - "internalDBRewriteInterval": "0s" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms_rewrite/cgrates.json b/data/conf/samples/offline_internal_ms_rewrite/cgrates.json index 3d30a616a..126fda930 100644 --- a/data/conf/samples/offline_internal_ms_rewrite/cgrates.json +++ b/data/conf/samples/offline_internal_ms_rewrite/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "500ms", + "internalDBRewriteInterval": "-1" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "500ms", - "internalDBRewriteInterval": "-1" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms_rewrite_limit/cgrates.json b/data/conf/samples/offline_internal_ms_rewrite_limit/cgrates.json index 12defd5d8..541ed1be3 100644 --- a/data/conf/samples/offline_internal_ms_rewrite_limit/cgrates.json +++ b/data/conf/samples/offline_internal_ms_rewrite_limit/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBDumpInterval": "500ms", + "internalDBRewriteInterval": "-1", + "internalDBFileSizeLimit": "4KB" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBDumpInterval": "500ms", - "internalDBRewriteInterval": "-1", - "internalDBFileSizeLimit": "4KB" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms_rewrite_ms/cgrates.json b/data/conf/samples/offline_internal_ms_rewrite_ms/cgrates.json index ada865850..85c7c117c 100644 --- a/data/conf/samples/offline_internal_ms_rewrite_ms/cgrates.json +++ b/data/conf/samples/offline_internal_ms_rewrite_ms/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "500ms", + "internalDBRewriteInterval": "500ms" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "500ms", - "internalDBRewriteInterval": "500ms" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_ms_rewrite_ms_limit/cgrates.json b/data/conf/samples/offline_internal_ms_rewrite_ms_limit/cgrates.json index 207585985..c01f750a8 100644 --- a/data/conf/samples/offline_internal_ms_rewrite_ms_limit/cgrates.json +++ b/data/conf/samples/offline_internal_ms_rewrite_ms_limit/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBDumpInterval": "500ms", + "internalDBRewriteInterval": "500ms", + "internalDBFileSizeLimit": "4k" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBDumpInterval": "500ms", - "internalDBRewriteInterval": "500ms", - "internalDBFileSizeLimit": "4k" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_rewrite/cgrates.json b/data/conf/samples/offline_internal_rewrite/cgrates.json index 988e508a5..e823cbda9 100644 --- a/data/conf/samples/offline_internal_rewrite/cgrates.json +++ b/data/conf/samples/offline_internal_rewrite/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBRewriteInterval": "-1" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBRewriteInterval": "-1" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_rewrite_limit/cgrates.json b/data/conf/samples/offline_internal_rewrite_limit/cgrates.json index 29cc64f49..90463a2bb 100644 --- a/data/conf/samples/offline_internal_rewrite_limit/cgrates.json +++ b/data/conf/samples/offline_internal_rewrite_limit/cgrates.json @@ -9,17 +9,17 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBRewriteInterval": "-1", + "internalDBFileSizeLimit": "4K" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBRewriteInterval": "-1", - "internalDBFileSizeLimit": "4K" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_rewrite_ms/cgrates.json b/data/conf/samples/offline_internal_rewrite_ms/cgrates.json index 72727c9e1..bd25844f2 100644 --- a/data/conf/samples/offline_internal_rewrite_ms/cgrates.json +++ b/data/conf/samples/offline_internal_rewrite_ms/cgrates.json @@ -9,16 +9,16 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBRewriteInterval": "500ms" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBRewriteInterval": "500ms" } }, "config_db": { diff --git a/data/conf/samples/offline_internal_rewrite_ms_limit/cgrates.json b/data/conf/samples/offline_internal_rewrite_ms_limit/cgrates.json index 3e69587e5..4d27fe876 100644 --- a/data/conf/samples/offline_internal_rewrite_ms_limit/cgrates.json +++ b/data/conf/samples/offline_internal_rewrite_ms_limit/cgrates.json @@ -9,17 +9,17 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBStartTimeout": "1m", + "internalDBDumpInterval": "-1", + "internalDBRewriteInterval": "500ms", + "internalDBFileSizeLimit": "4KB" + } } }, "items":{ "*charger_profiles": {"limit": -1, "ttl": "1s", "static_ttl": false, "remote":false, "replicate":false} - }, - "opts":{ - "internalDBStartTimeout": "1m", - "internalDBDumpInterval": "-1", - "internalDBRewriteInterval": "500ms", - "internalDBFileSizeLimit": "4KB" } }, "config_db": { diff --git a/data/conf/samples/preload_internal/cgrates.json b/data/conf/samples/preload_internal/cgrates.json index a66d9a3d2..da455d9de 100644 --- a/data/conf/samples/preload_internal/cgrates.json +++ b/data/conf/samples/preload_internal/cgrates.json @@ -9,12 +9,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/radagent_internal/cgrates.json b/data/conf/samples/radagent_internal/cgrates.json index 221c8a096..2ed2a0bfa 100644 --- a/data/conf/samples/radagent_internal/cgrates.json +++ b/data/conf/samples/radagent_internal/cgrates.json @@ -16,13 +16,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rals": { diff --git a/data/conf/samples/radagent_internal_gob/cgrates.json b/data/conf/samples/radagent_internal_gob/cgrates.json index d8e4a19a8..166e5515c 100644 --- a/data/conf/samples/radagent_internal_gob/cgrates.json +++ b/data/conf/samples/radagent_internal_gob/cgrates.json @@ -26,12 +26,12 @@ "db_conns": { "*default": { "db_type": "*internal", - }, - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, diff --git a/data/conf/samples/radius_ipam/cgrates.json b/data/conf/samples/radius_ipam/cgrates.json index f645bae5d..2849f85e9 100644 --- a/data/conf/samples/radius_ipam/cgrates.json +++ b/data/conf/samples/radius_ipam/cgrates.json @@ -37,12 +37,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" + } + } } }, "admins": { diff --git a/data/conf/samples/radius_status/cgrates.json b/data/conf/samples/radius_status/cgrates.json index c9e61490c..113f86518 100644 --- a/data/conf/samples/radius_status/cgrates.json +++ b/data/conf/samples/radius_status/cgrates.json @@ -15,13 +15,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rals": { diff --git a/data/conf/samples/rankings_internal/cgrates.json b/data/conf/samples/rankings_internal/cgrates.json index 42b6ca9b7..f1397cd53 100644 --- a/data/conf/samples/rankings_internal/cgrates.json +++ b/data/conf/samples/rankings_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - }, - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + }, + } }, diff --git a/data/conf/samples/rates_internal/cgrates.json b/data/conf/samples/rates_internal/cgrates.json index e347d8e20..673527e43 100644 --- a/data/conf/samples/rates_internal/cgrates.json +++ b/data/conf/samples/rates_internal/cgrates.json @@ -3,13 +3,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rates": { diff --git a/data/conf/samples/resources_internal/cgrates.json b/data/conf/samples/resources_internal/cgrates.json index 3e9bea104..d6ec43d5f 100644 --- a/data/conf/samples/resources_internal/cgrates.json +++ b/data/conf/samples/resources_internal/cgrates.json @@ -7,13 +7,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "actions": { diff --git a/data/conf/samples/routes_cases_internal/cgrates.json b/data/conf/samples/routes_cases_internal/cgrates.json index b9ffae315..3fe5b8af2 100644 --- a/data/conf/samples/routes_cases_internal/cgrates.json +++ b/data/conf/samples/routes_cases_internal/cgrates.json @@ -14,13 +14,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "attributes": { diff --git a/data/conf/samples/routes_generaltests_internal/cgrates.json b/data/conf/samples/routes_generaltests_internal/cgrates.json index 21637fe65..72b2ba666 100644 --- a/data/conf/samples/routes_generaltests_internal/cgrates.json +++ b/data/conf/samples/routes_generaltests_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "resources": { diff --git a/data/conf/samples/routes_internal/cgrates.json b/data/conf/samples/routes_internal/cgrates.json index 3e56598ab..8ee5896b6 100644 --- a/data/conf/samples/routes_internal/cgrates.json +++ b/data/conf/samples/routes_internal/cgrates.json @@ -17,12 +17,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/sessinternal/cgrates.json b/data/conf/samples/sessinternal/cgrates.json index 55cea2e7d..d01aef3de 100644 --- a/data/conf/samples/sessinternal/cgrates.json +++ b/data/conf/samples/sessinternal/cgrates.json @@ -14,13 +14,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rates": { diff --git a/data/conf/samples/session_volume_discount_internal/cgrates.json b/data/conf/samples/session_volume_discount_internal/cgrates.json index f7f668ee2..0b891f1f3 100644 --- a/data/conf/samples/session_volume_discount_internal/cgrates.json +++ b/data/conf/samples/session_volume_discount_internal/cgrates.json @@ -14,13 +14,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/sessions_internal/cgrates.json b/data/conf/samples/sessions_internal/cgrates.json index 131e04f52..c9225902f 100644 --- a/data/conf/samples/sessions_internal/cgrates.json +++ b/data/conf/samples/sessions_internal/cgrates.json @@ -21,12 +21,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json index 962fd089a..15ea5f0ff 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json @@ -17,13 +17,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json index 3393b80ad..af1063133 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json @@ -24,13 +24,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, diff --git a/data/conf/samples/sipagent_internal/cgrates.json b/data/conf/samples/sipagent_internal/cgrates.json index 0d4e76275..ed046284d 100644 --- a/data/conf/samples/sipagent_internal/cgrates.json +++ b/data/conf/samples/sipagent_internal/cgrates.json @@ -22,13 +22,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/smg_automatic_debits_internal/cgrates.json b/data/conf/samples/smg_automatic_debits_internal/cgrates.json index b20d53452..f6b2e1e7c 100644 --- a/data/conf/samples/smg_automatic_debits_internal/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_internal/cgrates.json @@ -10,13 +10,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rates": { diff --git a/data/conf/samples/stats_internal/cgrates.json b/data/conf/samples/stats_internal/cgrates.json index 5ab30ee9f..454d08140 100644 --- a/data/conf/samples/stats_internal/cgrates.json +++ b/data/conf/samples/stats_internal/cgrates.json @@ -9,12 +9,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" + } + } } }, diff --git a/data/conf/samples/thresholds_internal/cgrates.json b/data/conf/samples/thresholds_internal/cgrates.json index e159863ba..ef2db78ca 100644 --- a/data/conf/samples/thresholds_internal/cgrates.json +++ b/data/conf/samples/thresholds_internal/cgrates.json @@ -9,12 +9,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" + } + } } }, diff --git a/data/conf/samples/tp_internal/cgrates.json b/data/conf/samples/tp_internal/cgrates.json index bc150b3d4..dedcd224f 100644 --- a/data/conf/samples/tp_internal/cgrates.json +++ b/data/conf/samples/tp_internal/cgrates.json @@ -21,12 +21,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/tpe_internal/cgrates.json b/data/conf/samples/tpe_internal/cgrates.json index b45234de3..e5364ede7 100644 --- a/data/conf/samples/tpe_internal/cgrates.json +++ b/data/conf/samples/tpe_internal/cgrates.json @@ -14,13 +14,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "sessions": { diff --git a/data/conf/samples/tut_session_internal/cgrates.json b/data/conf/samples/tut_session_internal/cgrates.json index 12aba08cf..2604b6571 100644 --- a/data/conf/samples/tut_session_internal/cgrates.json +++ b/data/conf/samples/tut_session_internal/cgrates.json @@ -21,13 +21,13 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, "rals": { diff --git a/data/conf/samples/tutinternal/cgrates.json b/data/conf/samples/tutinternal/cgrates.json index 0f3964e25..1ac775e27 100644 --- a/data/conf/samples/tutinternal/cgrates.json +++ b/data/conf/samples/tutinternal/cgrates.json @@ -31,12 +31,12 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/tutinternal_gob/cgrates.json b/data/conf/samples/tutinternal_gob/cgrates.json index 8339ed7cf..eb81e83e8 100644 --- a/data/conf/samples/tutinternal_gob/cgrates.json +++ b/data/conf/samples/tutinternal_gob/cgrates.json @@ -29,12 +29,12 @@ "db_conns": { "*default": { "db_type": "*internal", - } - }, - "opts":{ + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + } }, diff --git a/data/conf/samples/tutinternal_new/cgrates.json b/data/conf/samples/tutinternal_new/cgrates.json index 22a01a9ac..a7c216494 100644 --- a/data/conf/samples/tutinternal_new/cgrates.json +++ b/data/conf/samples/tutinternal_new/cgrates.json @@ -18,12 +18,11 @@ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } - }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" } }, diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index dfc2a1da0..66cd3a75f 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -24,14 +24,14 @@ "db_host": "127.0.0.1", "db_port": 27017, "db_name": "10", - "db_user": "cgrates", + "db_user": "cgrates" }, "StorDB": { // The id of the DB connection "db_type": "mongo", // db type: "db_host": "127.0.0.1", "db_port": 27017, // db port to reach the database "db_name": "cgrates", // the host to connect to - "db_user": "cgrates", + "db_user": "cgrates" }, }, "items": { diff --git a/efs/efs_it_test.go b/efs/efs_it_test.go index 22ba3d28d..1b938f9a9 100644 --- a/efs/efs_it_test.go +++ b/efs/efs_it_test.go @@ -201,13 +201,13 @@ func TestEFsReplayEvents(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "admins": { diff --git a/ers/ers_it_test.go b/ers/ers_it_test.go index 499ab6a16..3009f99a3 100644 --- a/ers/ers_it_test.go +++ b/ers/ers_it_test.go @@ -1543,13 +1543,13 @@ func TestERsLineNr(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "ers": { "enabled": true, diff --git a/ers/nats_it_test.go b/ers/nats_it_test.go index 40609b743..ba3bf466d 100644 --- a/ers/nats_it_test.go +++ b/ers/nats_it_test.go @@ -127,13 +127,13 @@ var natsCfg string = `{ "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "ees": { diff --git a/general_tests/analyzers_doc_it_test.go b/general_tests/analyzers_doc_it_test.go index 8b4f6cbe6..24e1299ef 100644 --- a/general_tests/analyzers_doc_it_test.go +++ b/general_tests/analyzers_doc_it_test.go @@ -51,13 +51,13 @@ func TestAnzDocIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "attributes": { "enabled": true, diff --git a/general_tests/ers_sql_filters_it_test.go b/general_tests/ers_sql_filters_it_test.go index 7d7d30f19..f4b618b9d 100644 --- a/general_tests/ers_sql_filters_it_test.go +++ b/general_tests/ers_sql_filters_it_test.go @@ -1572,13 +1572,13 @@ cgrates.org,FLTR_VARS,*string,~*vars.*readerID,mysql`, "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "admins": { diff --git a/general_tests/ers_start_delay_it_test.go b/general_tests/ers_start_delay_it_test.go index 473070d12..ae11dd3a6 100644 --- a/general_tests/ers_start_delay_it_test.go +++ b/general_tests/ers_start_delay_it_test.go @@ -48,13 +48,13 @@ func TestErsStartDelay(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "cdrs":{ "enabled":true, diff --git a/general_tests/ips_load_test.go b/general_tests/ips_load_test.go index 9fed2e502..640c6087b 100644 --- a/general_tests/ips_load_test.go +++ b/general_tests/ips_load_test.go @@ -57,13 +57,13 @@ func BenchmarkStressIPsAllocateIP(b *testing.B) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "ips": { "enabled": true, @@ -154,7 +154,7 @@ func TestStressIPsAuthorize(t *testing.T) { "db_host": "127.0.0.1", "db_port": 6379, "db_name": "10", - "db_user": "cgrates" + "db_user": "cgrates", }, "StorDB": { "db_type": "mysql", @@ -162,16 +162,17 @@ func TestStressIPsAuthorize(t *testing.T) { "db_port": 3306, "db_name": "cgrates", "db_user": "cgrates", - "db_password": "CGRateS.org" + "db_password": "CGRateS.org", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, "items": { "*cdrs": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false, "dbConn": "StorDB"} }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } + }, "admins": { diff --git a/general_tests/ips_prf_it_test.go b/general_tests/ips_prf_it_test.go index 50541179f..4e0c84a9c 100644 --- a/general_tests/ips_prf_it_test.go +++ b/general_tests/ips_prf_it_test.go @@ -41,13 +41,14 @@ func Benchmark10IPsAllocated(b *testing.B) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, + }, "admins": { "enabled": true, diff --git a/general_tests/kafka_ssl_it_test.go b/general_tests/kafka_ssl_it_test.go index 022e795fe..fac6fbe3d 100644 --- a/general_tests/kafka_ssl_it_test.go +++ b/general_tests/kafka_ssl_it_test.go @@ -57,13 +57,13 @@ func TestKafkaSSL(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "ees": { "enabled": true, diff --git a/general_tests/multiple_dbs_it_test.go b/general_tests/multiple_dbs_it_test.go index d7c576c6e..210172c92 100644 --- a/general_tests/multiple_dbs_it_test.go +++ b/general_tests/multiple_dbs_it_test.go @@ -332,7 +332,7 @@ func TestMultipleDBs(t *testing.T) { t.Run("CountDBFiles", func(t *testing.T) { var dirs, files int - if err := filepath.WalkDir(cfg.DbCfg().DBConns[utils.MetaDefault].Opts.InternalDBDumpPath, func(root string, info fs.DirEntry, err error) error { + if err := filepath.WalkDir(cfg.DbCfg().DBConns["intrnl"].Opts.InternalDBDumpPath, func(root string, info fs.DirEntry, err error) error { if err != nil { return err } @@ -651,7 +651,7 @@ func TestMultipleDBsMongo(t *testing.T) { t.Run("CountDBFiles", func(t *testing.T) { var dirs, files int - if err := filepath.WalkDir(cfg.DbCfg().DBConns[utils.MetaDefault].Opts.InternalDBDumpPath, func(root string, info fs.DirEntry, err error) error { + if err := filepath.WalkDir(cfg.DbCfg().DBConns["internalDBConn"].Opts.InternalDBDumpPath, func(root string, info fs.DirEntry, err error) error { if err != nil { return err } diff --git a/general_tests/prometheus_it_test.go b/general_tests/prometheus_it_test.go index f20e5743a..12e359abd 100644 --- a/general_tests/prometheus_it_test.go +++ b/general_tests/prometheus_it_test.go @@ -46,13 +46,13 @@ func TestPrometheusAgentIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "stats": { "enabled": true, @@ -93,13 +93,13 @@ func TestPrometheusAgentIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "stats": { "enabled": true, diff --git a/general_tests/radius_ipam_it_test.go b/general_tests/radius_ipam_it_test.go index 078dc0c92..a3de6b2a8 100644 --- a/general_tests/radius_ipam_it_test.go +++ b/general_tests/radius_ipam_it_test.go @@ -72,13 +72,13 @@ VALUE Acct-Terminate-Cause User-Request 1 "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "radius_agent": { "client_dictionaries": { diff --git a/general_tests/rpcexp_opts_it_test.go b/general_tests/rpcexp_opts_it_test.go index da34136f4..024ce5eb3 100644 --- a/general_tests/rpcexp_opts_it_test.go +++ b/general_tests/rpcexp_opts_it_test.go @@ -45,13 +45,13 @@ func TestRPCExpIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "ees": { "enabled": true, @@ -116,13 +116,13 @@ func TestRPCExpIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "listen": { "rpc_json": ":22012", diff --git a/general_tests/service_toggle_it_test.go b/general_tests/service_toggle_it_test.go index cbbb5ade1..cd83e89bf 100644 --- a/general_tests/service_toggle_it_test.go +++ b/general_tests/service_toggle_it_test.go @@ -51,13 +51,13 @@ func TestServiceToggle(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "accounts": { "enabled": %[1]v diff --git a/general_tests/shared_client_lock_it_test.go b/general_tests/shared_client_lock_it_test.go index 0145680af..215089dfa 100644 --- a/general_tests/shared_client_lock_it_test.go +++ b/general_tests/shared_client_lock_it_test.go @@ -82,13 +82,13 @@ func testSharedClientLockLoadConfig(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, "cdrs": { diff --git a/general_tests/trends_schedule_it_test.go b/general_tests/trends_schedule_it_test.go index d046d3e17..a11caa5f4 100644 --- a/general_tests/trends_schedule_it_test.go +++ b/general_tests/trends_schedule_it_test.go @@ -48,13 +48,13 @@ func TestTrendSchedule(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" - } - }, - "opts":{ + "db_type": "*internal", + "opts":{ "internalDBRewriteInterval": "0s", "internalDBDumpInterval": "0s" } + } + }, }, diff --git a/ips/ips_it_test.go b/ips/ips_it_test.go index b1a540a65..0a7a7aa98 100644 --- a/ips/ips_it_test.go +++ b/ips/ips_it_test.go @@ -202,14 +202,14 @@ func TestIPsIT(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } }, }, %s - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "admins": { "enabled": true diff --git a/sessions/basics_it_test.go b/sessions/basics_it_test.go index 62d2b30df..3045421da 100644 --- a/sessions/basics_it_test.go +++ b/sessions/basics_it_test.go @@ -54,13 +54,13 @@ func TestSessionBasics(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "sessions": { "enabled": true, @@ -558,13 +558,13 @@ func TestSessionLifecycle(t *testing.T) { "db": { "db_conns": { "*default": { - "db_type": "*internal" + "db_type": "*internal", + "opts":{ + "internalDBRewriteInterval": "0s", + "internalDBDumpInterval": "0s" + } } }, - "opts":{ - "internalDBRewriteInterval": "0s", - "internalDBDumpInterval": "0s" - } }, "sessions": { "enabled": true,