From a708e398f6ace3b486d77f5749e97a40104cd193 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 17 Jul 2020 17:00:16 +0300 Subject: [PATCH] Updated *chargers flag to use the RunID instead of ChargerID as key --- apier/v1/sessions_process_event_it_test.go | 4 ++-- apier/v1/sessionsv1_it_test.go | 2 +- apier/v2/cdrs_it_test.go | 16 ++++++++-------- data/tariffplans/testit/Chargers.csv | 2 +- engine/z_actions_it_test.go | 4 ++-- general_tests/cdrs_it_test.go | 10 +++++----- general_tests/cdrs_processevent_it_test.go | 8 ++++---- sessions/sessions.go | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index 0c5556dfa..8e8f7eccd 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -439,7 +439,7 @@ func testSSv1ItGetCDRs(t *testing.T) { } var cdrs []*engine.CDR - args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}} + args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{"raw"}}} if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -701,7 +701,7 @@ func testSSv1ItGetCDRsFromProcessEvent(t *testing.T) { var cdrs []*engine.CDR args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{ OriginIDs: []string{"testSSv1ItProcessEventWithCDR"}, - RunIDs: []string{utils.MetaRaw}}} + RunIDs: []string{"raw"}}} if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index e457725ca..0002ef51e 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -670,7 +670,7 @@ func testSSv1ItCDRsGetCdrs(t *testing.T) { } var cdrs []*engine.CDR - args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}} + args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{"raw"}}} if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 2 { diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index 96f71c268..77ad77774 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -181,7 +181,7 @@ func testV2CDRsGetCdrs(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -282,7 +282,7 @@ func testV2CDRsRateCDRs(t *testing.T) { } if err := cdrsRpc.Call(utils.CDRsV1RateCDRs, &engine.ArgRateCDRs{ - RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{utils.MetaRaw}}, + RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{"raw"}}, Flags: []string{"*chargers:false"}, }, &reply); err != nil { t.Error("Unexpected error: ", err.Error()) @@ -300,7 +300,7 @@ func testV2CDRsGetCdrs2(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -361,7 +361,7 @@ func testV2CDRsUsageNegative(t *testing.T) { } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsUsageNegative"}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsUsageNegative"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -580,7 +580,7 @@ func testV2CDRsGetCdrsNoRattingPlan(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -654,7 +654,7 @@ func testV2CDRsRateCDRsWithRatingPlan(t *testing.T) { } if err := cdrsRpc.Call(utils.CDRsV1RateCDRs, &engine.ArgRateCDRs{ - RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}}, + RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}}, Flags: []string{"*chargers:true"}, }, &reply); err != nil { t.Error("Unexpected error: ", err.Error()) @@ -672,7 +672,7 @@ func testV2CDRsGetCdrsWithRattingPlan(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -812,7 +812,7 @@ func testv2CDRsGetCDRsDest(t *testing.T) { Event: map[string]interface{}{ utils.CGRID: "9b3cd5e698af94f8916220866c831a982ed16318", utils.ToR: utils.VOICE, - utils.RunID: utils.MetaRaw, + utils.RunID: "raw", utils.OriginID: "25160047719:0", utils.OriginHost: "192.168.1.1", utils.Source: "*sessions", diff --git a/data/tariffplans/testit/Chargers.csv b/data/tariffplans/testit/Chargers.csv index df4000134..2c17f1509 100644 --- a/data/tariffplans/testit/Chargers.csv +++ b/data/tariffplans/testit/Chargers.csv @@ -1,4 +1,4 @@ #Tenant,ID,FilterIDs,ActivationInterval,RunID,AttributeIDs,Weight -cgrates.org,Raw,,,*raw,*constant:*req.RequestType:*none,20 +cgrates.org,Raw,,,raw,*constant:*req.RequestType:*none,20 cgrates.org,CustomerCharges,,,CustomerCharges,*none,20 cgrates.org,SupplierCharges,,,SupplierCharges,ATTR_SUPPLIER1,10 \ No newline at end of file diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index 71d6f01c2..cb596a205 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -536,7 +536,7 @@ func testActionsitThresholdCgrRpcAction(t *testing.T) { var reply string attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_CGRRPC", Actions: []*utils.TPAction{ - &utils.TPAction{Identifier: utils.CGR_RPC, ExtraParameters: `{"Address": "127.0.0.1:2012", + {Identifier: utils.CGR_RPC, ExtraParameters: `{"Address": "127.0.0.1:2012", "Transport": "*json", "Method": "RALsV1.Ping", "Attempts":1, @@ -604,7 +604,7 @@ func testActionsitThresholdPostEvent(t *testing.T) { //if we check syslog we will see that it tries to post attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_POSTEVENT", Actions: []*utils.TPAction{ - &utils.TPAction{Identifier: utils.MetaPostEvent, ExtraParameters: "http://127.0.0.1:12080/invalid_json"}, + {Identifier: utils.MetaPostEvent, ExtraParameters: "http://127.0.0.1:12080/invalid_json"}, }} if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() { t.Error("Got error on APIerSv2.SetActions: ", err.Error()) diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index f4ac4aa63..f37413c73 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -197,7 +197,7 @@ func testV2CDRsGetCdrs(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -268,7 +268,7 @@ func testV2CDRsGetCdrs2(t *testing.T) { t.Error("Unexpected number of CDRs returned: ", cdrCnt) } var cdrs []*engine.ExternalCDR - args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsProcessCDR2"}} + args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsProcessCDR2"}} if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 1 { @@ -404,7 +404,7 @@ func testV2CDRsGetCdrs4(t *testing.T) { } var cdrs []*engine.ExternalCDR args := utils.RPCCDRsFilter{ - RunIDs: []string{utils.MetaRaw}, + RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsProcessCDR4"}, } if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { @@ -449,7 +449,7 @@ func testV2CDRsGetCdrs5(t *testing.T) { } var cdrs []*engine.ExternalCDR args := utils.RPCCDRsFilter{ - RunIDs: []string{utils.MetaRaw}, + RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsProcessCDR5"}, } if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err == nil || err.Error() != utils.ErrNotFound.Error() { @@ -720,7 +720,7 @@ func testV2CDRsGetCdrs7(t *testing.T) { } var cdrs []*engine.ExternalCDR args := utils.RPCCDRsFilter{ - RunIDs: []string{utils.MetaRaw}, + RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsProcessCDR7"}, } if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil { diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index 05dfbb2c5..5a5983e0f 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -272,10 +272,10 @@ func testV1CDRsProcessEventChrgS(t *testing.T) { t.Errorf("Expecting: test2_processEvent, received: %+v, %+v, %+v ", cdrs[0].OriginID, cdrs[1].OriginID, cdrs[2].OriginID) } sort.Slice(cdrs, func(i, j int) bool { return cdrs[i].RunID < cdrs[j].RunID }) - if cdrs[0].RunID != utils.MetaRaw { // charger with RunID *raw - t.Errorf("Expecting: %+v, received: %+v", utils.MetaRaw, cdrs[0].RunID) - } else if cdrs[1].RunID != "CustomerCharges" { - t.Errorf("Expecting: %+v, received: %+v", "CustomerCharges", cdrs[1].RunID) + if cdrs[1].RunID != "raw" { // charger with RunID *raw + t.Errorf("Expecting: %+v, received: %+v", "raw", cdrs[1].RunID) + } else if cdrs[0].RunID != "CustomerCharges" { + t.Errorf("Expecting: %+v, received: %+v", "CustomerCharges", cdrs[0].RunID) } else if cdrs[2].RunID != "SupplierCharges" { t.Errorf("Expecting: %+v, received: %+v", "SupplierCharges", cdrs[2].RunID) } diff --git a/sessions/sessions.go b/sessions/sessions.go index ea085aad9..ee32f0e15 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -3170,7 +3170,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, return } for _, chrgr := range chrgrs { - events[chrgr.ChargerSProfile] = &utils.CGREventWithOpts{ + events[utils.IfaceAsString(chrgr.CGREvent.Event[utils.RunID])] = &utils.CGREventWithOpts{ CGREvent: chrgr.CGREvent, Opts: chrgr.Opts, ArgDispatcher: args.ArgDispatcher,