From daa7c2e43e18952b853f6ffbbf1ab73a2704a8e6 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Tue, 27 Jul 2021 16:51:22 +0300 Subject: [PATCH] Added and modified configs in order to fix integration tests --- apier/v1/rating_profile_late_it_test.go | 6 +-- .../processcdrs_late_internal/cgrates.json | 40 +++++++++++++++++ .../processcdrs_late_mongo/cgrates.json | 43 +++++++++++++++++++ .../processcdrs_late_mysql/cgrates.json | 40 +++++++++++++++++ data/conf/samples/tutinternal/cgrates.json | 1 - data/conf/samples/tutmongo/cgrates.json | 1 - data/conf/samples/tutmysql/cgrates.json | 1 - general_tests/broadcast_client_it_test.go | 2 +- 8 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 data/conf/samples/processcdrs_late_internal/cgrates.json create mode 100644 data/conf/samples/processcdrs_late_mongo/cgrates.json create mode 100644 data/conf/samples/processcdrs_late_mysql/cgrates.json diff --git a/apier/v1/rating_profile_late_it_test.go b/apier/v1/rating_profile_late_it_test.go index ea3b96664..113c32ecf 100644 --- a/apier/v1/rating_profile_late_it_test.go +++ b/apier/v1/rating_profile_late_it_test.go @@ -53,11 +53,11 @@ func TestRPLateIT2(t *testing.T) { // no need for a new config with *gob transport in this case switch *dbType { case utils.MetaInternal: - rpLateConfigDIR = "tutinternal" + rpLateConfigDIR = "processcdrs_late_internal" case utils.MetaMySQL: - rpLateConfigDIR = "tutmysql" + rpLateConfigDIR = "processcdrs_late_mysql" case utils.MetaMongo: - rpLateConfigDIR = "tutmongo" + rpLateConfigDIR = "processcdrs_late_mongo" case utils.MetaPostgres: t.SkipNow() default: diff --git a/data/conf/samples/processcdrs_late_internal/cgrates.json b/data/conf/samples/processcdrs_late_internal/cgrates.json new file mode 100644 index 000000000..7e03f2019 --- /dev/null +++ b/data/conf/samples/processcdrs_late_internal/cgrates.json @@ -0,0 +1,40 @@ +{ + // CGRateS Configuration file + // + // Used in apier/v1/rating_profile_late_it_test + + + "data_db":{ + "db_type": "*internal" + }, + + + "stor_db": { + "db_type": "*internal" + }, + + "rals": { + "enabled": true, + }, + + "cdrs": { + "enabled": true, + "rals_conns": ["*localhost"], + "chargers_conns":["*internal"], + }, + + "chargers": { + "enabled": true, + "attributes_conns": ["*internal"], + }, + + "attributes": { + "enabled": true, + "apiers_conns": ["*internal"] + }, + + "apiers": { + "enabled": true, + }, + +} diff --git a/data/conf/samples/processcdrs_late_mongo/cgrates.json b/data/conf/samples/processcdrs_late_mongo/cgrates.json new file mode 100644 index 000000000..0dbe7e852 --- /dev/null +++ b/data/conf/samples/processcdrs_late_mongo/cgrates.json @@ -0,0 +1,43 @@ +{ + // CGRateS Configuration file + // + // Used in apier/v1/rating_profile_late_it_test + + + "data_db": { + "db_type": "mongo", + "db_name": "10", + "db_port": 27017, + }, + + "stor_db": { + "db_type": "mongo", + "db_name": "cgrates", + "db_port": 27017, + }, + + "rals": { + "enabled": true, + }, + + "cdrs": { + "enabled": true, + "rals_conns": ["*localhost"], + "chargers_conns":["*internal"], + }, + + "chargers": { + "enabled": true, + "attributes_conns": ["*internal"], + }, + + "attributes": { + "enabled": true, + "apiers_conns": ["*internal"] + }, + + "apiers": { + "enabled": true, + }, + +} diff --git a/data/conf/samples/processcdrs_late_mysql/cgrates.json b/data/conf/samples/processcdrs_late_mysql/cgrates.json new file mode 100644 index 000000000..06e87f8e8 --- /dev/null +++ b/data/conf/samples/processcdrs_late_mysql/cgrates.json @@ -0,0 +1,40 @@ +{ + // CGRateS Configuration file + // + // Used in apier/v1/rating_profile_late_it_test + + + "data_db": { // database used to store runtime data (eg: accounts, cdr stats) + "db_type": "redis", // data_db type: + "db_port": 6379, // data_db port to reach the database + "db_name": "10", // data_db database name to connect to + }, + + "stor_db": { + "db_password": "CGRateS.org", + }, + + "rals": { + "enabled": true, + }, + + "cdrs": { + "enabled": true, + "rals_conns": ["*localhost"], + "chargers_conns":["*internal"], + }, + + "chargers": { + "enabled": true, + "attributes_conns": ["*internal"], + }, + + "attributes": { + "enabled": true, + "apiers_conns": ["*internal"] + }, + + "apiers": { + "enabled": true, + } +} diff --git a/data/conf/samples/tutinternal/cgrates.json b/data/conf/samples/tutinternal/cgrates.json index c360f6c03..705935671 100644 --- a/data/conf/samples/tutinternal/cgrates.json +++ b/data/conf/samples/tutinternal/cgrates.json @@ -43,7 +43,6 @@ "cdrs": { "enabled": true, "chargers_conns":["*internal"], - "rals_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index a12d3815f..3f3de89db 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -46,7 +46,6 @@ "cdrs": { "enabled": true, "chargers_conns":["*internal"], - "rals_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmysql/cgrates.json b/data/conf/samples/tutmysql/cgrates.json index d261847fa..92229e4f3 100644 --- a/data/conf/samples/tutmysql/cgrates.json +++ b/data/conf/samples/tutmysql/cgrates.json @@ -43,7 +43,6 @@ "cdrs": { "enabled": true, "chargers_conns":["*internal"], - "rals_conns": ["*internal"] }, diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index e77b6db72..cd16e8b31 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -205,7 +205,7 @@ func testbrodcastItGetCDRs(t *testing.T) { cdrs[0].SetupTime = cdrs[0].SetupTime.UTC() // uniform time cdrs[0].AnswerTime = cdrs[0].AnswerTime.UTC() // uniform time if !reflect.DeepEqual(eCDR, cdrs[0]) { - t.Errorf("Expected: %s ,received: %s", utils.ToJSON(eCDR), utils.ToJSON(cdrs[0])) + t.Errorf("Expected: %s \n,received: %s", utils.ToJSON(eCDR), utils.ToJSON(cdrs[0])) } }