From 949bf3eb996503207f5e7fa776b49da7b3368447 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Tue, 12 Oct 2021 10:21:26 +0300 Subject: [PATCH] Modified account name --- .../session_volume_discount_internal/cgrates.json | 4 ++-- .../session_volume_discount_mongo/cgrates.json | 4 ++-- .../session_volume_discount_mysql/cgrates.json | 4 ++-- .../sessions_discount_volume/routes1/Filters.csv | 2 +- general_tests/session_volume_discount_it_test.go | 12 +++++++----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/data/conf/samples/session_volume_discount_internal/cgrates.json b/data/conf/samples/session_volume_discount_internal/cgrates.json index ff9924f69..344d09e2f 100644 --- a/data/conf/samples/session_volume_discount_internal/cgrates.json +++ b/data/conf/samples/session_volume_discount_internal/cgrates.json @@ -42,11 +42,11 @@ "*notstring:~*req.Account:sipp": true, }, "*rateS": { - "*notstring:~*req.Account:sipp|dan.bogos": true, + "*notstring:~*req.Account:sipp|1001": true, "*string:~*req.RunID:customers": true, }, "*accountS": { - "*string:~*req.Account:dan.bogos;*string:~*req.RunID:suppliers": true, + "*string:~*req.Account:1001;*string:~*req.RunID:suppliers": true, }, "*eeS": { "*default": true, diff --git a/data/conf/samples/session_volume_discount_mongo/cgrates.json b/data/conf/samples/session_volume_discount_mongo/cgrates.json index 40c52df0d..98aab481d 100644 --- a/data/conf/samples/session_volume_discount_mongo/cgrates.json +++ b/data/conf/samples/session_volume_discount_mongo/cgrates.json @@ -47,11 +47,11 @@ "*notstring:~*req.Account:sipp": true, }, "*rateS": { - "*notstring:~*req.Account:sipp|dan.bogos": true, + "*notstring:~*req.Account:sipp|1001": true, "*string:~*req.RunID:customers": true, }, "*accountS": { - "*string:~*req.Account:dan.bogos;*string:~*req.RunID:suppliers": true, + "*string:~*req.Account:1001;*string:~*req.RunID:suppliers": true, }, "*eeS": { "*default": true, diff --git a/data/conf/samples/session_volume_discount_mysql/cgrates.json b/data/conf/samples/session_volume_discount_mysql/cgrates.json index f234bcd6b..6dfec7bf9 100644 --- a/data/conf/samples/session_volume_discount_mysql/cgrates.json +++ b/data/conf/samples/session_volume_discount_mysql/cgrates.json @@ -44,11 +44,11 @@ "*notstring:~*req.Account:sipp": true, }, "*rateS": { - "*notstring:~*req.Account:sipp|dan.bogos": true, + "*notstring:~*req.Account:sipp|1001": true, "*string:~*req.RunID:customers": true, }, "*accountS": { - "*string:~*req.Account:dan.bogos;*string:~*req.RunID:suppliers": true, + "*string:~*req.Account:1001;*string:~*req.RunID:suppliers": true, }, "*eeS": { "*default": true, diff --git a/data/tariffplans/sessions_discount_volume/routes1/Filters.csv b/data/tariffplans/sessions_discount_volume/routes1/Filters.csv index 7cda0f4e9..dfd238ffd 100644 --- a/data/tariffplans/sessions_discount_volume/routes1/Filters.csv +++ b/data/tariffplans/sessions_discount_volume/routes1/Filters.csv @@ -1,3 +1,3 @@ #Tenant[0],ID[1],Type[2],Element[3],Values[4] -cgrates.org,FLTR_VOLUME_ACCOUNTS,*string,~*req.Account,dan.bogos \ No newline at end of file +cgrates.org,FLTR_VOLUME_ACCOUNTS,*string,~*req.Account,1001 \ No newline at end of file diff --git a/general_tests/session_volume_discount_it_test.go b/general_tests/session_volume_discount_it_test.go index 6ed8120ff..ba9563aca 100644 --- a/general_tests/session_volume_discount_it_test.go +++ b/general_tests/session_volume_discount_it_test.go @@ -263,7 +263,7 @@ func testSessVolDiscAuthorizeEventSortRoutes11Min10Sec(t *testing.T) { Tenant: "cgrates.org", ID: "testSessVolDiscAuthorizeEvent1", Event: map[string]interface{}{ - utils.AccountField: "dan.bogos", + utils.AccountField: "1001", utils.Category: "call", utils.ToR: "*voice", }, @@ -330,7 +330,7 @@ func testSessVolDiscAuthorizeEventSortRoutes20Min(t *testing.T) { Tenant: "cgrates.org", ID: "testSessVolDiscAuthorizeEvent1", Event: map[string]interface{}{ - utils.AccountField: "dan.bogos", + utils.AccountField: "1001", utils.Category: "call", utils.ToR: "*voice", }, @@ -355,8 +355,9 @@ func testSessVolDiscProcessCDRSupplier(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.AccountField: "dan.bogos", + utils.AccountField: "1001", utils.Destination: "1002", + utils.RouteID: "supplier1", }, APIOpts: map[string]interface{}{ utils.StartTime: time.Date(2020, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -379,8 +380,9 @@ func testSessVolDiscProcessCDRCustomer(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessCDR", Event: map[string]interface{}{ - utils.AccountField: "sipp", + utils.AccountField: "DifferentAccount", utils.Destination: "1002", + utils.RouteID: "supplier1", }, APIOpts: map[string]interface{}{ utils.StartTime: time.Date(2020, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -522,7 +524,7 @@ func testSessVolDiscAuthorizeEventSortRoutes1Min30SecAfterDebiting(t *testing.T) Tenant: "cgrates.org", ID: "testSessVolDiscAuthorizeEvent1", Event: map[string]interface{}{ - utils.AccountField: "dan.bogos", + utils.AccountField: "1001", utils.Category: "call", utils.ToR: "*voice", },