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

CDRS does not longer log debits, fix integration tests

Browse Source
This commit is contained in:
DanB
2015-12-28 12:12:13 +01:00
parent 98473b930a
commit b8f90ee94f
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apier/v1/apier_local_test.go
View File

@@ -1411,7 +1411,7 @@ func TestApierLocalGetCdrs(t *testing.T) {
return
}
var reply []*engine.ExternalCDR
req := utils.AttrGetCdrs{}
req := utils.AttrGetCdrs{MediationRunIds: []string{utils.MetaRaw}}
if err := rater.Call("ApierV1.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 2 {
@@ -1436,7 +1436,7 @@ func TestApierLocalProcessCdr(t *testing.T) {
t.Error("Unexpected reply received: ", reply)
}
var cdrs []*engine.ExternalCDR
req := utils.AttrGetCdrs{}
req := utils.AttrGetCdrs{MediationRunIds: []string{utils.MetaRaw}}
if err := rater.Call("ApierV1.GetCdrs", req, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 3 {

4
data/tariffplans/tutorial/Users.csv
View File

@@ -6,7 +6,7 @@ cgrates.org,1001,,Account,1001,10
cgrates.org,1001,,Subject,1001,10
cgrates.org,1001,,Uuid,388539dfd4f5cefee8f488b78c6c244b9e19138e,10
cgrates.org,1001,,SubscriberId,1001,10
cgrates.org,1001,,ReqType,*prepaid,10
cgrates.org,1001,,RequestType,*prepaid,10
cgrates.org,1002,,SysUserName,rif,10
cgrates.org,1002,,RifAttr,RifVal,10
cgrates.org,1002,,Account,1002,10
@@ -18,5 +18,5 @@ cgrates.org,1004,,SysPassword,hisPass321,10
cgrates.org,1004,,Cli,+4986517174964,10
cgrates.org,1004,,Account,1004,10
cgrates.org,1004,,Subject,1004,10
cgrates.org,1004,,ReqType,*rated,10
cgrates.org,1004,,RequestType,*rated,10
cgrates.org,1004,,SubscriberId,1004,10
1 #Tenant[0] UserName[1] Masked[2] AttributeName[3] AttributeValue[4] Weight[5]
6 cgrates.org 1001 Subject 1001 10
7 cgrates.org 1001 Uuid 388539dfd4f5cefee8f488b78c6c244b9e19138e 10
8 cgrates.org 1001 SubscriberId 1001 10
9 cgrates.org 1001 ReqType RequestType *prepaid 10
10 cgrates.org 1002 SysUserName rif 10
11 cgrates.org 1002 RifAttr RifVal 10
12 cgrates.org 1002 Account 1002 10
18 cgrates.org 1004 Cli +4986517174964 10
19 cgrates.org 1004 Account 1004 10
20 cgrates.org 1004 Subject 1004 10
21 cgrates.org 1004 ReqType RequestType *rated 10
22 cgrates.org 1004 SubscriberId 1004 10

4
engine/cdrs.go
View File

@@ -367,9 +367,7 @@ func (self *CdrServer) getCostFromRater(cdr *CDR) (*CallCost, error) {
DurationIndex: cdr.Usage,
}
if utils.IsSliceMember([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID, utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID}, cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM
if err = self.rater.Debit(cd, cc); err == nil { // Debit has occured, we are forced to write the log, even if CDR store is disabled
self.cdrDb.LogCallCost(cdr.CGRID, cdr.RunID, utils.CDRS_SOURCE, cc)
}
err = self.rater.Debit(cd, cc)
} else {
err = self.rater.GetCost(cd, cc)
}

1
general_tests/tutorial_local_test.go
View File

@@ -522,6 +522,7 @@ func TestTutLocalProcessExternalCdrUP(t *testing.T) {
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
time.Sleep(time.Duration(*waitRater) * time.Millisecond)
eCdr := &engine.ExternalCDR{CGRID: "63a8d2bfeca2cfb790826c3ec461696d6574cfde", OrderID: 2,
TOR: utils.VOICE,
OriginID: "testextcdr2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Direction: utils.OUT,