diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json new file mode 100644 index 000000000..34bb494e3 --- /dev/null +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_internal/cgrates.json @@ -0,0 +1,47 @@ +{ +// CGRateS Configuration file +// +// Used for SessionSv1 integration tests + + +"general": { + "log_level": 7, + "node_id":"MasterReplication" +}, + + +"listen": { + "rpc_json": "127.0.0.1:22012", + "rpc_gob": "127.0.0.1:22013", + "http": "127.0.0.1:22080" +}, + +"data_db": { + "db_type": "*internal", +}, + + +"stor_db": { + "db_type": "*internal", +}, + + +"chargers": { + "enabled": true, +}, + + + +"sessions": { + "enabled": true, // starts SessionManager service: + "debit_interval": "5ms", // interval to perform debits on. + "listen_bijson": "127.0.0.1:22014", // address where to listen for bidirectional JSON-RPC requests +}, + + +"apiers": { + "enabled": true, +}, + + +} diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json index b70e32726..33daf947e 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown1_mongo/cgrates.json @@ -7,17 +7,9 @@ }, "listen": { - "rpc_json": "127.0.0.1:2012", - "rpc_gob": "127.0.0.1:2013", - "http": "127.0.0.1:2080", -}, - - -"rpc_conns": { - "rplConn": { - "strategy": "*broadcast_sync", - "conns": [{"address": "127.0.0.1:22012", "transport": "*json"}], - }, + "rpc_json": "127.0.0.1:22012", // RPC JSON listening address + "rpc_gob": "127.0.0.1:22013", // RPC GOB listening address + "http": "127.0.0.1:22080", // HTTP listening address }, @@ -34,40 +26,19 @@ "db_port": 27017, }, -"rals": { - "enabled": true, -}, - -"schedulers": { - "enabled": true, -}, - -"cdrs": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - "chargers": { "enabled": true, - "attributes_conns": ["*internal"], }, "sessions": { - "enabled": true, + "enabled": true, // starts SessionManager service: "debit_interval": "5ms", // interval to perform debits on. - "replication_conns": ["rplConn"], - "rals_conns": ["*internal"], - "cdrs_conns": ["*internal"], - "chargers_conns": ["*internal"], + "listen_bijson": "127.0.0.1:22014", // address where to listen for bidirectional JSON-RPC requests }, "apiers": { "enabled": true, - "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json new file mode 100644 index 000000000..2b45614e3 --- /dev/null +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_internal/cgrates.json @@ -0,0 +1,53 @@ +{ +// CGRateS Configuration file +// +// Used for SessionSv1 integration tests + + +"general": { + "log_level": 7, + "node_id":"MasterReplication" +}, + + +"listen": { + "rpc_json": "127.0.0.1:2012", + "rpc_gob": "127.0.0.1:2013", + "http": "127.0.0.1:2080" +}, + +"rpc_conns": { + "rplConn": { + "strategy": "*broadcast_sync", + "conns": [{"address": "127.0.0.1:22012", "transport": "*json"}], + } +}, + +"data_db": { + "db_type": "*internal", +}, + + +"stor_db": { + "db_type": "*internal", +}, + + +"chargers": { + "enabled": true, +}, + + +"sessions": { + "enabled": true, // interval to perform debits on. + "replication_conns": ["rplConn"], + "chargers_conns": ["*internal"] +}, + + +"apiers": { + "enabled": true, +}, + + +} diff --git a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json index b70e32726..36c7d3582 100644 --- a/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/rplcTestGracefulShutdown2_mongo/cgrates.json @@ -34,40 +34,18 @@ "db_port": 27017, }, -"rals": { - "enabled": true, -}, - -"schedulers": { - "enabled": true, -}, - -"cdrs": { - "enabled": true, -}, - -"attributes": { - "enabled": true, -}, - - "chargers": { "enabled": true, - "attributes_conns": ["*internal"], }, "sessions": { - "enabled": true, - "debit_interval": "5ms", // interval to perform debits on. + "enabled": true, // interval to perform debits on. "replication_conns": ["rplConn"], - "rals_conns": ["*internal"], - "cdrs_conns": ["*internal"], "chargers_conns": ["*internal"], }, "apiers": { "enabled": true, - "scheduler_conns": ["*internal"], }, } diff --git a/general_tests/session_graceful_shutdown_it_test.go b/general_tests/session_graceful_shutdown_it_test.go index 97b8130fe..c337f51ad 100644 --- a/general_tests/session_graceful_shutdown_it_test.go +++ b/general_tests/session_graceful_shutdown_it_test.go @@ -63,12 +63,14 @@ var ( func TestSessionSRplcGracefulShutdown(t *testing.T) { switch *dbType { case utils.MetaInternal: - t.SkipNow() + smgRplcCfgDIR1 = "rplcTestGracefulShutdown1_internal" + smgRplcCfgDIR2 = "rplcTestGracefulShutdown2_internal" case utils.MetaMySQL: smgRplcCfgDIR1 = "rplcTestGracefulShutdown1_mysql" smgRplcCfgDIR2 = "rplcTestGracefulShutdown2_mysql" case utils.MetaMongo: - t.SkipNow() + smgRplcCfgDIR1 = "rplcTestGracefulShutdown1_mongo" + smgRplcCfgDIR2 = "rplcTestGracefulShutdown2_mongo" case utils.MetaPostgres: t.SkipNow() default: