From ca0c7b792b2471566421aab2e1ca84a68b1e0848 Mon Sep 17 00:00:00 2001 From: TeoV Date: Wed, 3 Jul 2019 14:42:56 +0300 Subject: [PATCH] Group arguments for V1InitSession --- agents/diamagent.go | 12 ++++++------ agents/dnsagent.go | 12 ++++++------ agents/httpagent.go | 12 ++++++------ agents/radagent.go | 12 ++++++------ sessions/sessions.go | 7 ++++--- sessions/sessions_test.go | 4 ++-- 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/agents/diamagent.go b/agents/diamagent.go index acb1237a8..29cf22dcd 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -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) diff --git a/agents/dnsagent.go b/agents/dnsagent.go index f4e753c6e..619a36d1e 100644 --- a/agents/dnsagent.go +++ b/agents/dnsagent.go @@ -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) diff --git a/agents/httpagent.go b/agents/httpagent.go index d4e5de901..128141f97 100644 --- a/agents/httpagent.go +++ b/agents/httpagent.go @@ -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) diff --git a/agents/radagent.go b/agents/radagent.go index fd3f0450b..baf74fc21 100644 --- a/agents/radagent.go +++ b/agents/radagent.go @@ -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) diff --git a/sessions/sessions.go b/sessions/sessions.go index bfaf4b0ed..5931a4a8f 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -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, diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index ce70d5647..f77101bae 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -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) }