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

CDR Cost source to *cdrs and *sessions

Browse Source
This commit is contained in:
Anevo
2018-03-14 10:07:21 -04:00
committed by Dan Christian Bogos
parent 90339dbc0f
commit 2cd6877915
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/radagent_it_test.go
View File

@@ -275,7 +275,7 @@ func TestRAitAcctStop(t *testing.T) {
if cdrs[0].Usage != "4s" {
t.Errorf("Unexpected CDR Usage received, cdr: %v %+v ", cdrs[0].Usage, cdrs[0])
}
if cdrs[0].CostSource != utils.SESSION_MANAGER_SOURCE {
if cdrs[0].CostSource != utils.MetaSessionS {
t.Errorf("Unexpected CDR CostSource received for CDR: %v", cdrs[0])
}
if cdrs[0].Cost != 0.01 {

10
engine/cdrs.go
View File

@@ -148,9 +148,9 @@ func (self *CdrServer) ProcessExternalCdr(eCDR *ExternalCDR) error {
}
func (self *CdrServer) storeSMCost(smCost *SMCost, checkDuplicate bool) error {
smCost.CostDetails.UpdateCost() // make sure the total cost reflect the increments
smCost.CostDetails.UpdateRatedUsage() // make sure rated usage is updated
lockKey := utils.CDRS_SOURCE + smCost.CGRID + smCost.RunID + smCost.OriginID // Will lock on this ID
smCost.CostDetails.UpdateCost() // make sure the total cost reflect the increments
smCost.CostDetails.UpdateRatedUsage() // make sure rated usage is updated
lockKey := utils.MetaCDRs + smCost.CGRID + smCost.RunID + smCost.OriginID // Will lock on this ID
if checkDuplicate {
_, err := self.guard.Guard(func() (interface{}, error) {
smCosts, err := self.cdrDb.GetSMCosts(smCost.CGRID, smCost.RunID, "", "")
@@ -444,7 +444,7 @@ func (self *CdrServer) rateCDR(cdr *CDR) ([]*CDR, error) {
} else { //calculate CDR as for pseudoprepaid
utils.Logger.Warning(
fmt.Sprintf("<Cdrs> WARNING: Could not find CallCostLog for cgrid: %s, source: %s, runid: %s, originID: %s, will recalculate",
cdr.CGRID, utils.SESSION_MANAGER_SOURCE, cdr.RunID, cdr.OriginID))
cdr.CGRID, utils.MetaSessionS, cdr.RunID, cdr.OriginID))
qryCC, err = self.getCostFromRater(cdr)
}
} else {
@@ -488,7 +488,7 @@ func (self *CdrServer) getCostFromRater(cdr *CDR) (*CallCost, error) {
if err != nil {
return cc, err
}
cdr.CostSource = utils.CDRS_SOURCE
cdr.CostSource = utils.MetaCDRs
return cc, nil
}

2
sessions/session.go
View File

@@ -243,7 +243,7 @@ func (self *SMGSession) storeSMCost() error {
self.mux.Unlock()
smCost := &engine.V2SMCost{
CGRID: self.CGRID,
CostSource: utils.SESSION_MANAGER_SOURCE,
CostSource: utils.MetaSessionS,
RunID: self.RunID,
OriginHost: self.EventStart.GetOriginatorIP(utils.META_DEFAULT),
OriginID: self.EventStart.GetOriginID(utils.META_DEFAULT),

2
sessions/sessions.go
View File

@@ -955,7 +955,7 @@ func (smg *SMGeneric) ChargeEvent(gev SMGenericEvent) (maxUsage time.Duration, e
var reply string
smCost := &engine.SMCost{
CGRID: cgrID,
CostSource: utils.SESSION_MANAGER_SOURCE,
CostSource: utils.MetaSessionS,
RunID: sR.DerivedCharger.RunID,
OriginHost: gev.GetOriginatorIP(utils.META_DEFAULT),
OriginID: gev.GetOriginID(utils.META_DEFAULT),

4
sessions/smgbirpc_it_test.go
View File

@@ -189,7 +189,7 @@ func TestSMGBiRPCSessionAutomaticDisconnects(t *testing.T) {
} else {
if cdrs[0].Usage != "10ms" {
t.Errorf("Unexpected CDR Usage received, cdr: %v %+v ", cdrs[0].Usage, cdrs[0])
} else if cdrs[0].CostSource != utils.SESSION_MANAGER_SOURCE {
} else if cdrs[0].CostSource != utils.MetaSessionS {
t.Errorf("Unexpected CDR CostSource received, cdr: %v %+v ", cdrs[0].CostSource, cdrs[0])
}
}
@@ -262,7 +262,7 @@ func TestSMGBiRPCSessionOriginatorTerminate(t *testing.T) {
} else {
if cdrs[0].Usage != "7ms" {
t.Errorf("Unexpected CDR Usage received, cdr: %v %+v ", cdrs[0].Usage, cdrs[0])
} else if cdrs[0].CostSource != utils.SESSION_MANAGER_SOURCE {
} else if cdrs[0].CostSource != utils.MetaSessionS {
t.Errorf("Unexpected CDR CostSource received, cdr: %v %+v ", cdrs[0].CostSource, cdrs[0])
}
}