uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

In case of ResourceError when call SessionSv1.ProcessEvent allow CDR to be written

Browse Source
This commit is contained in:
TeoV
2020-07-20 16:19:44 +03:00
committed by Dan Christian Bogos
parent 895c25f4c4
commit e626ee19d3
2 changed files with 93 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
apier/v1/sessions_process_event_it_test.go
View File

@@ -56,6 +56,8 @@ var sTestSessionSv1ProcessEvent = []func(t *testing.T){
testSSv1ItGetCost,
testSSv1ItProcessEventWithCDR,
testSSv1ItGetCDRsFromProcessEvent,
testSSv1ItProcessEventWithCDRResourceError,
testSSv1ItGetCDRsFromProcessEventResourceError,
testSSv1ItStopCgrEngine,
}
@@ -738,3 +740,81 @@ func testSSv1ItGetCDRsFromProcessEvent(t *testing.T) {
}
}
}
func testSSv1ItProcessEventWithCDRResourceError(t *testing.T) {
args := &sessions.V1ProcessEventArgs{
Flags: []string{utils.MetaCDRs + utils.InInFieldSep + utils.MetaRALs,
utils.ConcatenatedKey(utils.MetaResources, utils.MetaRelease)}, // force a resource error and expect that the cdr to be written
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "testSSv1ItProcessEventWithCDRResourceError",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.ToR: utils.VOICE,
utils.OriginID: "testSSv1ItProcessEventWithCDRResourceError",
utils.RequestType: sSV1RequestType,
utils.Account: "1001",
utils.Subject: "ANY2CNT",
utils.Destination: "1002",
utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC),
utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC),
utils.Usage: 10 * time.Minute,
},
},
}
var rply sessions.V1ProcessEventReply
if err := sSv1BiRpc.Call(utils.SessionSv1ProcessEvent,
args, &rply); err == nil || err.Error() != utils.ErrPartiallyExecuted.Error() {
t.Error(err)
}
time.Sleep(100 * time.Millisecond)
}
func testSSv1ItGetCDRsFromProcessEventResourceError(t *testing.T) {
var cdrCnt int64
req := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{
OriginIDs: []string{"testSSv1ItProcessEventWithCDRResourceError"}}}
if err := sSApierRpc.Call(utils.CDRsV1GetCDRsCount, req, &cdrCnt); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if cdrCnt != 3 { // 3 for each CDR
t.Error("Unexpected number of CDRs returned: ", cdrCnt)
}
var cdrs []*engine.CDR
args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{
OriginIDs: []string{"testSSv1ItProcessEventWithCDRResourceError"},
RunIDs: []string{"raw"}}}
if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {
t.Error("Unexpected number of CDRs returned: ", len(cdrs))
} else {
if cdrs[0].Cost != -1.0 {
t.Errorf("Unexpected cost for CDR: %f", cdrs[0].Cost)
}
}
args = &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{
RunIDs: []string{"CustomerCharges"},
OriginIDs: []string{"testSSv1ItProcessEventWithCDRResourceError"}}}
if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {
t.Error("Unexpected number of CDRs returned: ", len(cdrs))
} else {
if cdrs[0].Cost != 0.198 {
t.Errorf("Unexpected cost for CDR: %f", cdrs[0].Cost)
}
}
args = &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{
RunIDs: []string{"SupplierCharges"},
OriginIDs: []string{"testSSv1ItProcessEventWithCDRResourceError"}}}
if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {
t.Error("Unexpected number of CDRs returned: ", len(cdrs))
} else {
if cdrs[0].Cost != 0.102 {
t.Errorf("Unexpected cost for CDR: %f", cdrs[0].Cost)
}
}
}

19
sessions/sessions.go
View File

@@ -3335,22 +3335,29 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector,
case resOpt.Has(utils.MetaAuthorize):
if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AuthorizeResources,
attrRU, &resMessage); err != nil {
return utils.NewErrResourceS(err)
utils.Logger.Warning(
fmt.Sprintf("<%s> error: <%s> processing event %+v for RunID <%s> with ResourceS.",
utils.SessionS, err.Error(), cgrEv.CGREvent, runID))
withErrors = true
}
rply.ResourceAllocation[runID] = resMessage
case resOpt.Has(utils.MetaAllocate):
if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1AllocateResources,
attrRU, &resMessage); err != nil {
return utils.NewErrResourceS(err)
utils.Logger.Warning(
fmt.Sprintf("<%s> error: <%s> processing event %+v for RunID <%s> with ResourceS.",
utils.SessionS, err.Error(), cgrEv.CGREvent, runID))
withErrors = true
}
rply.ResourceAllocation[runID] = resMessage
case resOpt.Has(utils.MetaRelease):
if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().ResSConns, nil, utils.ResourceSv1ReleaseResources,
attrRU, &resMessage); err != nil {
return utils.NewErrResourceS(err)
utils.Logger.Warning(
fmt.Sprintf("<%s> error: <%s> processing event %+v for RunID <%s> with ResourceS.",
utils.SessionS, err.Error(), cgrEv.CGREvent, runID))
withErrors = true
}
rply.ResourceAllocation[runID] = resMessage
}
rply.ResourceAllocation[runID] = resMessage
}
}
}