From 2cd6877915cfef3de7a1b532c5718669aef7e20a Mon Sep 17 00:00:00 2001 From: Anevo Date: Wed, 14 Mar 2018 10:07:21 -0400 Subject: [PATCH] CDR Cost source to *cdrs and *sessions --- agents/radagent_it_test.go | 2 +- engine/cdrs.go | 10 +++++----- sessions/session.go | 2 +- sessions/sessions.go | 2 +- sessions/smgbirpc_it_test.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/radagent_it_test.go b/agents/radagent_it_test.go index 9b2efe58a..3dbb6fcc3 100644 --- a/agents/radagent_it_test.go +++ b/agents/radagent_it_test.go @@ -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 { diff --git a/engine/cdrs.go b/engine/cdrs.go index 55520b572..c7b2607e5 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -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(" 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 } diff --git a/sessions/session.go b/sessions/session.go index 628211043..1b6c4fedf 100644 --- a/sessions/session.go +++ b/sessions/session.go @@ -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), diff --git a/sessions/sessions.go b/sessions/sessions.go index 1e0037d12..8a6c5a886 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -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), diff --git a/sessions/smgbirpc_it_test.go b/sessions/smgbirpc_it_test.go index 970e33f67..a61d7e4d7 100644 --- a/sessions/smgbirpc_it_test.go +++ b/sessions/smgbirpc_it_test.go @@ -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]) } }