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

Group arguments for V1InitSession

Browse Source
This commit is contained in:
TeoV
2019-07-03 14:42:56 +03:00
committed by Dan Christian Bogos
parent e39f0f635c
commit ca0c7b792b
6 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
agents/diamagent.go
View File

@@ -305,14 +305,14 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.HasKey(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats),
reqProcessor.Flags.HasKey(utils.MetaResources),
reqProcessor.Flags.HasKey(utils.MetaAccounts),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaStats))
cgrEv, cgrArgs.ArgDispatcher)
rply := new(sessions.V1InitSessionReply)
err = da.sS.Call(utils.SessionSv1InitiateSession,
initArgs, rply)

12
agents/dnsagent.go
View File

@@ -206,14 +206,14 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.HasKey(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats),
reqProcessor.Flags.HasKey(utils.MetaResources),
reqProcessor.Flags.HasKey(utils.MetaAccounts),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaStats))
cgrEv, cgrArgs.ArgDispatcher)
rply := new(sessions.V1InitSessionReply)
err = da.sS.Call(utils.SessionSv1InitiateSession,
initArgs, rply)

12
agents/httpagent.go
View File

@@ -154,14 +154,14 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.HasKey(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats),
reqProcessor.Flags.HasKey(utils.MetaResources),
reqProcessor.Flags.HasKey(utils.MetaAccounts),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaStats))
cgrEv, cgrArgs.ArgDispatcher)
rply := new(sessions.V1InitSessionReply)
err = ha.sessionS.Call(utils.SessionSv1InitiateSession,
initArgs, rply)

12
agents/radagent.go
View File

@@ -200,14 +200,14 @@ func (ra *RadiusAgent) processRequest(reqProcessor *config.RequestProcessor,
case utils.MetaInitiate:
initArgs := sessions.NewV1InitSessionArgs(
reqProcessor.Flags.HasKey(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
reqProcessor.Flags.ParamsSlice(utils.MetaStats),
reqProcessor.Flags.HasKey(utils.MetaResources),
reqProcessor.Flags.HasKey(utils.MetaAccounts),
reqProcessor.Flags.HasKey(utils.MetaThresholds),
reqProcessor.Flags.HasKey(utils.MetaStats),
cgrEv, cgrArgs.ArgDispatcher,
reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),
reqProcessor.Flags.ParamsSlice(utils.MetaThresholds),
reqProcessor.Flags.ParamsSlice(utils.MetaStats))
cgrEv, cgrArgs.ArgDispatcher)
rply := new(sessions.V1InitSessionReply)
err = ra.sessionS.Call(utils.SessionSv1InitiateSession,
initArgs, rply)

7
sessions/sessions.go
View File

@@ -1969,9 +1969,10 @@ func (sS *SessionS) BiRPCv1AuthorizeEventWithDigest(clnt rpcclient.RpcClientConn
}
// NewV1InitSessionArgs is a constructor for V1InitSessionArgs
func NewV1InitSessionArgs(attrs, resrc, acnt, thrslds, stats bool,
cgrEv *utils.CGREvent, argDisp *utils.ArgDispatcher,
attributeIDs, thresholdIDs, statIDs []string) (args *V1InitSessionArgs) {
func NewV1InitSessionArgs(attrs bool, attributeIDs []string,
thrslds bool, thresholdIDs []string, stats bool, statIDs []string,
resrc, acnt bool, cgrEv *utils.CGREvent,
argDisp *utils.ArgDispatcher) (args *V1InitSessionArgs) {
args = &V1InitSessionArgs{
GetAttributes: attrs,
AllocateResources: resrc,

4
sessions/sessions_test.go
View File

@@ -954,7 +954,7 @@ func TestSessionSNewV1InitSessionArgs(t *testing.T) {
ProcessStats: true,
CGREvent: cgrEv,
}
rply := NewV1InitSessionArgs(true, true, true, true, true, cgrEv, nil, nil, nil, nil)
rply := NewV1InitSessionArgs(true, nil, true, nil, true, nil, true, true, cgrEv, nil)
if !reflect.DeepEqual(expected, rply) {
t.Errorf("Expecting %+v, received: %+v", expected, rply)
}
@@ -966,7 +966,7 @@ func TestSessionSNewV1InitSessionArgs(t *testing.T) {
ProcessStats: true,
CGREvent: cgrEv,
}
rply = NewV1InitSessionArgs(true, false, true, false, true, cgrEv, nil, nil, nil, nil)
rply = NewV1InitSessionArgs(true, nil, false, nil, true, nil, false, true, cgrEv, nil)
if !reflect.DeepEqual(expected, rply) {
t.Errorf("Expecting %+v, received: %+v", expected, rply)
}