From 3850f11b14af0cbe203423a9771a795efda404b7 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Thu, 4 Jan 2018 19:49:59 +0100
Subject: [PATCH] SMGv1 -> SessionSv1 in apier/v1 package

---
 apier/v1/{smg.go => sessions.go} | 36 ++++++++++++++++----------------
 cmd/cgr-engine/cgr-engine.go     |  6 +++---
 2 files changed, 21 insertions(+), 21 deletions(-)
 rename apier/v1/{smg.go => sessions.go} (54%)

diff --git a/apier/v1/smg.go b/apier/v1/sessions.go
similarity index 54%
rename from apier/v1/smg.go
rename to apier/v1/sessions.go
index 2837b0794..cc43c6c55 100644
--- a/apier/v1/smg.go
+++ b/apier/v1/sessions.go
@@ -23,44 +23,44 @@ import (
 	"github.com/cgrates/cgrates/utils"
 )
 
-func NewSMGv1(sm *sessionmanager.SMGeneric) *SMGv1 {
-	return &SMGv1{SMG: sm}
+func NewSessionSv1(sm *sessionmanager.SMGeneric) *SessionSv1 {
+	return &SessionSv1{SMG: sm}
 }
 
-// Exports RPC from SMGv1
-type SMGv1 struct {
+// Exports RPC from SessionSv1
+type SessionSv1 struct {
 	SMG *sessionmanager.SMGeneric
 }
 
-// Publishes BiJSONRPC methods exported by SMGv1
-func (smgv1 *SMGv1) Handlers() map[string]interface{} {
+// Publishes BiJSONRPC methods exported by SessionSv1
+func (ssv1 *SessionSv1) Handlers() map[string]interface{} {
 	return map[string]interface{}{
-		"SMGv1.InitiateSession":  smgv1.SMG.BiRPCv1InitiateSession,
-		"SMGv1.UpdateSession":    smgv1.SMG.BiRPCv1UpdateSession,
-		"SMGv1.TerminateSession": smgv1.SMG.BiRPCv1TerminateSession,
-		"SMGv1.ProcessCDR":       smgv1.SMG.BiRPCv1ProcessCDR,
+		"SessionSv1.InitiateSession":  ssv1.SMG.BiRPCv1InitiateSession,
+		"SessionSv1.UpdateSession":    ssv1.SMG.BiRPCv1UpdateSession,
+		"SessionSv1.TerminateSession": ssv1.SMG.BiRPCv1TerminateSession,
+		"SessionSv1.ProcessCDR":       ssv1.SMG.BiRPCv1ProcessCDR,
 	}
 }
 
 // Called on session start, returns the maximum number of seconds the session can last
-func (smgv1 *SMGv1) InitiateSession(args *sessionmanager.V1InitSessionArgs,
+func (ssv1 *SessionSv1) InitiateSession(args *sessionmanager.V1InitSessionArgs,
 	rply *sessionmanager.V1InitSessionReply) error {
-	return smgv1.SMG.BiRPCv1InitiateSession(nil, args, rply)
+	return ssv1.SMG.BiRPCv1InitiateSession(nil, args, rply)
 }
 
 // Interim updates, returns remaining duration from the rater
-func (smgv1 *SMGv1) UpdateSession(args *sessionmanager.V1UpdateSessionArgs,
+func (ssv1 *SessionSv1) UpdateSession(args *sessionmanager.V1UpdateSessionArgs,
 	rply *sessionmanager.V1UpdateSessionReply) error {
-	return smgv1.SMG.BiRPCv1UpdateSession(nil, args, rply)
+	return ssv1.SMG.BiRPCv1UpdateSession(nil, args, rply)
 }
 
 // Called on session end, should stop debit loop
-func (smgv1 *SMGv1) TerminateSession(args *sessionmanager.V1TerminateSessionArgs,
+func (ssv1 *SessionSv1) TerminateSession(args *sessionmanager.V1TerminateSessionArgs,
 	rply *string) error {
-	return smgv1.SMG.BiRPCv1TerminateSession(nil, args, rply)
+	return ssv1.SMG.BiRPCv1TerminateSession(nil, args, rply)
 }
 
 // Called on session end, should stop debit loop
-func (smgv1 *SMGv1) ProcessCDR(cgrEv utils.CGREvent, rply *string) error {
-	return smgv1.SMG.BiRPCv1ProcessCDR(nil, cgrEv, rply)
+func (ssv1 *SessionSv1) ProcessCDR(cgrEv utils.CGREvent, rply *string) error {
+	return ssv1.SMG.BiRPCv1ProcessCDR(nil, cgrEv, rply)
 }
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index ee57742ac..61322b97c 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -197,15 +197,15 @@ func startSmGeneric(internalSMGChan, internalRaterChan, internalResourceSChan, i
 	smgRpc := v1.NewSMGenericV1(sm)
 	server.RpcRegister(smgRpc)
 	server.RpcRegister(&v2.SMGenericV2{*smgRpc})
-	smgv1 := v1.NewSMGv1(sm) // methods with multiple options
-	server.RpcRegister(smgv1)
+	ssv1 := v1.NewSessionSv1(sm) // methods with multiple options
+	server.RpcRegister(ssv1)
 	// Register BiRpc handlers
 	if cfg.SessionSCfg().ListenBijson != "" {
 		smgBiRpc := v1.NewSMGenericBiRpcV1(sm)
 		for method, handler := range smgBiRpc.Handlers() {
 			server.BiRPCRegisterName(method, handler)
 		}
-		for method, handler := range smgv1.Handlers() {
+		for method, handler := range ssv1.Handlers() {
 			server.BiRPCRegisterName(method, handler)
 		}
 		server.ServeBiJSON(cfg.SessionSCfg().ListenBijson)