From ab8ac753cb77df0a139f10af36b28f537c46517d Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 3 Dec 2019 13:46:59 +0200 Subject: [PATCH] Updated sessions integration tests --- data/conf/samples/gob/smg/cgrates.json | 80 +++++++++++++++++++ .../samples/gob/smgreplcmaster/cgrates.json | 65 +++++++++++++++ .../samples/gob/smgreplcslave/cgrates.json | 66 +++++++++++++++ sessions/sessions_data_it_test.go | 3 + sessions/sessions_it_test.go | 3 + sessions/sessions_rpl_it_test.go | 6 ++ sessions/sessions_voice_it_test.go | 3 + 7 files changed, 226 insertions(+) create mode 100644 data/conf/samples/gob/smg/cgrates.json create mode 100644 data/conf/samples/gob/smgreplcmaster/cgrates.json create mode 100644 data/conf/samples/gob/smgreplcslave/cgrates.json diff --git a/data/conf/samples/gob/smg/cgrates.json b/data/conf/samples/gob/smg/cgrates.json new file mode 100644 index 000000000..ca1496bbd --- /dev/null +++ b/data/conf/samples/gob/smg/cgrates.json @@ -0,0 +1,80 @@ +{ +// 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 +}, + +"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" + }, +}, + +"scheduler": { + "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": [ + {"address": "*internal"} + ], +}, + +"sessions": { + "enabled": true, + "session_ttl": "50ms", + "rals_conns": [ + {"address": "127.0.0.1:2013", "transport": "*gob"} + ], + "cdrs_conns": [ + {"address": "127.0.0.1:2013", "transport": "*gob"} // address where to reach CDR Server, empty to disable CDR capturing <*internal|x.y.z.y:1234> + ], + "chargers_conns": [ + {"address": "*internal"} + ], +}, + + +"apier": { + "scheduler_conns": [ // connections to SchedulerS for reloads + {"address": "*internal"}, + ], +}, + + +} diff --git a/data/conf/samples/gob/smgreplcmaster/cgrates.json b/data/conf/samples/gob/smgreplcmaster/cgrates.json new file mode 100644 index 000000000..87a7935f7 --- /dev/null +++ b/data/conf/samples/gob/smgreplcmaster/cgrates.json @@ -0,0 +1,65 @@ +{ +// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +// Copyright (C) ITsysCOM GmbH +"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", +}, + +"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, +}, + +"scheduler": { + "enabled": true, +}, + +"cdrs": { + "enabled": true, +}, + +"attributes": { + "enabled": true, +}, + + +"chargers": { + "enabled": true, + "attributes_conns": [ + {"address": "*internal"} + ], +}, + +"sessions": { + "enabled": true, + "replication_conns": [ + {"address": "127.0.0.1:22013", "transport": "*gob"}, + ], + "rals_conns": [ + {"address": "*internal"} + ], + "cdrs_conns": [ + {"address": "*internal"} + ], + "chargers_conns": [ + {"address": "*internal"} + ], +}, + +"apier": { + "scheduler_conns": [ // connections to SchedulerS for reloads + {"address": "*internal"}, + ], +}, + +} diff --git a/data/conf/samples/gob/smgreplcslave/cgrates.json b/data/conf/samples/gob/smgreplcslave/cgrates.json new file mode 100644 index 000000000..a83c524a0 --- /dev/null +++ b/data/conf/samples/gob/smgreplcslave/cgrates.json @@ -0,0 +1,66 @@ +{ +// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments +// Copyright (C) ITsysCOM GmbH +"general": { + "log_level": 7, + "node_id":"SlaveReplication", +}, + +"listen": { + "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 +}, + +"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: +}, + +"cdrs": { + "enabled": true, // start the CDR Server service: +}, + +"scheduler": { + "enabled": true, +}, + +"attributes": { + "enabled": true, +}, + + +"chargers": { + "enabled": true, + "attributes_conns": [ + {"address": "*internal"} + ], +}, + +"sessions": { + "enabled": true, // starts SessionManager service: + "listen_bijson": "127.0.0.1:22014", // address where to listen for bidirectional JSON-RPC requests + "replication_conns": [ + {"address": "127.0.0.1:2013", "transport": "*gob"}, + ], + "rals_conns": [ + {"address": "127.0.0.1:22013", "transport": "*gob"}, + ], + "cdrs_conns": [ + {"address": "*internal"} + ], + "chargers_conns": [ + {"address": "*internal"} + ], +}, + +"apier": { + "scheduler_conns": [ // connections to SchedulerS for reloads + {"address": "*internal"}, + ], +}, + +} diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index b8fdfe24d..4adebd06c 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -36,6 +36,9 @@ var sDataRPC *rpc.Client func TestSessionsDataInitCfg(t *testing.T) { dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg") + if *encoding == utils.MetaGOB { + dataCfgPath = path.Join(*dataDir, "conf", "samples", "gob", "smg") + } // Init config first var err error dataCfg, err = config.NewCGRConfigFromPath(dataCfgPath) diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 614ee1701..0cdf234ab 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -37,6 +37,9 @@ var sItRPC *rpc.Client func TestSessionsItInitCfg(t *testing.T) { sItCfgPath = path.Join(*dataDir, "conf", "samples", "smg") + if *encoding == utils.MetaGOB { + dataCfgPath = path.Join(*dataDir, "conf", "samples", "gob", "smg") + } // Init config first var err error sItCfg, err = config.NewCGRConfigFromPath(sItCfgPath) diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 02b7f95cf..99583652a 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -37,12 +37,18 @@ var smgRplcMstrRPC, smgRplcSlvRPC *rpc.Client func TestSessionSRplInitCfg(t *testing.T) { smgRplcMasterCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcmaster") + if *encoding == utils.MetaGOB { + smgRplcMasterCfgPath = path.Join(*dataDir, "conf", "samples", "gob", "smgreplcmaster") + } if smgRplcMasterCfg, err = config.NewCGRConfigFromPath(smgRplcMasterCfgPath); err != nil { t.Fatal(err) } smgRplcMasterCfg.DataFolderPath = *dataDir // Share DataFolderPath through config towards StoreDb for Flush() config.SetCgrConfig(smgRplcMasterCfg) smgRplcSlaveCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcslave") + if *encoding == utils.MetaGOB { + smgRplcSlaveCfgPath = path.Join(*dataDir, "conf", "samples", "gob", "smgreplcslave") + } if smgRplcSlaveCfg, err = config.NewCGRConfigFromPath(smgRplcSlaveCfgPath); err != nil { t.Fatal(err) } diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 078accc50..d0d0fd214 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -57,6 +57,9 @@ func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) { func TestSessionsVoiceInitCfg(t *testing.T) { voiceCfgPath = path.Join(*dataDir, "conf", "samples", "smg") + if *encoding == utils.MetaGOB { + dataCfgPath = path.Join(*dataDir, "conf", "samples", "gob", "smg") + } // Init config first var err error voiceCfg, err = config.NewCGRConfigFromPath(voiceCfgPath)