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

Refactor function names and error msgs related to AlterSessions

Browse Source
This commit is contained in:
ionutboangiu
2024-03-05 11:19:26 -05:00
committed by Dan Christian Bogos
parent ca6a9440f7
commit 98265a122a
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agents/astagent.go
View File

@@ -373,8 +373,8 @@ func (sma *AsteriskAgent) V1GetActiveSessionIDs(ctx *context.Context, ignParam s
}
// V1AlterSessions is used to implement the sessions.BiRPClient interface
func (*AsteriskAgent) V1AlterSessions(*context.Context, utils.CGREvent, *string) error {
// V1AlterSession is used to implement the sessions.BiRPClient interface
func (*AsteriskAgent) V1AlterSession(*context.Context, utils.CGREvent, *string) error {
return utils.ErrNotImplemented
}

6
agents/diamagent.go
View File

@@ -347,7 +347,7 @@ func (da *DiameterAgent) V1DisconnectSession(ctx *context.Context, args utils.At
case utils.MetaASR:
return da.sendASR(originID, reply)
case utils.MetaRAR:
return da.V1AlterSessions(ctx, utils.CGREvent{Event: args.EventStart}, reply)
return da.V1AlterSession(ctx, utils.CGREvent{Event: args.EventStart}, reply)
default:
return fmt.Errorf("Unsupported request type <%s>", da.cgrCfg.DiameterAgentCfg().ForcedDisconnect)
}
@@ -389,8 +389,8 @@ func (da *DiameterAgent) sendASR(originID string, reply *string) (err error) {
return
}
// V1AlterSessions sends a rar message to diameter client
func (da *DiameterAgent) V1AlterSessions(ctx *context.Context, cgrEv utils.CGREvent, reply *string) (err error) {
// V1AlterSession sends a rar message to diameter client
func (da *DiameterAgent) V1AlterSession(ctx *context.Context, cgrEv utils.CGREvent, reply *string) (err error) {
originID, err := cgrEv.FieldAsString(utils.OriginID)
if err != nil {
return fmt.Errorf("could not retrieve OriginID: %w", err)

4
agents/fsagent.go
View File

@@ -486,8 +486,8 @@ func (fsa *FSsessions) V1WarnDisconnect(ctx *context.Context, args map[string]an
return
}
// V1AlterSessions is used to implement the sessions.BiRPClient interface
func (*FSsessions) V1AlterSessions(*context.Context, utils.CGREvent, *string) error {
// V1AlterSession is used to implement the sessions.BiRPClient interface
func (*FSsessions) V1AlterSession(*context.Context, utils.CGREvent, *string) error {
return utils.ErrNotImplemented
}

4
agents/kamagent.go
View File

@@ -461,8 +461,8 @@ func (ka *KamailioAgent) Reload() {
ka.conns = make([]*kamevapi.KamEvapi, len(ka.cfg.EvapiConns))
}
// V1AlterSessions is used to implement the sessions.BiRPClient interface
func (*KamailioAgent) V1AlterSessions(*context.Context, utils.CGREvent, *string) error {
// V1AlterSession is used to implement the sessions.BiRPClient interface
func (*KamailioAgent) V1AlterSession(*context.Context, utils.CGREvent, *string) error {
return utils.ErrNotImplemented
}

4
agents/radagent.go
View File

@@ -522,8 +522,8 @@ func (ra *RadiusAgent) V1DisconnectSession(_ *context.Context, attr utils.AttrDi
return nil
}
// V1AlterSessions updates session authorization using RADIUS CoA functionality.
func (ra *RadiusAgent) V1AlterSessions(_ *context.Context, cgrEv utils.CGREvent, reply *string) error {
// V1AlterSession updates session authorization using RADIUS CoA functionality.
func (ra *RadiusAgent) V1AlterSession(_ *context.Context, cgrEv utils.CGREvent, reply *string) error {
originID, err := cgrEv.FieldAsString(utils.OriginID)
if err != nil {
return fmt.Errorf("could not retrieve OriginID: %w", err)

2
sessions/libsessions.go
View File

@@ -47,7 +47,7 @@ var authReqs = engine.MapEvent{
type BiRPCClient interface {
V1DisconnectSession(*context.Context, utils.AttrDisconnectSession, *string) error
V1GetActiveSessionIDs(*context.Context, string, *[]*SessionID) error
V1AlterSessions(*context.Context, utils.CGREvent, *string) error
V1AlterSession(*context.Context, utils.CGREvent, *string) error
V1DisconnectPeer(*context.Context, *utils.DPRArgs, *string) error
V1WarnDisconnect(*context.Context, map[string]any, *string) error
}

12
sessions/sessions.go
View File

@@ -4002,11 +4002,11 @@ func (sS *SessionS) BiRPCV1ProcessCDR(ctx *context.Context,
rply)
}
func (sS *SessionS) sendRar(ctx *context.Context, s *Session, apiOpts map[string]any, event map[string]any) (err error) {
func (sS *SessionS) alterSession(ctx *context.Context, s *Session, apiOpts map[string]any, event map[string]any) (err error) {
clnt := sS.biJClnt(s.ClientConnID)
if clnt == nil {
return fmt.Errorf("calling %s requires bidirectional JSON connection, connID: <%s>",
utils.AgentV1AlterSessions, s.ClientConnID)
utils.AgentV1AlterSession, s.ClientConnID)
}
// Merge parameter event with the session event. Losing the EventStart OriginID
@@ -4027,7 +4027,7 @@ func (sS *SessionS) sendRar(ctx *context.Context, s *Session, apiOpts map[string
}
var rply string
if err = clnt.conn.Call(ctx, utils.AgentV1AlterSessions, args, &rply); err == utils.ErrNotImplemented {
if err = clnt.conn.Call(ctx, utils.AgentV1AlterSession, args, &rply); err == utils.ErrNotImplemented {
err = nil
}
return
@@ -4053,11 +4053,11 @@ func (sS *SessionS) BiRPCv1AlterSessions(ctx *context.Context,
if len(ss) == 0 {
continue
}
if errTerm := sS.sendRar(ctx, ss[0], args.APIOpts, args.Event); errTerm != nil {
if errTerm := sS.alterSession(ctx, ss[0], args.APIOpts, args.Event); errTerm != nil {
utils.Logger.Warning(
fmt.Sprintf(
"<%s> failed sending RAR for session with id: <%s>, err: <%s>",
utils.SessionS, ss[0].cgrID(), errTerm.Error()))
"<%s> altering session with id '%s' failed: <%v>",
utils.SessionS, ss[0].cgrID(), errTerm))
err = utils.ErrPartiallyExecuted
}
}

2
utils/consts.go
View File

@@ -1680,7 +1680,7 @@ const (
AgentV1 = "AgentV1"
AgentV1DisconnectSession = "AgentV1.DisconnectSession"
AgentV1GetActiveSessionIDs = "AgentV1.GetActiveSessionIDs"
AgentV1AlterSessions = "AgentV1.AlterSessions"
AgentV1AlterSession = "AgentV1.AlterSession"
AgentV1DisconnectPeer = "AgentV1.DisconnectPeer"
AgentV1WarnDisconnect = "AgentV1.WarnDisconnect"
)