From 58eddbc9d1d8db2530d42416a0aa0406076809ee Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 12 Dec 2019 12:58:50 +0200 Subject: [PATCH 1/3] Updated dispatchers sessions integration tests --- dispatchers/sessions_it_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 1d6aa2c3e..63353c017 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -342,6 +342,7 @@ func testDspSessionUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", utils.ToR: utils.VOICE, @@ -381,7 +382,7 @@ func testDspSessionUpdate(t *testing.T) { utils.SetupTime: "2018-01-07T17:00:00Z", utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: float64(reqUsage), - "CGRID": "5668666d6b8e44eb949042f25ce0796ec3592ff9", + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", }, }, } @@ -480,6 +481,7 @@ func testDspSessionTerminate(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItUpdateSession", Event: map[string]interface{}{ + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", utils.Tenant: "cgrates.org", utils.Category: "call", utils.ToR: utils.VOICE, @@ -516,7 +518,7 @@ func testDspSessionProcessCDR(t *testing.T) { utils.Category: "call", utils.ToR: utils.VOICE, utils.OriginID: "TestSSv1It1", - utils.RequestType: utils.META_PREPAID, + utils.RequestType: utils.META_POSTPAID, utils.Account: "1001", utils.Destination: "1002", utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), @@ -549,10 +551,11 @@ func testDspSessionProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", utils.Tenant: "cgrates.org", utils.Category: "call", utils.ToR: utils.VOICE, + utils.OriginHost: "disp", utils.OriginID: "TestSSv1It2", utils.RequestType: utils.META_PREPAID, utils.Account: "1001", @@ -584,13 +587,14 @@ func testDspSessionProcessEvent(t *testing.T) { Tenant: "cgrates.org", ID: "TestSSv1ItProcessEvent", Event: map[string]interface{}{ - utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", + utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac", utils.Tenant: "cgrates.org", utils.Category: "call", utils.ToR: utils.VOICE, utils.Account: "1001", utils.Destination: "1002", "OfficeGroup": "Marketing", + utils.OriginHost: "disp", utils.OriginID: "TestSSv1It2", utils.RequestType: utils.META_PREPAID, utils.SetupTime: "2018-01-07T17:00:00Z", From 33209ec7b014e3d65ff900811cec1deea63c81ce Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 12 Dec 2019 13:51:15 +0200 Subject: [PATCH 2/3] Updated CDR defaults values --- apier/v1/cdre_it_test.go | 2 +- engine/action.go | 1 - engine/cdr.go | 2 +- engine/cdr_test.go | 2 +- engine/mapevent.go | 2 +- engine/mapevent_test.go | 6 +++--- engine/safevent_test.go | 6 +++--- general_tests/cdrs_it_test.go | 2 +- general_tests/rpccaching_it_test.go | 4 ++-- utils/apitpdata.go | 1 - utils/apitpdata_test.go | 1 - 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apier/v1/cdre_it_test.go b/apier/v1/cdre_it_test.go index 1ada17690..57769efc2 100755 --- a/apier/v1/cdre_it_test.go +++ b/apier/v1/cdre_it_test.go @@ -214,7 +214,7 @@ func testCDReProcessExternalCdr(t *testing.T) { } else { for _, c := range cdrs { if c.RunID == utils.MetaRaw && c.Cost != -1 { - t.Errorf("Expected for *raw cdr cost to be -1, recived: %v", c.Cost) + t.Errorf("Expected for %s cdr cost to be -1, recived: %v", utils.MetaRaw, c.Cost) } if c.RunID == utils.MetaDefault && c.Cost != 0.3 { t.Errorf("Expected for *default cdr cost to be 0.3, recived: %v", c.Cost) diff --git a/engine/action.go b/engine/action.go index b59aa781d..1dc63ba9d 100644 --- a/engine/action.go +++ b/engine/action.go @@ -1063,7 +1063,6 @@ func resetAccount(ub *Account, action *Action, acts Actions, _ interface{}) erro } account := ub.GetID() filter := &utils.CDRsFilter{ - NotRunIDs: []string{utils.MetaRaw}, Accounts: []string{account}, NotCosts: []float64{-1}, OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.INFIELD_SEP), diff --git a/engine/cdr.go b/engine/cdr.go index 840dd30af..9f09fe104 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -112,7 +112,7 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) { cdr.ComputeCGRID() } if cdr.RunID == utils.EmptyString { - cdr.RunID = utils.MetaRaw + cdr.RunID = utils.MetaDefault } if cdr.ToR == utils.EmptyString { cdr.ToR = utils.VOICE diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 9fa807184..b5f6d1106 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -1093,7 +1093,7 @@ func TestCDRAddDefaults(t *testing.T) { eCDR := &CDR{ CGRID: "bf736fb56ce586357ab2f286b777187a1612c6e6", ToR: utils.VOICE, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, Subject: "1001", RequestType: utils.META_RATED, Tenant: "cgrates.org", diff --git a/engine/mapevent.go b/engine/mapevent.go index 6f0593e5b..55958906e 100644 --- a/engine/mapevent.go +++ b/engine/mapevent.go @@ -180,7 +180,7 @@ func (me MapEvent) AsMapString(ignoredFlds *utils.StringSet) (mp map[string]stri return } -// AsCDR exports the SafEvent as CDR +// AsCDR exports the MapEvent as CDR func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err error) { cdr = &CDR{Tenant: tnt, Cost: -1.0, ExtraFields: make(map[string]string)} for k, v := range me { diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index c4d7b0c2b..5572a0dfc 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -289,7 +289,7 @@ func TestMapEventAsCDR(t *testing.T) { expected = &CDR{ CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", Cost: -1.0, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, @@ -362,7 +362,7 @@ func TestMapEventAsCDR(t *testing.T) { "ExtraField1": "5", "ExtraField2": "extra", }, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, @@ -618,7 +618,7 @@ func TestMapEventAsCDR(t *testing.T) { "ExtraField1": "5", "ExtraField2": "extra", }, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Category: cfg.GeneralCfg().DefaultCategory, diff --git a/engine/safevent_test.go b/engine/safevent_test.go index 00dd03b6e..86a7bf726 100644 --- a/engine/safevent_test.go +++ b/engine/safevent_test.go @@ -647,7 +647,7 @@ func TestSafEventAsCDR(t *testing.T) { expected = &CDR{ CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", Cost: -1.0, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, @@ -710,7 +710,7 @@ func TestSafEventAsCDR(t *testing.T) { "ExtraField1": "5", "ExtraField2": "extra", }, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Tenant: cfg.GeneralCfg().DefaultTenant, @@ -744,7 +744,7 @@ func TestSafEventAsCDR(t *testing.T) { "ExtraField1": "5", "ExtraField2": "extra", }, - RunID: utils.MetaRaw, + RunID: utils.MetaDefault, ToR: utils.VOICE, RequestType: cfg.GeneralCfg().DefaultReqType, Category: cfg.GeneralCfg().DefaultCategory, diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index 37ad35b80..7d010b323 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -338,7 +338,7 @@ func testV2CDRsGetCdrs3(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsProcessCDR3"}} + args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testV2CDRsProcessCDR3"}} if err := cdrsRpc.Call(utils.ApierV2GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index c3ab7762f..09fa6c2d7 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -548,7 +548,7 @@ func testRPCMethodsProcessCDR(t *testing.T) { time.Sleep(100 * time.Millisecond) //verify the CDR var cdrs []*engine.CDR - argsCDR := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}} + argsCDR := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}}} if err := rpcRpc.Call(utils.CDRsV1GetCDRs, argsCDR, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -714,7 +714,7 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) { time.Sleep(time.Duration(150) * time.Millisecond) // Give time for CDR to be rated //verify the CDR var cdrs []*engine.CDR - argsCDR := utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}} + argsCDR := utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}}} if err := rpcRpc.Call(utils.CDRsV1GetCDRs, argsCDR, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 448b16910..3963ec69d 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -525,7 +525,6 @@ func (aefc *AttrExpFileCdrs) AsCDRsFilter(timezone string) (*CDRsFilter, error) cdrFltr := &CDRsFilter{ CGRIDs: aefc.CgrIds, RunIDs: aefc.MediationRunIds, - NotRunIDs: []string{MetaRaw}, // In exportv1 automatically filter out *raw CDRs ToRs: aefc.TORs, OriginHosts: aefc.CdrHosts, Sources: aefc.CdrSources, diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index 5c3959274..4ea7d7a99 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -374,7 +374,6 @@ func TestAttrExpFileCdrsAsCDRsFilter(t *testing.T) { eOut := &CDRsFilter{ CGRIDs: attrExpFileCdrs.CgrIds, RunIDs: attrExpFileCdrs.MediationRunIds, - NotRunIDs: []string{MetaRaw}, ToRs: attrExpFileCdrs.TORs, OriginHosts: attrExpFileCdrs.CdrHosts, Sources: attrExpFileCdrs.CdrSources, From bceed9102bd63c2f446f0a2177523c053e77de14 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 12 Dec 2019 18:16:35 +0200 Subject: [PATCH 3/3] Updated cache integration tests --- apier/v1/apier_it_test.go | 7 ++++--- apier/v1/caches_it_test.go | 3 ++- data/tariffplans/testtp/ActionPlans.csv | 2 +- data/tariffplans/testtp/Actions.csv | 4 ++-- dispatchers/caches_it_test.go | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index f0e380504..f41062d55 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1358,9 +1358,10 @@ func TestApierResetDataAfterLoadFromFolder(t *testing.T) { expStats := engine.GetDefaultEmptyCacheStats() expStats[utils.CacheAccountActionPlans].Items = 13 expStats[utils.CacheActionPlans].Items = 7 - expStats[utils.CacheActions].Items = 6 + expStats[utils.CacheActions].Items = 5 expStats[utils.CacheDestinations].Items = 3 expStats[utils.CacheLoadIDs].Items = 14 + expStats[utils.CacheRPCConnections].Items = 2 if err := rater.Call(utils.CacheSv1GetCacheStats, new(utils.AttrCacheIDsWithArgDispatcher), &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expStats, rcvStats) { @@ -1403,8 +1404,8 @@ func TestApierGetAccountAfterLoad(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := rater.Call(utils.ApierV2GetAccount, attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11 { - t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply)) + } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 13 { + t.Errorf("Calling ApierV1.GetBalance expected: 13, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply)) } } diff --git a/apier/v1/caches_it_test.go b/apier/v1/caches_it_test.go index 40f74c68d..ccf9c4fd6 100644 --- a/apier/v1/caches_it_test.go +++ b/apier/v1/caches_it_test.go @@ -126,9 +126,10 @@ func testCacheSAfterLoadFromFolder(t *testing.T) { expStats := engine.GetDefaultEmptyCacheStats() expStats[utils.CacheAccountActionPlans].Items = 13 expStats[utils.CacheActionPlans].Items = 7 - expStats[utils.CacheActions].Items = 6 + expStats[utils.CacheActions].Items = 5 expStats[utils.CacheDestinations].Items = 3 expStats[utils.CacheLoadIDs].Items = 14 + expStats[utils.CacheRPCConnections].Items = 2 if err := chcRPC.Call(utils.CacheSv1GetCacheStats, &utils.AttrCacheIDsWithArgDispatcher{}, &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expStats, rcvStats) { diff --git a/data/tariffplans/testtp/ActionPlans.csv b/data/tariffplans/testtp/ActionPlans.csv index 7433cfc52..29fbdc73a 100644 --- a/data/tariffplans/testtp/ActionPlans.csv +++ b/data/tariffplans/testtp/ActionPlans.csv @@ -1,6 +1,6 @@ #Tag,ActionsTag,TimingTag,Weight PREPAID_10,PREPAID_10,ASAP,10 -PREPAID_10,BONUS_1,ASAP,10 +PREPAID_10,BONUS_3,ASAP,10 TEST_EXE,TOPUP_EXE,ALWAYS,10 TEST_DATA_r,TOPUP_DATA_r,ASAP,10 TEST_VOICE,TOPUP_VOICE,ASAP,10 diff --git a/data/tariffplans/testtp/Actions.csv b/data/tariffplans/testtp/Actions.csv index 8a0380f4d..b3edd608d 100644 --- a/data/tariffplans/testtp/Actions.csv +++ b/data/tariffplans/testtp/Actions.csv @@ -1,6 +1,6 @@ #ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16] -PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,10 -BONUS_1,*topup,,,,*monetary,,*any,,,*unlimited,,1,10,false,false,10 +PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,20 +BONUS_3,*topup,,,,*monetary,,*any,,,*unlimited,,3,10,false,false,10 LOG_BALANCE,*log,,,,,,,,,,,,,false,false,10 CDRST_WARN_HTTP,*call_url,http://localhost:8080,,,,,,,,,,,,false,false,10 CDRST_LOG,*log,,,,,,,,,,,,,false,false,10 diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index c13ac54ee..92e5c1681 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -93,6 +93,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { expStats[utils.CacheActions].Items = 1 expStats[utils.CacheDestinations].Items = 4 expStats[utils.CacheLoadIDs].Items = 17 + expStats[utils.CacheRPCConnections].Items = 2 args := utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ APIKey: utils.StringPointer("chc12345"),