Adding skel for SMGenericV1 integration tests

apier/v1/smgenericv1.go

@@ -30,7 +30,7 @@ func (self *SMGenericV1) GetMaxUsage(ev sessionmanager.SMGenericEvent, maxUsage
 	return nil
 }
 
-/// Returns list of suppliers which can be used for the request
+// Returns list of suppliers which can be used for the request
 func (self *SMGenericV1) GetLcrSuppliers(ev sessionmanager.SMGenericEvent, suppliers *[]string) error {
 	if supls, err := self.sm.GetLcrSuppliers(ev, nil); err != nil {
 		return utils.NewErrServerError(err)

apier/v1/smgenericv1_it_test.go

@@ -0,0 +1,150 @@
+/*
+Real-time Charging System for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can Storagetribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITH*out ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+package v1
+
+import (
+	"encoding/json"
+	"net/rpc"
+	"net/rpc/jsonrpc"
+	"path"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/cgrates/cgrates/config"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+)
+
+var smgV1CfgPath string
+var smgV1Cfg *config.CGRConfig
+var smgV1Rpc *rpc.Client
+var smgV1LoadInst engine.LoadInstance // Share load information between tests
+
+func TestSMGV1InitCfg(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	smgV1CfgPath = path.Join(*dataDir, "conf", "samples", "smgeneric")
+	// Init config first
+	var err error
+	smgV1Cfg, err = config.NewCGRConfigFromFolder(smgV1CfgPath)
+	if err != nil {
+		t.Error(err)
+	}
+	smgV1Cfg.DataFolderPath = *dataDir // Share DataFolderPath through config towards StoreDb for Flush()
+	config.SetCgrConfig(smgV1Cfg)
+}
+
+// Remove data in both rating and accounting db
+func TestSMGV1ResetDataDb(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	if err := engine.InitDataDb(smgV1Cfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Wipe out the cdr database
+func TestSMGV1ResetStorDb(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	if err := engine.InitStorDb(smgV1Cfg); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Start CGR Engine
+func TestSMGV1StartEngine(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	if _, err := engine.StopStartEngine(smgV1CfgPath, *waitRater); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Connect rpc client to rater
+func TestsmgV1RpcConn(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	var err error
+	smgV1Rpc, err = jsonrpc.Dial("tcp", smgV1Cfg.RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Load the tariff plan, creating accounts and their balances
+func TestSMGV1LoadTariffPlanFromFolder(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")}
+	if err := smgV1Rpc.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &smgV1LoadInst); err != nil {
+		t.Error(err)
+	} else if smgV1LoadInst.LoadId == "" {
+		t.Error("Empty loadId received, loadInstance: ", smgV1LoadInst)
+	}
+	time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups
+}
+
+// Check loaded stats
+func TestSMGV1CacheStats(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	var rcvStats *utils.CacheStats
+
+	expectedStats := &utils.CacheStats{Destinations: 4, RatingPlans: 3, RatingProfiles: 8, Actions: 7, SharedGroups: 1, Aliases: 1,
+		DerivedChargers: 1, LcrProfiles: 5, CdrStats: 6, Users: 3, LastLoadId: smgV1LoadInst.LoadId, LastLoadTime: smgV1LoadInst.LoadTime.Format(time.RFC3339)}
+	var args utils.AttrCacheStats
+	if err := smgV1Rpc.Call("ApierV2.GetCacheStats", args, &rcvStats); err != nil {
+		t.Error("Got error on ApierV2.GetCacheStats: ", err.Error())
+	} else if !reflect.DeepEqual(expectedStats, rcvStats) {
+		t.Errorf("Calling ApierV2.GetCacheStats expected: %+v, received: %+v", expectedStats, rcvStats)
+	}
+}
+
+// Make sure account was debited properly
+func TestSMGV1AccountsBefore(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	var reply *engine.Account
+	attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}
+	if err := smgV1Rpc.Call("ApierV2.GetAccount", attrs, &reply); err != nil {
+		t.Error("Got error on ApierV2.GetAccount: ", err.Error())
+	} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { // Make sure we debitted
+		jsn, _ := json.Marshal(reply)
+		t.Errorf("Calling ApierV2.GetBalance received: %s", jsn)
+	}
+}
+
+func TestSMGV1StopCgrEngine(t *testing.T) {
+	if !*testLocal {
+		return
+	}
+	if err := engine.KillEngine(100); err != nil {
+		t.Error(err)
+	}
+}

general_tests/tut_smgeneric_it_test.go

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package general_tests
 
 import (
+	"encoding/json"
 	"net/rpc"
 	"net/rpc/jsonrpc"
 	"path"
@@ -136,7 +137,8 @@ func TestTutSMGAccountsBefore(t *testing.T) {
 	if err := tutSMGRpc.Call("ApierV2.GetAccount", attrs, &reply); err != nil {
 		t.Error("Got error on ApierV2.GetAccount: ", err.Error())
 	} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 10.0 { // Make sure we debitted
-		t.Errorf("Calling ApierV2.GetBalance received: %f", reply.BalanceMap[utils.MONETARY].GetTotalValue())
+		jsn, _ := json.Marshal(reply)
+		t.Errorf("Calling ApierV2.GetBalance received: %s", jsn)
 	}
 	attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1002"}
 	if err := tutSMGRpc.Call("ApierV2.GetAccount", attrs, &reply); err != nil {

sessionmanager/session.go

@@ -84,7 +84,6 @@ func (s *Session) debitLoop(runIdx int) {
 		}
 		nextCd.TimeEnd = nextCd.TimeStart.Add(debitPeriod)
 		nextCd.LoopIndex = index
-		//utils.Logger.Debug(fmt.Sprintf("NEXTCD: %s", utils.ToJSON(nextCd)))
 		nextCd.DurationIndex += debitPeriod // first presumed duration
 		cc := new(engine.CallCost)
 		if err := s.sessionManager.Rater().MaxDebit(nextCd, cc); err != nil {
@@ -100,9 +99,7 @@ func (s *Session) debitLoop(runIdx int) {
 			s.sessionManager.WarnSessionMinDuration(s.eventStart.GetUUID(), s.connId)
 		}
 		s.sessionRuns[runIdx].CallCosts = append(s.sessionRuns[runIdx].CallCosts, cc)
-		//utils.Logger.Debug(fmt.Sprintf("CALLCOST: %s", utils.ToJSON(cc)))
 		nextCd.TimeEnd = cc.GetEndTime() // set debited timeEnd
-		//utils.Logger.Debug(fmt.Sprintf("NEXTCD: %s DURATION: %s", utils.ToJSON(nextCd), nextCd.GetDuration().String()))
 		// update call duration with real debited duration
 		nextCd.DurationIndex -= debitPeriod
 		nextCd.DurationIndex += cc.GetDuration()
@@ -228,10 +225,7 @@ func (s *Session) SaveOperations() {
 		}
 		firstCC := sr.CallCosts[0]
 		for _, cc := range sr.CallCosts[1:] {
-			//utils.Logger.Debug(fmt.Sprintf("BEFORE MERGE: %s", utils.ToJSON(firstCC)))
-			//utils.Logger.Debug(fmt.Sprintf("OTHER MERGE: %s", utils.ToJSON(cc)))
 			firstCC.Merge(cc)
-			//utils.Logger.Debug(fmt.Sprintf("AFTER MERGE: %s", utils.ToJSON(firstCC)))
 		}
 
 		var reply string