From b92e96d446e3de0f7a7c7e80bb2b878d9ee4140c Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 26 Mar 2020 15:44:27 +0200 Subject: [PATCH] Update subflags for *rals from SessionSv1.ProcessEvent --- apier/v1/sessions_process_event_it_test.go | 4 ++-- docs/sessions.rst | 4 ++-- packages/debian/changelog | 1 + sessions/sessions.go | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index 9a1c4446e..9512759ac 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -150,7 +150,7 @@ func testSSv1ItProcessEventAuth(t *testing.T) { authUsage := 5 * time.Minute args := &sessions.V1ProcessEventArgs{ Flags: []string{utils.ConcatenatedKey(utils.MetaResources, utils.MetaAuthorize), - utils.ConcatenatedKey(utils.MetaRALs, utils.MetaAuth), + utils.ConcatenatedKey(utils.MetaRALs, utils.MetaAuthorize), utils.MetaSuppliers, utils.MetaAttributes}, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -229,7 +229,7 @@ func testSSv1ItProcessEventAuth(t *testing.T) { func testSSv1ItProcessEventInitiateSession(t *testing.T) { initUsage := 5 * time.Minute args := &sessions.V1ProcessEventArgs{ - Flags: []string{utils.ConcatenatedKey(utils.MetaRALs, utils.MetaInit), + Flags: []string{utils.ConcatenatedKey(utils.MetaRALs, utils.MetaInitiate), utils.ConcatenatedKey(utils.MetaResources, utils.MetaAllocate), utils.MetaAttributes}, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/docs/sessions.rst b/docs/sessions.rst index 44ed0d774..e764f3b8c 100644 --- a/docs/sessions.rst +++ b/docs/sessions.rst @@ -329,10 +329,10 @@ Instead of arguments, the options for enabling various functionaity will come in \*rals Process the event with :ref:`RALs`. Auxiliary flags available: - **\*auth** + **\*authorize** Authorize the event. - **\*init** + **\*initiate** Initialize a session out of event. **\*update** diff --git a/packages/debian/changelog b/packages/debian/changelog index b001ac31f..4f92ae25a 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -20,6 +20,7 @@ cgrates (0.10.1~dev) UNRELEASED; urgency=medium DataDB/StorDB * [Migrator] Auto discover tenant from key instead of taking it from config * [Templates] Fixed missing "*" for strip and padding strategy + * [SessionS] Update subflags for *rals ( *authorize and *initiate ) -- Alexandru Tripon Wed, 19 Feb 2020 15:22:59 +0200 diff --git a/sessions/sessions.go b/sessions/sessions.go index fdcdf7cb9..78174d3b0 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -3037,7 +3037,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, //for the moment only the the flag will be executed switch { //check for auth session - case ralsFlagsWithParams.HasKey(utils.MetaAuth): + case ralsFlagsWithParams.HasKey(utils.MetaAuthorize): maxUsage, err := sS.authEvent(args.CGREvent.Tenant, engine.MapEvent(args.CGREvent.Event)) if err != nil { @@ -3045,7 +3045,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } rply.MaxUsage = maxUsage // check for init session - case ralsFlagsWithParams.HasKey(utils.MetaInit): + case ralsFlagsWithParams.HasKey(utils.MetaInitiate): if ev.HasField(utils.CGRDebitInterval) { // dynamic DebitInterval via CGRDebitInterval if dbtItvl, err = ev.GetDuration(utils.CGRDebitInterval); err != nil { return utils.NewErrRALs(err)