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

Replacing CGREvent with *CGRevent when inherited for SessionSv1.ProcessEventArgs

Browse Source
This commit is contained in:
TeoV
2019-05-29 16:54:16 +03:00
committed by Dan Christian Bogos
parent 61d87789f8
commit 6811d53830
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/diamagent.go
View File

@@ -344,7 +344,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
reqProcessor.Flags.HasKey(utils.MetaSuppliers),
reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors),
reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost),
*cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
var eventRply sessions.V1ProcessEventReply
err = da.sS.Call(utils.SessionSv1ProcessEvent,
evArgs, &eventRply)

2
agents/dnsagent.go
View File

@@ -244,7 +244,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
reqProcessor.Flags.HasKey(utils.MetaSuppliers),
reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors),
reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost),
*cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
var eventRply sessions.V1ProcessEventReply
err = da.sS.Call(utils.SessionSv1ProcessEvent,
evArgs, &eventRply)

2
agents/httpagent.go
View File

@@ -193,7 +193,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
reqProcessor.Flags.HasKey(utils.MetaSuppliers),
reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors),
reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost),
*cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
var eventRply sessions.V1ProcessEventReply
err = ha.sessionS.Call(utils.SessionSv1ProcessEvent,
evArgs, &eventRply)

2
agents/radagent.go
View File

@@ -237,7 +237,7 @@ func (ra *RadiusAgent) processRequest(reqProcessor *config.RequestProcessor,
reqProcessor.Flags.HasKey(utils.MetaSuppliers),
reqProcessor.Flags.HasKey(utils.MetaSuppliersIgnoreErrors),
reqProcessor.Flags.HasKey(utils.MetaSuppliersEventCost),
*cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
cgrEv, cgrArgs.ArgDispatcher, *cgrArgs.SupplierPaginator)
var eventRply sessions.V1ProcessEventReply
err = ra.sessionS.Call(utils.SessionSv1ProcessEvent,
evArgs, &eventRply)

2
apier/v1/sessionsv1_it_test.go
View File

@@ -503,7 +503,7 @@ func TestSSv1ItProcessEvent(t *testing.T) {
AllocateResources: true,
Debit: true,
GetAttributes: true,
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{

2
dispatchers/sessions.go
View File

@@ -221,7 +221,7 @@ func (dS *DispatcherService) SessionSv1ProcessEvent(args *sessions.V1ProcessEven
if args.ArgDispatcher != nil {
routeID = args.ArgDispatcher.RouteID
}
return dS.Dispatch(&args.CGREvent, utils.MetaSessionS, routeID,
return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID,
utils.SessionSv1ProcessEvent, args, reply)
}

4
dispatchers/sessions_it_test.go
View File

@@ -523,7 +523,7 @@ func testDspSessionProcessEvent(t *testing.T) {
AllocateResources: true,
Debit: true,
GetAttributes: true,
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{
@@ -589,7 +589,7 @@ func testDspSessionProcessEvent2(t *testing.T) {
AllocateResources: true,
Debit: true,
GetAttributes: true,
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{

2
general_tests/rpccaching_it_test.go
View File

@@ -584,7 +584,7 @@ func testRPCMethodsProcessEvent(t *testing.T) {
initUsage := 5 * time.Minute
args := &sessions.V1ProcessEventArgs{
Debit: true,
CGREvent: utils.CGREvent{
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "testRPCMethodsProcessEvent",
Event: map[string]interface{}{

14
sessions/sessions.go
View File

@@ -2556,7 +2556,7 @@ func (sS *SessionS) BiRPCv1ProcessCDR(clnt rpcclient.RpcClientConnection,
// NewV1ProcessEventArgs is a constructor for EventArgs used by ProcessEvent
func NewV1ProcessEventArgs(resrc, acnts, attrs, thds, stats,
suppls, supplsIgnoreErrs, supplsEventCost bool,
cgrEv utils.CGREvent, argDisp *utils.ArgDispatcher,
cgrEv *utils.CGREvent, argDisp *utils.ArgDispatcher,
supplierPaginator utils.Paginator) (args *V1ProcessEventArgs) {
args = &V1ProcessEventArgs{
AllocateResources: resrc,
@@ -2586,7 +2586,7 @@ type V1ProcessEventArgs struct {
GetSuppliers bool
SuppliersMaxCost string
SuppliersIgnoreErrors bool
utils.CGREvent
*utils.CGREvent
utils.Paginator
*utils.ArgDispatcher
}
@@ -2665,13 +2665,13 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
}
attrArgs := &engine.AttrArgsProcessEvent{
Context: utils.StringPointer(utils.MetaSessionS),
CGREvent: &args.CGREvent,
CGREvent: args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
var rplyEv engine.AttrSProcessEventReply
if err := sS.attrS.Call(utils.AttributeSv1ProcessEvent,
attrArgs, &rplyEv); err == nil {
args.CGREvent = *rplyEv.CGREvent
args.CGREvent = rplyEv.CGREvent
if tntIface, has := args.CGREvent.Event[utils.MetaTenant]; has {
// special case when we want to overwrite the tenant
args.CGREvent.Tenant = tntIface.(string)
@@ -2690,7 +2690,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
attrRU := utils.ArgRSv1ResourceUsage{
CGREvent: &args.CGREvent,
CGREvent: args.CGREvent,
UsageID: originID,
Units: 1,
ArgDispatcher: args.ArgDispatcher,
@@ -2740,7 +2740,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
}
var tIDs []string
thEv := &engine.ArgsProcessEvent{
CGREvent: &args.CGREvent,
CGREvent: args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
if err := sS.thdS.Call(utils.ThresholdSv1ProcessEvent,
@@ -2757,7 +2757,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.RpcClientConnection,
}
var statReply []string
statArgs := &engine.StatsArgsProcessEvent{
CGREvent: &args.CGREvent,
CGREvent: args.CGREvent,
ArgDispatcher: args.ArgDispatcher,
}
if err := sS.statS.Call(utils.StatSv1ProcessEvent,

2
sessions/sessions_test.go
View File

@@ -888,7 +888,7 @@ func TestSessionSNewV1TerminateSessionArgs(t *testing.T) {
}
func TestSessionSNewV1ProcessEventArgs(t *testing.T) {
cgrEv := utils.CGREvent{
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
ID: "Event",
Event: map[string]interface{}{