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

SessionS v2ForkSessions using ChargerS

Browse Source
This commit is contained in:
DanB
2018-08-29 13:40:35 +02:00
parent 3a6ebb88ad
commit f079d6f3dc
4 changed files with 134 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
apier/v2/cdrsold_it_test.go
View File

@@ -1,317 +0,0 @@
// +build integration
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package v2
import (
"net/rpc"
"net/rpc/jsonrpc"
"path"
"testing"
"time"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
var cdrsOldCfgPath string
var cdrsOldCfg *config.CGRConfig
var cdrsOldRpc *rpc.Client
var cdrsOldConfDIR string // run the tests for specific configuration
// subtests to be executed for each confDIR
var sOldTestsCDRsIT = []func(t *testing.T){
testV2CDRsOldInitConfig,
testV2CDRsOldInitDataDb,
testV2CDRsOldInitCdrDb,
testV2CDRsOldInjectUnratedCdr,
testV2CDRsOldStartEngine,
testV2CDRsOldOldRpcConn,
testV2CDRsOldProcessCdrRated,
testV2CDRsOldProcessCdrRaw,
testV2CDRsOldGetCdrs,
testV2CDRsOldCountCdrs,
testV2CDRsOldProcessPrepaidCdr,
testV2CDRsOldRateWithoutTP,
testV2CDRsOldLoadTariffPlanFromFolder,
testV2CDRsOldRateWithTP,
// ToDo: test engine shutdown
}
// Tests starting here
func TestCDRsOldITMySQL(t *testing.T) {
cdrsOldConfDIR = "cdrsv2mysql"
for _, stest := range sOldTestsCDRsIT {
t.Run(cdrsOldConfDIR, stest)
}
}
func TestCDRsOldITpg(t *testing.T) {
cdrsOldConfDIR = "cdrsv2psql"
for _, stest := range sOldTestsCDRsIT {
t.Run(cdrsOldConfDIR, stest)
}
}
func TestCDRsOldITMongo(t *testing.T) {
cdrsOldConfDIR = "cdrsv2mongo"
for _, stest := range sOldTestsCDRsIT {
t.Run(cdrsOldConfDIR, stest)
}
}
func testV2CDRsOldInitConfig(t *testing.T) {
var err error
cdrsOldCfgPath = path.Join(*dataDir, "conf", "samples", cdrsOldConfDIR)
if cdrsOldCfg, err = config.NewCGRConfigFromFolder(cdrsOldCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
}
func testV2CDRsOldInitDataDb(t *testing.T) {
if err := engine.InitDataDb(cdrsOldCfg); err != nil {
t.Fatal(err)
}
}
// InitDb so we can rely on count
func testV2CDRsOldInitCdrDb(t *testing.T) {
if err := engine.InitStorDb(cdrsOldCfg); err != nil {
t.Fatal(err)
}
}
func testV2CDRsOldInjectUnratedCdr(t *testing.T) {
var db engine.CdrStorage
switch cdrsOldConfDIR {
case "cdrsv2mysql":
db, err = engine.NewMySQLStorage(cdrsOldCfg.StorDBHost, cdrsOldCfg.StorDBPort, cdrsOldCfg.StorDBName, cdrsOldCfg.StorDBUser, cdrsOldCfg.StorDBPass,
cdrsOldCfg.StorDBMaxOpenConns, cdrsOldCfg.StorDBMaxIdleConns, cdrsOldCfg.StorDBConnMaxLifetime)
case "cdrsv2psql":
db, err = engine.NewPostgresStorage(cdrsOldCfg.StorDBHost, cdrsOldCfg.StorDBPort, cdrsOldCfg.StorDBName, cdrsOldCfg.StorDBUser, cdrsOldCfg.StorDBPass,
cdrsOldCfg.StorDBMaxOpenConns, cdrsOldCfg.StorDBMaxIdleConns, cdrsOldCfg.StorDBConnMaxLifetime)
case "cdrsv2mongo":
db, err = engine.NewMongoStorage(cdrsOldCfg.StorDBHost, cdrsOldCfg.StorDBPort, cdrsOldCfg.StorDBName,
cdrsOldCfg.StorDBUser, cdrsOldCfg.StorDBPass, utils.StorDB, cdrsOldCfg.StorDBCDRSIndexes, nil, 10)
}
if err != nil {
t.Error("Error on opening database connection: ", err)
return
}
strCdr1 := &engine.CDR{CGRID: utils.Sha1("bbb1", time.Date(2015, 11, 21, 10, 47, 24, 0, time.UTC).String()), RunID: utils.MetaRaw,
ToR: utils.VOICE, OriginID: "bbb1", OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoInjectUnratedCdr", RequestType: utils.META_RATED,
Tenant: "cgrates.org", Category: "call", Account: "1001", Subject: "1001", Destination: "1002",
SetupTime: time.Date(2015, 11, 21, 10, 47, 24, 0, time.UTC), AnswerTime: time.Date(2015, 11, 21, 10, 47, 26, 0, time.UTC),
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
Cost: -1}
if err := db.SetCDR(strCdr1, false); err != nil {
t.Error(err.Error())
}
}
func testV2CDRsOldStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(cdrsOldCfgPath, *waitRater); err != nil {
t.Fatal(err)
}
}
// Connect rpc client to rater
func testV2CDRsOldOldRpcConn(t *testing.T) {
cdrsOldRpc, err = jsonrpc.Dial("tcp", cdrsOldCfg.RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
}
func testV2CDRsOldProcessCdrRated(t *testing.T) {
cdr := &engine.CDR{
CGRID: utils.Sha1("dsafdsaf", time.Date(2015, 12, 13, 18, 15, 26, 0, time.UTC).String()), RunID: utils.DEFAULT_RUNID,
OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf",
OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoProcessCdrRated", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call",
Account: "1001", Subject: "1001", Destination: "1002",
SetupTime: time.Date(2015, 12, 13, 18, 15, 26, 0, time.UTC), AnswerTime: time.Date(2015, 12, 13, 18, 15, 26, 0, time.UTC),
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
Cost: 1.01, CostSource: "testV2CDRsOldMongoProcessCdrRated", PreRated: true,
}
var reply string
if err := cdrsOldRpc.Call("CdrsV2.ProcessCdr", cdr, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
}
func testV2CDRsOldProcessCdrRaw(t *testing.T) {
cdr := &engine.CDR{
CGRID: utils.Sha1("abcdeftg", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, RunID: utils.MetaRaw,
ToR: utils.VOICE, OriginID: "abcdeftg",
OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoProcessCdrRaw", RequestType: utils.META_RATED, Tenant: "cgrates.org", Category: "call",
Account: "1002", Subject: "1002", Destination: "1002",
SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC),
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
}
var reply string
if err := cdrsOldRpc.Call("CdrsV2.ProcessCdr", cdr, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
time.Sleep(time.Duration(*waitRater) * time.Millisecond)
}
func testV2CDRsOldGetCdrs(t *testing.T) {
var reply []*engine.ExternalCDR
req := utils.RPCCDRsFilter{}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 4 { // 1 injected, 1 rated, 1 *raw and it's pair in *default run
t.Error("Unexpected number of CDRs returned: ", len(reply))
}
// CDRs with rating errors
req = utils.RPCCDRsFilter{RunIDs: []string{utils.META_DEFAULT}, MinCost: utils.Float64Pointer(-1.0), MaxCost: utils.Float64Pointer(0.0)}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 1 {
t.Error("Unexpected number of CDRs returned: ", reply)
}
// CDRs Rated
req = utils.RPCCDRsFilter{RunIDs: []string{utils.META_DEFAULT}}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 2 {
t.Error("Unexpected number of CDRs returned: ", reply)
}
// Raw CDRs
req = utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 2 {
t.Error("Unexpected number of CDRs returned: ", reply)
}
// Skip Errors
req = utils.RPCCDRsFilter{RunIDs: []string{utils.META_DEFAULT}, MinCost: utils.Float64Pointer(0.0), MaxCost: utils.Float64Pointer(-1.0)}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(reply) != 1 {
t.Error("Unexpected number of CDRs returned: ", reply)
}
}
func testV2CDRsOldCountCdrs(t *testing.T) {
var reply int64
req := utils.AttrGetCdrs{}
if err := cdrsOldRpc.Call("ApierV2.CountCdrs", req, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != 4 {
t.Error("Unexpected number of CDRs returned: ", reply)
}
}
// Make sure *prepaid does not block until finding previous costs
func testV2CDRsOldProcessPrepaidCdr(t *testing.T) {
var reply string
cdrs := []*engine.CDR{
&engine.CDR{CGRID: utils.Sha1("dsafdsaf2", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf",
OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoProcessPrepaidCdr1", RequestType: utils.META_PREPAID, Tenant: "cgrates.org",
Category: "call", Account: "1001", Subject: "1001", Destination: "1002",
SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID,
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, PreRated: true,
},
&engine.CDR{CGRID: utils.Sha1("abcdeftg2", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf",
OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoProcessPrepaidCdr2", RequestType: utils.META_PREPAID, Tenant: "cgrates.org",
Category: "call", Account: "1002", Subject: "1002", Destination: "1002",
SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID,
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01,
},
&engine.CDR{CGRID: utils.Sha1("aererfddf2", time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC).String()), OrderID: 123, ToR: utils.VOICE, OriginID: "dsafdsaf",
OriginHost: "192.168.1.1", Source: "testV2CDRsOldMongoProcessPrepaidCdr3", RequestType: utils.META_PREPAID, Tenant: "cgrates.org",
Category: "call", Account: "1003", Subject: "1003", Destination: "1002",
SetupTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), RunID: utils.DEFAULT_RUNID,
Usage: time.Duration(10) * time.Second, ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01,
},
}
tStart := time.Now()
for _, cdr := range cdrs {
if err := cdrsOldRpc.Call("CdrsV2.ProcessCdr", cdr, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
}
if processDur := time.Now().Sub(tStart); processDur > 1*time.Second {
t.Error("Unexpected processing time", processDur)
}
}
func testV2CDRsOldRateWithoutTP(t *testing.T) {
rawCdrCGRID := utils.Sha1("bbb1", time.Date(2015, 11, 21, 10, 47, 24, 0, time.UTC).String())
// Rate the injected CDR, should not rate it since we have no TP loaded
attrs := utils.AttrRateCdrs{CgrIds: []string{rawCdrCGRID}}
var reply string
if err := cdrsOldRpc.Call("CdrsV2.RateCdrs", attrs, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
time.Sleep(time.Duration(*waitRater) * time.Millisecond)
var cdrs []*engine.ExternalCDR
req := utils.RPCCDRsFilter{CGRIDs: []string{rawCdrCGRID}, RunIDs: []string{utils.META_DEFAULT}}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 { // Injected CDR did not have a charging run
t.Error("Unexpected number of CDRs returned: ", len(cdrs))
} else {
if cdrs[0].Cost != -1 {
t.Errorf("Unexpected CDR returned: %+v", cdrs[0])
}
}
}
func testV2CDRsOldLoadTariffPlanFromFolder(t *testing.T) {
var loadInst utils.LoadInstance
attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "oldtutorial")}
if err := cdrsOldRpc.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &loadInst); err != nil {
t.Error(err)
}
time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups
}
func testV2CDRsOldRateWithTP(t *testing.T) {
rawCdrCGRID := utils.Sha1("bbb1", time.Date(2015, 11, 21, 10, 47, 24, 0, time.UTC).String())
attrs := utils.AttrRateCdrs{CgrIds: []string{rawCdrCGRID}}
var reply string
if err := cdrsOldRpc.Call("CdrsV2.RateCdrs", attrs, &reply); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if reply != utils.OK {
t.Error("Unexpected reply received: ", reply)
}
time.Sleep(time.Duration(*waitRater) * time.Millisecond)
var cdrs []*engine.ExternalCDR
req := utils.RPCCDRsFilter{CGRIDs: []string{rawCdrCGRID}, RunIDs: []string{utils.META_DEFAULT}}
if err := cdrsOldRpc.Call("ApierV2.GetCdrs", req, &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.3 {
t.Errorf("Unexpected CDR returned: %+v", cdrs[0])
}
}
}

6
engine/cdrs.go
View File

@@ -688,7 +688,7 @@ func (cdrS *CdrServer) statSProcessEvent(cgrEv *utils.CGREvent) {
// rarethsta will RAte/STOtore/REplicate/THresholds/STAts the CDR received
// used by both chargerS as well as re-/rating
func (cdrS *CdrServer) rastorethstaCDR(cdr *CDR) {
func (cdrS *CdrServer) raStoReThStaCDR(cdr *CDR) {
ratedCDRs, err := cdrS.rateCDR(cdr)
if err != nil {
utils.Logger.Warning(
@@ -737,7 +737,7 @@ func (cdrS *CdrServer) chrgrSProcessEvent(cgrEv *utils.CGREvent) {
utils.CDRs, err.Error(), cgrEv, utils.ChargerS))
continue
}
cdrS.rastorethstaCDR(cdr)
cdrS.raStoReThStaCDR(cdr)
}
}
@@ -787,7 +787,7 @@ func (cdrS *CdrServer) V2RateCDRs(attrs *utils.RPCCDRsFilter, reply *string) err
return err
}
for _, cdr := range cdrs {
go cdrS.rastorethstaCDR(cdr)
go cdrS.raStoReThStaCDR(cdr)
}
*reply = utils.OK
return nil

1
sessions/session.go
View File

@@ -39,6 +39,7 @@ type SMGSession struct {
cdrsrv rpcclient.RpcClientConnection // Connector to CDRS service
clientProto float64
Tenant string // store original Tenant so we can use it in API calls
CGRID string // Unique identifier for this session
RunID string // Keep a reference for the derived run
Timezone string

178
sessions/sessions.go
View File

@@ -405,7 +405,8 @@ func (smg *SMGeneric) unindexSession(cgrID string, passiveSessions bool) bool {
// getSessionIDsMatchingIndexes will check inside indexes if it can find sessionIDs matching all filters
// matchedIndexes returns map[matchedFieldName]possibleMatchedFieldVal so we optimize further to avoid checking them
func (smg *SMGeneric) getSessionIDsMatchingIndexes(fltrs map[string]string, passiveSessions bool) (utils.StringMap, map[string]string) {
func (smg *SMGeneric) getSessionIDsMatchingIndexes(fltrs map[string]string,
passiveSessions bool) (utils.StringMap, map[string]string) {
idxMux := &smg.aSIMux
ssIndx := smg.aSessionsIndex
if passiveSessions {
@@ -449,7 +450,8 @@ func (smg *SMGeneric) getSessionIDsMatchingIndexes(fltrs map[string]string, pass
}
// getSessionIDsForPrefix works with session relocation returning list of sessions with ID matching prefix for OriginID field
func (smg *SMGeneric) getSessionIDsForPrefix(prefix string, passiveSessions bool) (cgrIDs []string) {
func (smg *SMGeneric) getSessionIDsForPrefix(prefix string,
passiveSessions bool) (cgrIDs []string) {
idxMux := &smg.aSIMux
ssIndx := smg.aSessionsIndex
if passiveSessions {
@@ -461,7 +463,8 @@ func (smg *SMGeneric) getSessionIDsForPrefix(prefix string, passiveSessions bool
for originID := range ssIndx[utils.OriginID] {
if strings.HasPrefix(originID, prefix) {
if _, hasDefaultRun := ssIndx[utils.OriginID][originID][utils.META_DEFAULT]; hasDefaultRun {
cgrIDs = append(cgrIDs, ssIndx[utils.OriginID][originID][utils.META_DEFAULT].Slice()...)
cgrIDs = append(cgrIDs,
ssIndx[utils.OriginID][originID][utils.META_DEFAULT].Slice()...)
}
}
}
@@ -469,7 +472,8 @@ func (smg *SMGeneric) getSessionIDsForPrefix(prefix string, passiveSessions bool
return
}
func (smg *SMGeneric) v1ForkSessions(evStart *engine.SafEvent,
// v1ForkSessions is using DerivedChargers for session forking
func (smg *SMGeneric) v1ForkSessions(tnt string, evStart *engine.SafEvent,
clntConn rpcclient.RpcClientConnection, cgrID, resourceID string) (ss []*SMGSession, err error) {
cdr, err := evStart.AsCDR(smg.cgrCfg, smg.Timezone)
if err != nil {
@@ -490,25 +494,73 @@ func (smg *SMGeneric) v1ForkSessions(evStart *engine.SafEvent,
clntConn: clntConn}}, nil
}
for _, sessionRun := range sessionRuns {
s := &SMGSession{CGRID: cgrID, ResourceID: resourceID, EventStart: evStart,
RunID: sessionRun.DerivedCharger.RunID, Timezone: smg.Timezone,
rals: smg.rals, cdrsrv: smg.cdrsrv,
CD: sessionRun.CallDescriptor, clntConn: clntConn,
clientProto: smg.cgrCfg.SessionSCfg().ClientProtocol}
//utils.Logger.Info(fmt.Sprintf("<%s> Starting session: %s, runId: %s",utils.SessionS, sessionId, s.runId))
ss = append(ss, s)
ss = append(ss,
&SMGSession{CGRID: cgrID, Tenant: tnt,
ResourceID: resourceID, EventStart: evStart,
RunID: sessionRun.DerivedCharger.RunID, Timezone: smg.Timezone,
rals: smg.rals, cdrsrv: smg.cdrsrv,
CD: sessionRun.CallDescriptor, clntConn: clntConn,
clientProto: smg.cgrCfg.SessionSCfg().ClientProtocol})
}
return
}
func (smg *SMGeneric) v2ForkSessions(evStart *engine.SafEvent,
clntConn rpcclient.RpcClientConnection, cgrID, resourceID string) (ss []*SMGSession, err error) {
// v2ForkSessions is using ChargerS for session forking
func (smg *SMGeneric) v2ForkSessions(tnt string, evStart *engine.SafEvent,
clntConn rpcclient.RpcClientConnection,
cgrID, resourceID string) (ss []*SMGSession, err error) {
cgrEv := &utils.CGREvent{
Tenant: tnt,
ID: utils.UUIDSha1Prefix(),
Event: evStart.AsMapInterface(),
}
var chrgrs []*engine.ChrgSProcessEventReply
if err := smg.chargerS.Call(utils.ChargerSv1ProcessEvent, cgrEv, &chrgrs); err != nil &&
err.Error() != utils.ErrNotFound.Error() {
return nil, err
}
if len(chrgrs) == 0 {
return []*SMGSession{
&SMGSession{CGRID: cgrID, ResourceID: resourceID, EventStart: evStart,
RunID: utils.META_NONE, Timezone: smg.Timezone,
rals: smg.rals, cdrsrv: smg.cdrsrv,
clntConn: clntConn}}, nil
}
for _, chrgr := range chrgrs {
evStart := engine.NewSafEvent(chrgr.CGREvent.Event)
startTime := evStart.GetTimeIgnoreErrors(utils.AnswerTime, smg.Timezone)
if startTime.IsZero() { // AnswerTime not parsable, try SetupTime
startTime = evStart.GetTimeIgnoreErrors(utils.SetupTime, smg.Timezone)
}
cd := &engine.CallDescriptor{
CgrID: cgrID,
RunID: evStart.GetStringIgnoreErrors(utils.RunID),
TOR: evStart.GetStringIgnoreErrors(utils.ToR),
Direction: utils.OUT,
Tenant: tnt,
Category: evStart.GetStringIgnoreErrors(utils.Category),
Subject: evStart.GetStringIgnoreErrors(utils.Subject),
Account: evStart.GetStringIgnoreErrors(utils.Account),
Destination: evStart.GetStringIgnoreErrors(utils.Destination),
TimeStart: startTime,
TimeEnd: startTime.Add(evStart.GetDurationIgnoreErrors(utils.Usage)),
ExtraFields: evStart.AsMapStringIgnoreErrors(utils.NewStringMap(utils.PrimaryCdrFields...)),
}
ss = append(ss,
&SMGSession{CGRID: cgrID, Tenant: tnt,
ResourceID: resourceID,
EventStart: evStart,
RunID: evStart.GetStringIgnoreErrors(utils.RunID),
Timezone: smg.Timezone,
rals: smg.rals, cdrsrv: smg.cdrsrv,
CD: cd, clntConn: clntConn,
clientProto: smg.cgrCfg.SessionSCfg().ClientProtocol})
}
return
}
// sessionStart will handle a new session, pass the connectionId so we can communicate on disconnect request
func (smg *SMGeneric) sessionStart(evStart *engine.SafEvent,
func (smg *SMGeneric) sessionStart(tnt string, evStart *engine.SafEvent,
clntConn rpcclient.RpcClientConnection, resourceID string) (err error) {
cgrID := evStart.GetStringIgnoreErrors(utils.CGRID)
_, err = guardian.Guardian.Guard(func() (interface{}, error) { // Lock it on CGRID level
@@ -517,9 +569,9 @@ func (smg *SMGeneric) sessionStart(evStart *engine.SafEvent,
}
var ss []*SMGSession
if smg.chargerS == nil { // old way of session forking
ss, err = smg.v1ForkSessions(evStart, clntConn, cgrID, resourceID)
ss, err = smg.v1ForkSessions(tnt, evStart, clntConn, cgrID, resourceID)
} else {
ss, err = smg.v2ForkSessions(evStart, clntConn, cgrID, resourceID)
ss, err = smg.v2ForkSessions(tnt, evStart, clntConn, cgrID, resourceID)
}
if err != nil {
return nil, err
@@ -797,7 +849,7 @@ func (smg *SMGeneric) asActiveSessions(fltrs map[string]string, count, passiveSe
// Methods to apply on sessions, mostly exported through RPC/Bi-RPC
// MaxUsage calculates maximum usage allowed for given gevent
func (smg *SMGeneric) GetMaxUsage(gev *engine.SafEvent) (maxUsage time.Duration, err error) {
func (smg *SMGeneric) GetMaxUsage(tnt string, gev *engine.SafEvent) (maxUsage time.Duration, err error) {
cgrID := GetSetCGRID(gev)
cacheKey := "MaxUsage" + cgrID
if item, err := smg.responseCache.Get(cacheKey); err == nil && item != nil {
@@ -824,7 +876,7 @@ func (smg *SMGeneric) GetMaxUsage(gev *engine.SafEvent) (maxUsage time.Duration,
}
// Called on session start
func (smg *SMGeneric) InitiateSession(gev *engine.SafEvent,
func (smg *SMGeneric) InitiateSession(tnt string, gev *engine.SafEvent,
clnt rpcclient.RpcClientConnection, resourceID string) (maxUsage time.Duration, err error) {
cgrID := GetSetCGRID(gev)
cacheKey := "InitiateSession" + cgrID
@@ -834,7 +886,7 @@ func (smg *SMGeneric) InitiateSession(gev *engine.SafEvent,
defer smg.responseCache.Cache(cacheKey,
&utils.ResponseCacheItem{Value: maxUsage, Err: err}) // schedule response caching
smg.deletePassiveSessions(cgrID)
if err = smg.sessionStart(gev, clnt, resourceID); err != nil {
if err = smg.sessionStart(tnt, gev, clnt, resourceID); err != nil {
smg.sessionEnd(cgrID, 0)
return
}
@@ -842,7 +894,7 @@ func (smg *SMGeneric) InitiateSession(gev *engine.SafEvent,
maxUsage = time.Duration(-1)
return
}
maxUsage, err = smg.UpdateSession(gev, clnt, resourceID)
maxUsage, err = smg.UpdateSession(tnt, gev, clnt, resourceID)
if err != nil || maxUsage == 0 {
smg.sessionEnd(cgrID, 0)
}
@@ -850,7 +902,7 @@ func (smg *SMGeneric) InitiateSession(gev *engine.SafEvent,
}
// Execute debits for usage/maxUsage
func (smg *SMGeneric) UpdateSession(gev *engine.SafEvent,
func (smg *SMGeneric) UpdateSession(tnt string, gev *engine.SafEvent,
clnt rpcclient.RpcClientConnection, resourceID string) (maxUsage time.Duration, err error) {
cgrID := GetSetCGRID(gev)
cacheKey := "UpdateSession" + cgrID
@@ -869,7 +921,7 @@ func (smg *SMGeneric) UpdateSession(gev *engine.SafEvent,
err = smg.sessionRelocate(initialCGRID,
cgrID, gev.GetStringIgnoreErrors(utils.OriginID))
if err == utils.ErrNotFound { // Session was already relocated, create a new session with this update
err = smg.sessionStart(gev, clnt, resourceID)
err = smg.sessionStart(tnt, gev, clnt, resourceID)
}
if err != nil {
return
@@ -933,7 +985,7 @@ func (smg *SMGeneric) UpdateSession(gev *engine.SafEvent,
}
// Called on session end, should stop debit loop
func (smg *SMGeneric) TerminateSession(gev *engine.SafEvent,
func (smg *SMGeneric) TerminateSession(tnt string, gev *engine.SafEvent,
clnt rpcclient.RpcClientConnection, resourceID string) (err error) {
cgrID := GetSetCGRID(gev)
cacheKey := "TerminateSession" + cgrID
@@ -947,7 +999,7 @@ func (smg *SMGeneric) TerminateSession(gev *engine.SafEvent,
err = smg.sessionRelocate(initialCGRID, cgrID,
gev.GetStringIgnoreErrors(utils.OriginID))
if err == utils.ErrNotFound { // Session was already relocated, create a new session with this update
err = smg.sessionStart(gev, clnt, resourceID)
err = smg.sessionStart(tnt, gev, clnt, resourceID)
}
if err != nil && err != utils.ErrMandatoryIeMissing {
return
@@ -1006,7 +1058,7 @@ func (smg *SMGeneric) TerminateSession(gev *engine.SafEvent,
}
// Processes one time events (eg: SMS)
func (smg *SMGeneric) ChargeEvent(gev *engine.SafEvent) (maxUsage time.Duration, err error) {
func (smg *SMGeneric) ChargeEvent(tnt string, gev *engine.SafEvent) (maxUsage time.Duration, err error) {
cgrID := GetSetCGRID(gev)
cacheKey := "ChargeEvent" + cgrID
if item, err := smg.responseCache.Get(cacheKey); err == nil && item != nil {
@@ -1197,8 +1249,11 @@ func (smg *SMGeneric) CallBiRPC(clnt rpcclient.RpcClientConnection,
}
func (smg *SMGeneric) BiRPCV1GetMaxUsage(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *float64) error {
maxUsageDur, err := smg.GetMaxUsage(engine.NewSafEvent(ev))
ev engine.MapEvent, maxUsage *float64) error {
maxUsageDur, err := smg.GetMaxUsage(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev))
if err != nil {
return utils.NewErrServerError(err)
}
@@ -1212,8 +1267,11 @@ func (smg *SMGeneric) BiRPCV1GetMaxUsage(clnt rpcclient.RpcClientConnection,
// BiRPCV2GetMaxUsage returns the maximum usage as duration/int64
func (smg *SMGeneric) BiRPCV2GetMaxUsage(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *time.Duration) error {
maxUsageDur, err := smg.GetMaxUsage(engine.NewSafEvent(ev))
ev engine.MapEvent, maxUsage *time.Duration) error {
maxUsageDur, err := smg.GetMaxUsage(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev))
if err != nil {
return utils.NewErrServerError(err)
}
@@ -1223,9 +1281,12 @@ func (smg *SMGeneric) BiRPCV2GetMaxUsage(clnt rpcclient.RpcClientConnection,
// Called on session start, returns the maximum number of seconds the session can last
func (smg *SMGeneric) BiRPCV1InitiateSession(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *float64) (err error) {
ev engine.MapEvent, maxUsage *float64) (err error) {
var minMaxUsage time.Duration
if minMaxUsage, err = smg.InitiateSession(engine.NewSafEvent(ev), clnt, ""); err != nil {
if minMaxUsage, err = smg.InitiateSession(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev), clnt, ""); err != nil {
if err != rpcclient.ErrSessionNotFound {
err = utils.NewErrServerError(err)
}
@@ -1241,9 +1302,12 @@ func (smg *SMGeneric) BiRPCV1InitiateSession(clnt rpcclient.RpcClientConnection,
// BiRPCV2InitiateSession initiates a new session, returns the maximum duration the session can last
func (smg *SMGeneric) BiRPCV2InitiateSession(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *time.Duration) (err error) {
ev engine.MapEvent, maxUsage *time.Duration) (err error) {
var minMaxUsage time.Duration
if minMaxUsage, err = smg.InitiateSession(engine.NewSafEvent(ev), clnt, ""); err != nil {
if minMaxUsage, err = smg.InitiateSession(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev), clnt, ""); err != nil {
if err != rpcclient.ErrSessionNotFound {
err = utils.NewErrServerError(err)
}
@@ -1256,9 +1320,12 @@ func (smg *SMGeneric) BiRPCV2InitiateSession(clnt rpcclient.RpcClientConnection,
// Interim updates, returns remaining duration from the RALs
func (smg *SMGeneric) BiRPCV1UpdateSession(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *float64) (err error) {
ev engine.MapEvent, maxUsage *float64) (err error) {
var minMaxUsage time.Duration
if minMaxUsage, err = smg.UpdateSession(engine.NewSafEvent(ev), clnt, ""); err != nil {
if minMaxUsage, err = smg.UpdateSession(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev), clnt, ""); err != nil {
if err != rpcclient.ErrSessionNotFound {
err = utils.NewErrServerError(err)
}
@@ -1274,9 +1341,12 @@ func (smg *SMGeneric) BiRPCV1UpdateSession(clnt rpcclient.RpcClientConnection,
// BiRPCV1UpdateSession updates an existing session, returning the duration which the session can still last
func (smg *SMGeneric) BiRPCV2UpdateSession(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *time.Duration) (err error) {
ev engine.MapEvent, maxUsage *time.Duration) (err error) {
var minMaxUsage time.Duration
if minMaxUsage, err = smg.UpdateSession(engine.NewSafEvent(ev), clnt, ""); err != nil {
if minMaxUsage, err = smg.UpdateSession(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev), clnt, ""); err != nil {
if err != rpcclient.ErrSessionNotFound {
err = utils.NewErrServerError(err)
}
@@ -1288,8 +1358,11 @@ func (smg *SMGeneric) BiRPCV2UpdateSession(clnt rpcclient.RpcClientConnection,
// Called on session end, should stop debit loop
func (smg *SMGeneric) BiRPCV1TerminateSession(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, reply *string) (err error) {
if err = smg.TerminateSession(engine.NewSafEvent(ev), clnt, ""); err != nil {
ev engine.MapEvent, reply *string) (err error) {
if err = smg.TerminateSession(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev), clnt, ""); err != nil {
if err != rpcclient.ErrSessionNotFound {
err = utils.NewErrServerError(err)
}
@@ -1301,8 +1374,11 @@ func (smg *SMGeneric) BiRPCV1TerminateSession(clnt rpcclient.RpcClientConnection
// Called on individual Events (eg SMS)
func (smg *SMGeneric) BiRPCV1ChargeEvent(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *float64) error {
if minMaxUsage, err := smg.ChargeEvent(engine.NewSafEvent(ev)); err != nil {
ev engine.MapEvent, maxUsage *float64) error {
if minMaxUsage, err := smg.ChargeEvent(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev)); err != nil {
return utils.NewErrServerError(err)
} else {
*maxUsage = minMaxUsage.Seconds()
@@ -1312,8 +1388,11 @@ func (smg *SMGeneric) BiRPCV1ChargeEvent(clnt rpcclient.RpcClientConnection,
// Called on individual Events (eg SMS)
func (smg *SMGeneric) BiRPCV2ChargeEvent(clnt rpcclient.RpcClientConnection,
ev map[string]interface{}, maxUsage *time.Duration) error {
if minMaxUsage, err := smg.ChargeEvent(engine.NewSafEvent(ev)); err != nil {
ev engine.MapEvent, maxUsage *time.Duration) error {
if minMaxUsage, err := smg.ChargeEvent(
utils.FirstNonEmpty(ev.GetStringIgnoreErrors(utils.Tenant),
smg.cgrCfg.DefaultTenant),
engine.NewSafEvent(ev)); err != nil {
return utils.NewErrServerError(err)
} else {
*maxUsage = minMaxUsage
@@ -1566,7 +1645,8 @@ func (smg *SMGeneric) BiRPCv1AuthorizeEvent(clnt rpcclient.RpcClientConnection,
if smg.rals == nil {
return utils.NewErrNotConnected(utils.RALService)
}
maxUsage, err := smg.GetMaxUsage(engine.NewSafEvent(args.CGREvent.Event))
maxUsage, err := smg.GetMaxUsage(args.CGREvent.Tenant,
engine.NewSafEvent(args.CGREvent.Event))
if err != nil {
return utils.NewErrRALs(err)
}
@@ -1813,6 +1893,7 @@ func (smg *SMGeneric) BiRPCv1InitiateSession(clnt rpcclient.RpcClientConnection,
}
}
if maxUsage, err := smg.InitiateSession(
args.CGREvent.Tenant,
engine.NewSafEvent(args.CGREvent.Event), clnt, originID); err != nil {
return utils.NewErrRALs(err)
} else {
@@ -1969,7 +2050,7 @@ func (smg *SMGeneric) BiRPCv1UpdateSession(clnt rpcclient.RpcClientConnection,
if err != nil {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
if maxUsage, err := smg.UpdateSession(
if maxUsage, err := smg.UpdateSession(args.CGREvent.Tenant,
engine.NewSafEvent(args.CGREvent.Event), clnt, originID); err != nil {
return utils.NewErrRALs(err)
} else {
@@ -2017,7 +2098,7 @@ func (smg *SMGeneric) BiRPCv1TerminateSession(clnt rpcclient.RpcClientConnection
if err != nil {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
if err = smg.TerminateSession(
if err = smg.TerminateSession(args.CGREvent.Tenant,
engine.NewSafEvent(args.CGREvent.Event), clnt, originID); err != nil {
return utils.NewErrRALs(err)
}
@@ -2155,7 +2236,8 @@ func (smg *SMGeneric) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
if smg.rals == nil {
return utils.NewErrNotConnected(utils.RALService)
}
if maxUsage, err := smg.ChargeEvent(engine.NewSafEvent(args.CGREvent.Event)); err != nil {
if maxUsage, err := smg.ChargeEvent(args.CGREvent.Tenant,
engine.NewSafEvent(args.CGREvent.Event)); err != nil {
return utils.NewErrRALs(err)
} else {
rply.MaxUsage = &maxUsage