diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go
index b4f499ebc..0fd4d7834 100644
--- a/agents/diam_it_test.go
+++ b/agents/diam_it_test.go
@@ -259,7 +259,7 @@ package agents
// // Connect rpc client to rater
// func testDiamItApierRpcConn(t *testing.T) {
// var err error
-// apierRpc, err = newRPCClient(daCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// apierRpc, err = engine.NewRPCClient(daCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/agents/dnsagent_it_test.go b/agents/dnsagent_it_test.go
index 3cc11a844..449f2a888 100644
--- a/agents/dnsagent_it_test.go
+++ b/agents/dnsagent_it_test.go
@@ -121,7 +121,7 @@ func testDNSitStartEngine(t *testing.T) {
// Connect rpc client to rater
func testDNSitApierRpcConn(t *testing.T) {
var err error
- dnsRPC, err = newRPCClient(dnsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ dnsRPC, err = engine.NewRPCClient(dnsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go
index f2a3b5da9..7d59a7a76 100644
--- a/agents/httpagent_it_test.go
+++ b/agents/httpagent_it_test.go
@@ -171,7 +171,7 @@ package agents
// // Connect rpc client to rater
// func testHAitApierRpcConn(t *testing.T) {
// var err error
-// haRPC, err = newRPCClient(haCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// haRPC, err = engine.NewRPCClient(haCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/agents/lib_test.go b/agents/lib_test.go
index 296b0206a..73161cf79 100644
--- a/agents/lib_test.go
+++ b/agents/lib_test.go
@@ -19,12 +19,8 @@ along with this program. If not, see
package agents
import (
- "errors"
"flag"
- "github.com/cgrates/birpc"
- "github.com/cgrates/birpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -34,14 +30,3 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be used for rpc comunication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/agents/radagent_it_test.go b/agents/radagent_it_test.go
index a31508649..53ab1e52a 100644
--- a/agents/radagent_it_test.go
+++ b/agents/radagent_it_test.go
@@ -147,7 +147,7 @@ package agents
// // Connect rpc client to rater
// func testRAitApierRpcConn(t *testing.T) {
// var err error
-// raRPC, err = newRPCClient(raCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// raRPC, err = engine.NewRPCClient(raCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/agents/sipagent_it_test.go b/agents/sipagent_it_test.go
index 8f1d50ed8..f872a3954 100644
--- a/agents/sipagent_it_test.go
+++ b/agents/sipagent_it_test.go
@@ -107,7 +107,7 @@ package agents
// // Connect rpc client to rater
// func testSAitApierRpcConn(t *testing.T) {
// var err error
-// saRPC, err = newRPCClient(saCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// saRPC, err = engine.NewRPCClient(saCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go
index 1389dbba9..374e810ae 100644
--- a/analyzers/analyzers_it_test.go
+++ b/analyzers/analyzers_it_test.go
@@ -22,7 +22,6 @@ along with this program. If not, see
package analyzers
import (
- "errors"
"flag"
"os"
"path"
@@ -33,7 +32,6 @@ import (
"github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
- "github.com/cgrates/birpc/jsonrpc"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/loaders"
@@ -70,17 +68,6 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be used for rpc comunication")
)
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
type smock struct{}
func (*smock) DisconnectPeer(ctx *context.Context,
@@ -134,7 +121,7 @@ func testAnalyzerSRPCConn(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- anzRPC, err = newRPCClient(anzCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ anzRPC, err = engine.NewRPCClient(anzCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/accounts_it_test.go b/apis/accounts_it_test.go
index 7be671fae..b61f49ec8 100644
--- a/apis/accounts_it_test.go
+++ b/apis/accounts_it_test.go
@@ -127,7 +127,7 @@ func testAccSStartEngine(t *testing.T) {
func testAccSRPCConn(t *testing.T) {
var err error
- accSRPC, err = newRPCClient(accPrfCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ accSRPC, err = engine.NewRPCClient(accPrfCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/actions_it_test.go b/apis/actions_it_test.go
index 529089386..fd70fc8c7 100644
--- a/apis/actions_it_test.go
+++ b/apis/actions_it_test.go
@@ -146,7 +146,7 @@ func testActionsStartEngine(t *testing.T) {
func testActionsRPCConn(t *testing.T) {
var err error
- actRPC, err = newRPCClient(actCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ actRPC, err = engine.NewRPCClient(actCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/analyzer_it_test.go b/apis/analyzer_it_test.go
index 91a98716a..ff9f100b7 100644
--- a/apis/analyzer_it_test.go
+++ b/apis/analyzer_it_test.go
@@ -110,7 +110,7 @@ func testAnalyzerSStartEngine(t *testing.T) {
func testAnzBiSRPCConn(t *testing.T) {
var err error
- anzBiRPC, err = newRPCClient(anzCfg.ListenCfg())
+ anzBiRPC, err = engine.NewRPCClient(anzCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/apis/attributes_it_test.go b/apis/attributes_it_test.go
index 0b1bc3efa..30fbd92c4 100644
--- a/apis/attributes_it_test.go
+++ b/apis/attributes_it_test.go
@@ -151,7 +151,7 @@ func testAttributesStartEngine(t *testing.T) {
func testAttributesRPCConn(t *testing.T) {
var err error
- attrRPC, err = newRPCClient(attrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ attrRPC, err = engine.NewRPCClient(attrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/cache_it_test.go b/apis/cache_it_test.go
index f481cbafa..264dee491 100644
--- a/apis/cache_it_test.go
+++ b/apis/cache_it_test.go
@@ -113,7 +113,7 @@ func testCacheSStartEngine(t *testing.T) {
func testCacheSRpcConn(t *testing.T) {
var err error
- chcRPC, err = newRPCClient(chcCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ chcRPC, err = engine.NewRPCClient(chcCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to RPC: ", err.Error())
}
diff --git a/apis/chargers_it_test.go b/apis/chargers_it_test.go
index 95bd2a886..d7264f370 100644
--- a/apis/chargers_it_test.go
+++ b/apis/chargers_it_test.go
@@ -127,7 +127,7 @@ func testChargersStartEngine(t *testing.T) {
func testChargersSRPCConn(t *testing.T) {
var err error
- chargersRPC, err = newRPCClient(chargersCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ chargersRPC, err = engine.NewRPCClient(chargersCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/config_it_test.go b/apis/config_it_test.go
index b522fce5e..f3e1f18bc 100644
--- a/apis/config_it_test.go
+++ b/apis/config_it_test.go
@@ -121,7 +121,7 @@ func testCfgStartEngine(t *testing.T) {
func testCfgRPCConn(t *testing.T) {
var err error
- cfgRPC, err = newRPCClient(cfgCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ cfgRPC, err = engine.NewRPCClient(cfgCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
@@ -417,7 +417,7 @@ func testCfgStartEngineStore(t *testing.T) {
func testCfgRPCConnStore(t *testing.T) {
var err error
- cfgRPC, err = newRPCClient(cfgCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ cfgRPC, err = engine.NewRPCClient(cfgCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/cores_it_test.go b/apis/cores_it_test.go
index 9a45e8093..52c374fb6 100644
--- a/apis/cores_it_test.go
+++ b/apis/cores_it_test.go
@@ -145,7 +145,7 @@ func testCoreItStartEngineByExecWithCPUProfiling(t *testing.T) {
func testCoreItRPCConn(t *testing.T) {
var err error
- if coreSBiRpc, err = newRPCClient(coreSCfg.ListenCfg()); err != nil {
+ if coreSBiRpc, err = engine.NewRPCClient(coreSCfg.ListenCfg(), *encoding); err != nil {
t.Error(err)
}
}
diff --git a/apis/filter_indexes_it_test.go b/apis/filter_indexes_it_test.go
index 29a0f76c9..9f2446a3c 100644
--- a/apis/filter_indexes_it_test.go
+++ b/apis/filter_indexes_it_test.go
@@ -282,7 +282,7 @@ func testV1FIdxStartEngine(t *testing.T) {
func testV1FIdxRpcConn(t *testing.T) {
var err error
- tFIdxRpc, err = newRPCClient(tFltrIdxCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ tFIdxRpc, err = engine.NewRPCClient(tFltrIdxCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/apis/filters_it_test.go b/apis/filters_it_test.go
index 0336ccbfc..24443072f 100644
--- a/apis/filters_it_test.go
+++ b/apis/filters_it_test.go
@@ -121,7 +121,7 @@ func testFiltersStartEngine(t *testing.T) {
func testFiltersRPCConn(t *testing.T) {
var err error
- fltrRPC, err = newRPCClient(fltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ fltrRPC, err = engine.NewRPCClient(fltrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/indexes_after_load_it_test.go b/apis/indexes_after_load_it_test.go
index 269bc42b0..fd3716542 100644
--- a/apis/indexes_after_load_it_test.go
+++ b/apis/indexes_after_load_it_test.go
@@ -102,7 +102,7 @@ func testIdxLoadStartEngine(t *testing.T) {
func testIdxLoadRPCConn(t *testing.T) {
var err error
- idxLoadBiRPC, err = newRPCClient(idxLoadCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ idxLoadBiRPC, err = engine.NewRPCClient(idxLoadCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/lib_test.go b/apis/lib_test.go
index 437252ff7..8d5aa3dae 100644
--- a/apis/lib_test.go
+++ b/apis/lib_test.go
@@ -19,13 +19,8 @@ along with this program. If not, see
package apis
import (
- "errors"
"flag"
- "github.com/cgrates/birpc"
- "github.com/cgrates/birpc/jsonrpc"
-
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -35,14 +30,3 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding would be used for rpc communication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/apis/loaders_it_test.go b/apis/loaders_it_test.go
index 0676c0e8b..0fbde6db4 100644
--- a/apis/loaders_it_test.go
+++ b/apis/loaders_it_test.go
@@ -138,7 +138,7 @@ func testLoadersStartEngine(t *testing.T) {
func testLoadersRPCConn(t *testing.T) {
var err error
- ldrRPC, err = newRPCClient(ldrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ ldrRPC, err = engine.NewRPCClient(ldrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/preload_it_test.go b/apis/preload_it_test.go
index ac724f22a..a063fc4be 100644
--- a/apis/preload_it_test.go
+++ b/apis/preload_it_test.go
@@ -154,7 +154,7 @@ func testPreloadITStartEngine(t *testing.T) {
func testPreloadITRPCConn(t *testing.T) {
var err error
- if preloadRPC, err = newRPCClient(preloadCFG.ListenCfg()); err != nil {
+ if preloadRPC, err = engine.NewRPCClient(preloadCFG.ListenCfg(), *encoding); err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
}
diff --git a/apis/rankings_it_test.go b/apis/rankings_it_test.go
index 682b5c6f9..616ddd234 100644
--- a/apis/rankings_it_test.go
+++ b/apis/rankings_it_test.go
@@ -117,7 +117,7 @@ func testRankingsStartEngine(t *testing.T) {
func testRankingsRPCConn(t *testing.T) {
var err error
- raRPC, err = newRPCClient(raCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ raRPC, err = engine.NewRPCClient(raCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/rates_it_test.go b/apis/rates_it_test.go
index 346590107..9e01bfe23 100644
--- a/apis/rates_it_test.go
+++ b/apis/rates_it_test.go
@@ -136,7 +136,7 @@ func testRateSStartEngine(t *testing.T) {
func testRateSRPCConn(t *testing.T) {
var err error
- rateSRPC, err = newRPCClient(ratePrfCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ rateSRPC, err = engine.NewRPCClient(ratePrfCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/resources_it_test.go b/apis/resources_it_test.go
index c00c71160..280a75202 100644
--- a/apis/resources_it_test.go
+++ b/apis/resources_it_test.go
@@ -140,7 +140,7 @@ func testResourceSStartEngine(t *testing.T) {
func testResourceSRPCConn(t *testing.T) {
var err error
- rsRPC, err = newRPCClient(rsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ rsRPC, err = engine.NewRPCClient(rsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/routes_it_test.go b/apis/routes_it_test.go
index b8f0fd07e..76cb01338 100644
--- a/apis/routes_it_test.go
+++ b/apis/routes_it_test.go
@@ -126,7 +126,7 @@ func testRoutesStartEngine(t *testing.T) {
func testRoutesRPCConn(t *testing.T) {
var err error
- raRPC, err = newRPCClient(raCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ raRPC, err = engine.NewRPCClient(raCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/servmanager_it_test.go b/apis/servmanager_it_test.go
index aa060bea8..cdbb32b1b 100644
--- a/apis/servmanager_it_test.go
+++ b/apis/servmanager_it_test.go
@@ -102,7 +102,7 @@ func testSrvMngStartEngine(t *testing.T) {
func testSrvMngSRPCConn(t *testing.T) {
var err error
- srvMngRPC, err = newRPCClient(srvMngCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ srvMngRPC, err = engine.NewRPCClient(srvMngCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/stats_it_test.go b/apis/stats_it_test.go
index e04cae2d8..8bbb058b3 100644
--- a/apis/stats_it_test.go
+++ b/apis/stats_it_test.go
@@ -131,7 +131,7 @@ func testStatsStartEngine(t *testing.T) {
func testStatsRPCConn(t *testing.T) {
var err error
- sqRPC, err = newRPCClient(sqCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ sqRPC, err = engine.NewRPCClient(sqCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/thresholds_it_test.go b/apis/thresholds_it_test.go
index cf467f71c..d58a149c4 100644
--- a/apis/thresholds_it_test.go
+++ b/apis/thresholds_it_test.go
@@ -121,7 +121,7 @@ func testThresholdsStartEngine(t *testing.T) {
func testThresholdsRPCConn(t *testing.T) {
var err error
- thRPC, err = newRPCClient(thCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ thRPC, err = engine.NewRPCClient(thCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/tpes_it_test.go b/apis/tpes_it_test.go
index 5df1cb8d9..fabb371e7 100644
--- a/apis/tpes_it_test.go
+++ b/apis/tpes_it_test.go
@@ -125,7 +125,7 @@ func testTPeSStartEngine(t *testing.T) {
func testTPeSRPCConn(t *testing.T) {
var err error
- tpeSRPC, err = newRPCClient(tpesCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ tpeSRPC, err = engine.NewRPCClient(tpesCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/apis/trends_it_test.go b/apis/trends_it_test.go
index 438351da6..e59cf1b10 100644
--- a/apis/trends_it_test.go
+++ b/apis/trends_it_test.go
@@ -116,7 +116,7 @@ func testTrendsStartEngine(t *testing.T) {
func testTrendsRPCConn(t *testing.T) {
var err error
- trRPC, err = newRPCClient(trCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ trRPC, err = engine.NewRPCClient(trCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/cdrs/cdrs_it_test.go b/cdrs/cdrs_it_test.go
index 8f6590615..4eb89e6c8 100644
--- a/cdrs/cdrs_it_test.go
+++ b/cdrs/cdrs_it_test.go
@@ -145,7 +145,7 @@ cgrates.org,DEFAULT_RATE,,;0,0,0,*free,RT_ALWAYS,,"* * * * *",;0,false,0s,,0.1,1
}
defer engine.KillEngine(*waitRater)
- client, err := newRPCClient(cfg.ListenCfg())
+ client, err := engine.NewRPCClient(cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatalf("could not establish connection to engine: %v", err)
}
diff --git a/cdrs/lib_test.go b/cdrs/lib_test.go
index 8abac37a2..2e5295d4e 100644
--- a/cdrs/lib_test.go
+++ b/cdrs/lib_test.go
@@ -26,9 +26,7 @@ import (
"os"
"path/filepath"
- "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
- "github.com/cgrates/birpc/jsonrpc"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -40,17 +38,6 @@ var (
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
// initCfg creates a new CGRConfig from the provided configuration content string. It generates a
// temporary directory and file path, writes the content to the configuration file, and returns the
// created CGRConfig, the file path, a cleanup function, and any error encountered.
diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go
index 6b54e226e..df5d60c79 100644
--- a/cmd/cgr-loader/cgr-loader_it_test.go
+++ b/cmd/cgr-loader/cgr-loader_it_test.go
@@ -23,7 +23,6 @@ package main
import (
"bytes"
- "errors"
"flag"
"fmt"
"net"
@@ -50,17 +49,6 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be used for rpc comunication")
)
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
func TestLoadConfig(t *testing.T) {
// DataDb
*cfgPath = path.Join(*dataDir, "conf", "samples", "tutmysql")
diff --git a/cmd/cgr-loader/cgr-loader_remove_it_test.go b/cmd/cgr-loader/cgr-loader_remove_it_test.go
index b32b85353..9f61b4b30 100644
--- a/cmd/cgr-loader/cgr-loader_remove_it_test.go
+++ b/cmd/cgr-loader/cgr-loader_remove_it_test.go
@@ -111,7 +111,7 @@ func testCgrLdrStartEngine(t *testing.T) {
func testCgrLdrRPCConn(t *testing.T) {
var err error
- cgrLdrBIRPC, err = newRPCClient(cgrLdrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ cgrLdrBIRPC, err = engine.NewRPCClient(cgrLdrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/dispatchers/accounts_it_test.go b/dispatchers/accounts_it_test.go
index 1aa4cf005..53a6d954a 100644
--- a/dispatchers/accounts_it_test.go
+++ b/dispatchers/accounts_it_test.go
@@ -24,6 +24,7 @@ package dispatchers
import (
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
)
@@ -60,12 +61,12 @@ func TestDspAccountSIT(t *testing.T) {
func testDspAccPrfPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.AccountSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AccountSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.AccountSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.AccountSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "accPrf12345",
diff --git a/dispatchers/actions_it_test.go b/dispatchers/actions_it_test.go
index fe07323ca..8eab0240c 100644
--- a/dispatchers/actions_it_test.go
+++ b/dispatchers/actions_it_test.go
@@ -24,6 +24,7 @@ package dispatchers
import (
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
)
@@ -60,12 +61,12 @@ func TestDspActionSIT(t *testing.T) {
func testDspActPrfPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ActionSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ActionSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.ActionSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ActionSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "actPrf12345",
diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go
index 005ade8f9..a445c7bf8 100644
--- a/dispatchers/attributes_it_test.go
+++ b/dispatchers/attributes_it_test.go
@@ -26,6 +26,7 @@ import (
"sort"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -88,13 +89,13 @@ func TestDspAttributeSNoConn(t *testing.T) {
func testDspAttrPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
reply = ""
- if err := allEngine2.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -106,27 +107,27 @@ func testDspAttrPingFailover(t *testing.T) {
utils.OptsAPIKey: "attr12345",
},
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
allEngine2.startEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -135,7 +136,7 @@ func testDspAttrPingFailover(t *testing.T) {
func testDspAttrPingFailoverNotFoundHost(t *testing.T) {
var reply string
- if err := allEngine2.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -151,18 +152,18 @@ func testDspAttrPingFailoverNotFoundHost(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t) // stop the engine and we expect to get error
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine2.startEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -171,13 +172,13 @@ func testDspAttrPingFailoverNotFoundHost(t *testing.T) {
func testDspAttrPingFailover2(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
reply = ""
- if err := allEngine2.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -190,20 +191,20 @@ func testDspAttrPingFailover2(t *testing.T) {
},
}
allEngine.stopEngine(t) // stop the engine and the call should go to the second engine
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
allEngine2.startEngine(t)
reply = ""
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -274,12 +275,12 @@ func testDspAttrGetAttrFailover(t *testing.T) {
var attrReply engine.APIAttributeProfile
var rplyEv engine.AttrSProcessEventReply
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
} else if reflect.DeepEqual(*eRply, &rplyEv) {
@@ -289,7 +290,7 @@ func testDspAttrGetAttrFailover(t *testing.T) {
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err != nil {
t.Error(err)
}
@@ -299,7 +300,7 @@ func testDspAttrGetAttrFailover(t *testing.T) {
t.Errorf("Expecting: %s, received: %s", utils.ToJSON(*eAttrPrf), utils.ToJSON(attrReply))
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRply, &rplyEv) {
@@ -312,7 +313,7 @@ func testDspAttrGetAttrFailover(t *testing.T) {
func testDspAttrPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -320,7 +321,7 @@ func testDspAttrPing(t *testing.T) {
if dispEngine.RPC == nil {
t.Fatal(dispEngine.RPC)
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "attr12345",
@@ -344,7 +345,7 @@ func testDspAttrTestMissingArgDispatcher(t *testing.T) {
},
}
var attrReply *engine.AttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing(utils.APIKey).Error() {
t.Errorf("Error:%v rply=%s", err, utils.ToJSON(attrReply))
}
@@ -362,7 +363,7 @@ func testDspAttrTestMissingApiKey(t *testing.T) {
},
}
var attrReply *engine.AttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing(utils.APIKey).Error() {
t.Errorf("Error:%v rply=%s", err, utils.ToJSON(attrReply))
}
@@ -380,7 +381,7 @@ func testDspAttrTestUnknownApiKey(t *testing.T) {
},
}
var attrReply *engine.AttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrUnknownApiKey.Error() {
t.Error(err)
}
@@ -399,7 +400,7 @@ func testDspAttrTestAuthKey(t *testing.T) {
},
}
var attrReply *engine.AttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -442,7 +443,7 @@ func testDspAttrTestAuthKey2(t *testing.T) {
eAttrPrf.Attributes[0].FilterIDs = nil // empty slice are nil in gob
}
var attrReply engine.APIAttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err != nil {
t.Error(err)
}
@@ -476,7 +477,7 @@ func testDspAttrTestAuthKey2(t *testing.T) {
}
var rplyEv engine.AttrSProcessEventReply
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRply, &rplyEv) {
@@ -499,7 +500,7 @@ func testDspAttrTestAuthKey3(t *testing.T) {
},
}
var attrReply *engine.AttributeProfile
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
@@ -570,13 +571,13 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
var attrReply engine.APIAttributeProfile
var rplyEv engine.AttrSProcessEventReply
// To ALL2
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
// To ALL
- if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err != nil {
t.Error(err)
}
@@ -588,7 +589,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
}
// To ALL2
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
} else if reflect.DeepEqual(eRply, &rplyEv) {
@@ -597,7 +598,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) {
}
// To ALL
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRply, &rplyEv) {
@@ -645,7 +646,7 @@ func testDspAttrGetAttrInternal(t *testing.T) {
}
var rplyEv engine.AttrSProcessEventReply
- if err := dispEngine.RPC.Call(utils.AttributeSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1ProcessEvent,
ev, &rplyEv); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRply, &rplyEv) {
@@ -656,7 +657,7 @@ func testDspAttrGetAttrInternal(t *testing.T) {
func testDspAttrPingNoArgDispatcher(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -664,7 +665,7 @@ func testDspAttrPingNoArgDispatcher(t *testing.T) {
if dispEngine.RPC == nil {
t.Fatal(dispEngine.RPC)
}
- if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{Tenant: "cgrates.org"}, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.AttributeSv1Ping, &utils.CGREvent{Tenant: "cgrates.org"}, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go
index 56624c86d..77fb1feb5 100644
--- a/dispatchers/caches_it_test.go
+++ b/dispatchers/caches_it_test.go
@@ -27,6 +27,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/ltcache"
@@ -73,7 +74,7 @@ func TestDspCacheSv1(t *testing.T) {
func testDspChcPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.CacheSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.CacheSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -81,7 +82,7 @@ func testDspChcPing(t *testing.T) {
if dispEngine.RPC == nil {
t.Fatal(dispEngine.RPC)
}
- if err := dispEngine.RPC.Call(utils.CacheSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
@@ -104,7 +105,7 @@ func testDspChcLoadAfterFolder(t *testing.T) {
},
Tenant: "cgrates.org",
}
- if err := dispEngine.RPC.Call(utils.CacheSv1GetCacheStats, args, &rcvStats); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1GetCacheStats, args, &rcvStats); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expStats, rcvStats) {
t.Errorf("Expecting: %+v, \n received: %+v", utils.ToJSON(expStats), utils.ToJSON(rcvStats))
@@ -116,7 +117,7 @@ func testDspChcLoadAfterFolder(t *testing.T) {
utils.OptsAPIKey: "chc12345",
}
argsR.Tenant = "cgrates.org"
- if err := dispEngine.RPC.Call(utils.CacheSv1LoadCache, argsR, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1LoadCache, argsR, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Error(reply)
@@ -153,7 +154,7 @@ func testDspChcLoadAfterFolder(t *testing.T) {
expStats[utils.CacheRateProfilesFilterIndexes].Groups = 1
expStats[utils.CacheRateFilterIndexes].Items = 2
expStats[utils.CacheRateFilterIndexes].Groups = 2
- if err := dispEngine.RPC.Call(utils.CacheSv1GetCacheStats, &args, &rcvStats); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1GetCacheStats, &args, &rcvStats); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expStats, rcvStats) {
t.Errorf("Expecting: %+v, \n received: %+v", utils.ToJSON(expStats), utils.ToJSON(rcvStats))
@@ -211,7 +212,7 @@ func testDspChcPrecacheStatus(t *testing.T) {
utils.CacheReplicationHosts: utils.MetaReady,
}
- if err := dispEngine.RPC.Call(utils.CacheSv1PrecacheStatus, utils.AttrCacheIDsWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1PrecacheStatus, utils.AttrCacheIDsWithAPIOpts{
APIOpts: map[string]any{
utils.OptsAPIKey: "chc12345",
},
@@ -235,7 +236,7 @@ func testDspChcGetItemIDs(t *testing.T) {
},
Tenant: "cgrates.org",
}
- if err := dispEngine.RPC.Call(utils.CacheSv1GetItemIDs, argsAPI, &rcvKeys); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1GetItemIDs, argsAPI, &rcvKeys); err != nil {
t.Fatalf("Got error on APIerSv1.GetCacheStats: %s ", err.Error())
}
sort.Strings(rcvKeys)
@@ -257,7 +258,7 @@ func testDspChcHasItem(t *testing.T) {
},
Tenant: "cgrates.org",
}
- if err := dispEngine.RPC.Call(utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
t.Error(err)
} else if !reply {
t.Errorf("Expected: %v , received:%v", expected, reply)
@@ -277,7 +278,7 @@ func testDspChcGetItemExpiryTime(t *testing.T) {
},
Tenant: "cgrates.org",
}
- if err := dispEngine.RPC.Call(utils.CacheSv1GetItemExpiryTime, argsAPI, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1GetItemExpiryTime, argsAPI, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, reply) {
t.Errorf("Expected: %v , received:%v", expected, reply)
@@ -286,7 +287,7 @@ func testDspChcGetItemExpiryTime(t *testing.T) {
func testDspChcReloadCache(t *testing.T) {
reply := ""
- if err := dispEngine.RPC.Call(utils.CacheSv1ReloadCache, &utils.AttrReloadCacheWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1ReloadCache, &utils.AttrReloadCacheWithAPIOpts{
APIOpts: map[string]any{
utils.OptsAPIKey: "chc12345",
},
@@ -310,18 +311,18 @@ func testDspChcRemoveItem(t *testing.T) {
},
Tenant: "cgrates.org",
}
- if err := dispEngine.RPC.Call(utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
t.Error(err)
} else if !reply {
t.Errorf("Expected: %v , received:%v", true, reply)
}
var remReply string
- if err := dispEngine.RPC.Call(utils.CacheSv1RemoveItem, argsAPI, &remReply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1RemoveItem, argsAPI, &remReply); err != nil {
t.Error(err)
} else if remReply != utils.OK {
t.Errorf("Expected: %v , received:%v", utils.OK, remReply)
}
- if err := dispEngine.RPC.Call(utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1HasItem, argsAPI, &reply); err != nil {
t.Error(err)
} else if reply {
t.Errorf("Expected: %v , received:%v", false, reply)
@@ -330,7 +331,7 @@ func testDspChcRemoveItem(t *testing.T) {
func testDspChcClear(t *testing.T) {
reply := ""
- if err := dispEngine.RPC.Call(utils.CacheSv1Clear, utils.AttrCacheIDsWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1Clear, utils.AttrCacheIDsWithAPIOpts{
APIOpts: map[string]any{
utils.OptsAPIKey: "chc12345",
},
@@ -342,7 +343,7 @@ func testDspChcClear(t *testing.T) {
}
var rcvStats map[string]*ltcache.CacheStats
expStats := engine.GetDefaultEmptyCacheStats()
- if err := dispEngine.RPC.Call(utils.CacheSv1GetCacheStats, utils.AttrCacheIDsWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.CacheSv1GetCacheStats, utils.AttrCacheIDsWithAPIOpts{
APIOpts: map[string]any{
utils.OptsAPIKey: "chc12345",
},
diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go
index 7aaa943b8..dfab1a25f 100644
--- a/dispatchers/chargers_it_test.go
+++ b/dispatchers/chargers_it_test.go
@@ -27,6 +27,7 @@ import (
"strings"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -70,7 +71,7 @@ func TestDspChargerST(t *testing.T) {
func testDspCppPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ChargerSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -82,19 +83,19 @@ func testDspCppPingFailover(t *testing.T) {
utils.OptsAPIKey: "chrg12345",
},
}
- if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -132,7 +133,7 @@ func testDspCppGetChtgFailover(t *testing.T) {
(*eChargers)[0].FilterIDs = nil // empty slice are nil in gob
}
var reply *engine.ChargerProfiles
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eChargers, reply) {
@@ -157,7 +158,7 @@ func testDspCppGetChtgFailover(t *testing.T) {
if *encoding == utils.MetaGOB {
(*eChargers)[1].FilterIDs = nil // empty slice are nil in gob
}
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err != nil {
t.Fatal(err)
}
@@ -173,12 +174,12 @@ func testDspCppGetChtgFailover(t *testing.T) {
func testDspCppPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ChargerSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "chrg12345",
@@ -202,7 +203,7 @@ func testDspCppTestAuthKey(t *testing.T) {
},
}
var reply *engine.ChargerProfiles
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -251,7 +252,7 @@ func testDspCppTestAuthKey2(t *testing.T) {
(*eChargers)[1].FilterIDs = nil // empty slice are nil in gob
}
var reply *engine.ChargerProfiles
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err != nil {
t.Fatal(err)
}
@@ -294,7 +295,7 @@ func testDspCppGetChtgRoundRobin(t *testing.T) {
}
var reply *engine.ChargerProfiles
// To ALL2
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eChargers, reply) {
@@ -318,7 +319,7 @@ func testDspCppGetChtgRoundRobin(t *testing.T) {
if *encoding == utils.MetaGOB {
(*eChargers)[1].FilterIDs = nil // empty slice are nil in gob
}
- if err := dispEngine.RPC.Call(utils.ChargerSv1GetChargersForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ChargerSv1GetChargersForEvent,
args, &reply); err != nil {
t.Fatal(err)
}
diff --git a/dispatchers/config_it_test.go b/dispatchers/config_it_test.go
index 62525a11b..642f4ba43 100644
--- a/dispatchers/config_it_test.go
+++ b/dispatchers/config_it_test.go
@@ -25,6 +25,7 @@ import (
"reflect"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -73,7 +74,7 @@ func testDspConfigSv1GetJSONSection(t *testing.T) {
"listen": expected,
}
var reply map[string]any
- if err := dispEngine.RPC.Call(utils.ConfigSv1GetConfig, &config.SectionWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ConfigSv1GetConfig, &config.SectionWithAPIOpts{
Tenant: "cgrates.org",
Sections: []string{"listen"},
APIOpts: map[string]any{
diff --git a/dispatchers/guardian_it_test.go b/dispatchers/guardian_it_test.go
index c17643429..831f26d41 100644
--- a/dispatchers/guardian_it_test.go
+++ b/dispatchers/guardian_it_test.go
@@ -26,6 +26,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/guardian"
"github.com/cgrates/cgrates/utils"
)
@@ -64,12 +65,12 @@ func TestDspGuardianST(t *testing.T) {
func testDspGrdPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.GuardianSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.GuardianSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.GuardianSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.GuardianSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
@@ -90,7 +91,7 @@ func testDspGrdLock(t *testing.T) {
Timeout: 500 * time.Millisecond,
}
var reply string
- if err := dispEngine.RPC.Call(utils.GuardianSv1RemoteLock, &guardian.AttrRemoteLockWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.GuardianSv1RemoteLock, &guardian.AttrRemoteLockWithAPIOpts{
AttrRemoteLock: args,
Tenant: "cgrates.org",
APIOpts: map[string]any{
@@ -101,7 +102,7 @@ func testDspGrdLock(t *testing.T) {
}
var unlockReply []string
- if err := dispEngine.RPC.Call(utils.GuardianSv1RemoteUnlock, &guardian.AttrRemoteUnlockWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.GuardianSv1RemoteUnlock, &guardian.AttrRemoteUnlockWithAPIOpts{
RefID: reply,
Tenant: "cgrates.org",
APIOpts: map[string]any{
diff --git a/dispatchers/lib_test.go b/dispatchers/lib_test.go
index eb9fc6ab9..3c8fc6450 100644
--- a/dispatchers/lib_test.go
+++ b/dispatchers/lib_test.go
@@ -19,16 +19,14 @@ along with this program. If not, see
package dispatchers
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
"os/exec"
"path"
"strconv"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -47,21 +45,10 @@ var (
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
type testDispatcher struct {
CfgPath string
Cfg *config.CGRConfig
- RPC *rpc.Client
+ RPC *birpc.Client
cmd *exec.Cmd
}
@@ -92,7 +79,7 @@ func (d *testDispatcher) startEngine(t *testing.T) {
t.Fatalf("Error at engine start:%v\n", err)
}
// }
- if d.RPC, err = newRPCClient(d.Cfg.ListenCfg()); err != nil {
+ if d.RPC, err = engine.NewRPCClient(d.Cfg.ListenCfg(), *encoding); err != nil {
t.Fatalf("Error at dialing rcp client:%v\n", err)
}
}
diff --git a/dispatchers/rates_it_test.go b/dispatchers/rates_it_test.go
index 2f5b21042..1f90a8db9 100644
--- a/dispatchers/rates_it_test.go
+++ b/dispatchers/rates_it_test.go
@@ -25,6 +25,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
)
@@ -63,12 +64,12 @@ func TestDspRateSIT(t *testing.T) {
func testDspRPrfPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.RateSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.RateSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.RateSv1Ping, utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.RateSv1Ping, utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "rPrf12345",
@@ -113,13 +114,13 @@ func testDspRPrfCostForEvent(t *testing.T) {
},
}
var reply string
- if err := allEngine.RPC.Call(utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Expected OK, received %+v", reply)
}
var rply *utils.RateProfile
- if err := allEngine.RPC.Call(utils.AdminSv1GetRateProfile, &utils.TenantID{
+ if err := allEngine.RPC.Call(context.Background(), utils.AdminSv1GetRateProfile, &utils.TenantID{
Tenant: "cgrates.org",
ID: "DefaultRate",
}, &rply); err != nil {
@@ -146,7 +147,7 @@ func testDspRPrfCostForEvent(t *testing.T) {
}
var rpCost *utils.RateProfileCost
- if err := dispEngine.RPC.Call(utils.RateSv1CostForEvent, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.RateSv1CostForEvent, &utils.CGREvent{
Tenant: "cgrates.org",
ID: "DefaultRate",
Event: map[string]any{
@@ -194,13 +195,13 @@ func testDspRPrfCostForEventWithoutFilters(t *testing.T) {
},
}
var reply string
- if err := allEngine.RPC.Call(utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.AdminSv1SetRateProfile, rPrf, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Expected OK, received %+v", reply)
}
var rply *utils.RateProfile
- if err := allEngine.RPC.Call(utils.AdminSv1GetRateProfile, &utils.TenantID{
+ if err := allEngine.RPC.Call(context.Background(), utils.AdminSv1GetRateProfile, &utils.TenantID{
Tenant: "cgrates.org",
ID: "ID_RP",
}, &rply); err != nil {
@@ -227,7 +228,7 @@ func testDspRPrfCostForEventWithoutFilters(t *testing.T) {
}
var rpCost *utils.RateProfileCost
- if err := dispEngine.RPC.Call(utils.RateSv1CostForEvent, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.RateSv1CostForEvent, &utils.CGREvent{
Tenant: "cgrates.org",
ID: "EVENT_RATE",
Event: map[string]any{
diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go
index 4457bdf0d..32523b9f0 100644
--- a/dispatchers/replicator_it_test.go
+++ b/dispatchers/replicator_it_test.go
@@ -25,6 +25,7 @@ import (
"reflect"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
@@ -78,13 +79,13 @@ func TestDspReplicator(t *testing.T) {
func testDspRplPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ReplicatorSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
reply = utils.EmptyString
- if err := allEngine2.RPC.Call(utils.ReplicatorSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -97,27 +98,27 @@ func testDspRplPingFailover(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
reply = utils.EmptyString
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
reply = utils.EmptyString
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
allEngine2.startEngine(t)
reply = utils.EmptyString
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -137,7 +138,7 @@ func testDspRplSupplierProfile(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRouteProfile, argSetSupplierProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetRouteProfile, argSetSupplierProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetSupplierProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -154,7 +155,7 @@ func testDspRplSupplierProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetSupplierProfile: ", err)
} else if reply.ID != argSetSupplierProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argSetSupplierProfile.ID, reply.ID)
@@ -166,7 +167,7 @@ func testDspRplSupplierProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get RouteProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -174,13 +175,13 @@ func testDspRplSupplierProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove SupplierProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveRouteProfile, argRouteProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveRouteProfile, argRouteProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get RouteProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -197,7 +198,7 @@ func testDspRplAttributeProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetAttributeProfile, setAttributeProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetAttributeProfile, setAttributeProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetAttributeProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -214,7 +215,7 @@ func testDspRplAttributeProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetAttributeProfile: ", err)
} else if reply.ID != setAttributeProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", setAttributeProfile.ID, reply.ID)
@@ -225,7 +226,7 @@ func testDspRplAttributeProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get AttributeProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -233,14 +234,14 @@ func testDspRplAttributeProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove AttributeProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveAttributeProfile, argAttributeProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveAttributeProfile, argAttributeProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get AttributeProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -257,7 +258,7 @@ func testDspRplChargerProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetChargerProfile, setChargerProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetChargerProfile, setChargerProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetChargerProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -273,7 +274,7 @@ func testDspRplChargerProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetChargerProfile: ", err)
} else if reply.ID != argsChargerProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argsChargerProfile.ID, reply.ID)
@@ -284,7 +285,7 @@ func testDspRplChargerProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get ChargerProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -292,14 +293,14 @@ func testDspRplChargerProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove ChargerProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveChargerProfile, argsChargerProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveChargerProfile, argsChargerProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get ChargerProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -316,7 +317,7 @@ func testDspRplDispatcherProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetDispatcherProfile, setDispatcherProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetDispatcherProfile, setDispatcherProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetDispatcherProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -332,7 +333,7 @@ func testDspRplDispatcherProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetDispatcherProfile: ", err)
} else if reply.ID != argsDispatcherProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argsDispatcherProfile.ID, reply.ID)
@@ -343,7 +344,7 @@ func testDspRplDispatcherProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get DispatcherProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err == nil || err.Error() != utils.ErrDSPProfileNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err == nil || err.Error() != utils.ErrDSPProfileNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrDSPProfileNotFound, err)
}
@@ -351,14 +352,14 @@ func testDspRplDispatcherProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove DispatcherProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveDispatcherProfile, argsDispatcherProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveDispatcherProfile, argsDispatcherProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get DispatcherProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err == nil || err.Error() != utils.ErrDSPProfileNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err == nil || err.Error() != utils.ErrDSPProfileNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrDSPProfileNotFound, err)
}
}
@@ -377,7 +378,7 @@ func testDspRplDispatcherHost(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetDispatcherHost, setDispatcherHost, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetDispatcherHost, setDispatcherHost, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetDispatcherHost: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -393,7 +394,7 @@ func testDspRplDispatcherHost(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetDispatcherHost: ", err)
} else if reply.ID != argsDispatcherHost.ID {
t.Errorf("Expecting: %+v, received: %+v", argsDispatcherHost.ID, reply.ID)
@@ -404,7 +405,7 @@ func testDspRplDispatcherHost(t *testing.T) {
allEngine.stopEngine(t)
// Get DispatcherHost
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err == nil || err.Error() != utils.ErrDSPHostNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err == nil || err.Error() != utils.ErrDSPHostNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrDSPHostNotFound, err)
}
@@ -412,14 +413,14 @@ func testDspRplDispatcherHost(t *testing.T) {
allEngine.startEngine(t)
// Remove DispatcherHost
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveDispatcherHost, argsDispatcherHost, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveDispatcherHost, argsDispatcherHost, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get DispatcherHost
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err == nil || err.Error() != utils.ErrDSPHostNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err == nil || err.Error() != utils.ErrDSPHostNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrDSPHostNotFound, err)
}
}
@@ -436,7 +437,7 @@ func testDspRplFilter(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetFilter, setFilter, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetFilter, setFilter, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetFilter: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -452,7 +453,7 @@ func testDspRplFilter(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetFilter, argsFilter, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetFilter, argsFilter, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetFilter: ", err)
} else if reply.ID != argsFilter.ID {
t.Errorf("Expecting: %+v, received: %+v", argsFilter.ID, reply.ID)
@@ -463,7 +464,7 @@ func testDspRplFilter(t *testing.T) {
allEngine.stopEngine(t)
// Get Filter
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetFilter, argsFilter, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetFilter, argsFilter, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -471,14 +472,14 @@ func testDspRplFilter(t *testing.T) {
allEngine.startEngine(t)
// Remove Filter
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveFilter, argsFilter, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveFilter, argsFilter, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get Filter
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetFilter, argsFilter, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetFilter, argsFilter, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -495,7 +496,7 @@ func testDspRplThreshold(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetThreshold, setThreshold, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetThreshold, setThreshold, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetThreshold: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -511,7 +512,7 @@ func testDspRplThreshold(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetThreshold: ", err)
} else if reply.ID != argsThreshold.ID {
t.Errorf("Expecting: %+v, received: %+v", argsThreshold.ID, reply.ID)
@@ -522,7 +523,7 @@ func testDspRplThreshold(t *testing.T) {
allEngine.stopEngine(t)
// Get Threshold
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -530,14 +531,14 @@ func testDspRplThreshold(t *testing.T) {
allEngine.startEngine(t)
// Remove Threshold
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveThreshold, argsThreshold, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveThreshold, argsThreshold, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get Threshold
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -554,7 +555,7 @@ func testDspRplThresholdProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetThresholdProfile, setThresholdProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetThresholdProfile, setThresholdProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetThresholdProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -570,7 +571,7 @@ func testDspRplThresholdProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetThresholdProfile: ", err)
} else if reply.ID != argsThresholdProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argsThresholdProfile.ID, reply.ID)
@@ -581,7 +582,7 @@ func testDspRplThresholdProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get ThresholdProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -589,14 +590,14 @@ func testDspRplThresholdProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove ThresholdProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveThresholdProfile, argsThresholdProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveThresholdProfile, argsThresholdProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get ThresholdProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -613,7 +614,7 @@ func testDspRplStatQueue(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetStatQueue, setStatQueue, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetStatQueue, setStatQueue, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetStatQueue: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -629,7 +630,7 @@ func testDspRplStatQueue(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetStatQueue: ", err)
} else if reply.ID != argsStatQueue.ID {
t.Errorf("Expecting: %+v, received: %+v", argsStatQueue.ID, reply.ID)
@@ -640,7 +641,7 @@ func testDspRplStatQueue(t *testing.T) {
allEngine.stopEngine(t)
// Get StatQueue
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -648,14 +649,14 @@ func testDspRplStatQueue(t *testing.T) {
allEngine.startEngine(t)
// Remove StatQueue
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveStatQueue, argsStatQueue, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveStatQueue, argsStatQueue, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get StatQueue
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -672,7 +673,7 @@ func testDspRplStatQueueProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetStatQueueProfile, setStatQueueProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetStatQueueProfile, setStatQueueProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetStatQueueProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -688,7 +689,7 @@ func testDspRplStatQueueProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetStatQueueProfile: ", err)
} else if reply.ID != argsStatQueueProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argsStatQueueProfile.ID, reply.ID)
@@ -699,7 +700,7 @@ func testDspRplStatQueueProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get StatQueueProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -707,14 +708,14 @@ func testDspRplStatQueueProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove StatQueueProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveStatQueueProfile, argsStatQueueProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveStatQueueProfile, argsStatQueueProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get StatQueueProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -731,7 +732,7 @@ func testDspRplResource(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetResource, setResource, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetResource, setResource, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetResource: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -747,7 +748,7 @@ func testDspRplResource(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResource, argsResource, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResource, argsResource, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetResource: ", err)
} else if reply.ID != argsResource.ID {
t.Errorf("Expecting: %+v, received: %+v", argsResource.ID, reply.ID)
@@ -758,7 +759,7 @@ func testDspRplResource(t *testing.T) {
allEngine.stopEngine(t)
// Get Resource
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResource, argsResource, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResource, argsResource, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -766,14 +767,14 @@ func testDspRplResource(t *testing.T) {
allEngine.startEngine(t)
// Remove Resource
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveResource, argsResource, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveResource, argsResource, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get Resource
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResource, argsResource, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResource, argsResource, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -790,7 +791,7 @@ func testDspRplResourceProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetResourceProfile, setResourceProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetResourceProfile, setResourceProfile, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetResourceProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -806,7 +807,7 @@ func testDspRplResourceProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetResourceProfile: ", err)
} else if reply.ID != argsResourceProfile.ID {
t.Errorf("Expecting: %+v, received: %+v", argsResourceProfile.ID, reply.ID)
@@ -817,7 +818,7 @@ func testDspRplResourceProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get ResourceProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -825,14 +826,14 @@ func testDspRplResourceProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove ResourceProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveResourceProfile, argsResourceProfile, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveResourceProfile, argsResourceProfile, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get ResourceProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
}
@@ -878,7 +879,7 @@ func testDspRplRateProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRateProfile, rPrf, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetRateProfile, rPrf, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetRateProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -894,7 +895,7 @@ func testDspRplRateProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRateProfile, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRateProfile, args, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetRateProfile: ", err)
} else if !reflect.DeepEqual(rPrf.RateProfile, reply) {
t.Errorf("Expecting: %+v, received: %+v, ", rPrf.RateProfile, reply)
@@ -903,7 +904,7 @@ func testDspRplRateProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRateProfile, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRateProfile, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -912,14 +913,14 @@ func testDspRplRateProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveRateProfile, args, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveRateProfile, args, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRateProfile, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetRateProfile, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -936,7 +937,7 @@ func testDspRplAccount(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetAccount, rPrf, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetAccount, rPrf, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetAccount: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -952,7 +953,7 @@ func testDspRplAccount(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAccount, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAccount, args, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetAccount: ", err)
} else if !reflect.DeepEqual(rPrf.Account, reply) {
t.Errorf("Expecting: %+v, received: %+v, ", rPrf.Account, reply)
@@ -961,7 +962,7 @@ func testDspRplAccount(t *testing.T) {
allEngine.stopEngine(t)
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAccount, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAccount, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -970,14 +971,14 @@ func testDspRplAccount(t *testing.T) {
allEngine.startEngine(t)
// Remove RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveAccount, args, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveAccount, args, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAccount, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetAccount, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -996,7 +997,7 @@ func testDspRplActionProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetActionProfile, rPrf, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1SetActionProfile, rPrf, &replyStr); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.SetActionProfile: ", err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
@@ -1012,7 +1013,7 @@ func testDspRplActionProfile(t *testing.T) {
utils.OptsAPIKey: "repl12345",
},
}
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActionProfile, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetActionProfile, args, &reply); err != nil {
t.Error("Unexpected error when calling ReplicatorSv1.GetActionProfile: ", err)
} else if !reflect.DeepEqual(rPrf.ActionProfile, reply) {
t.Errorf("Expecting: %+v, received: %+v, ", rPrf.ActionProfile, reply)
@@ -1021,7 +1022,7 @@ func testDspRplActionProfile(t *testing.T) {
allEngine.stopEngine(t)
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActionProfile, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetActionProfile, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
@@ -1030,14 +1031,14 @@ func testDspRplActionProfile(t *testing.T) {
allEngine.startEngine(t)
// Remove RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveActionProfile, args, &replyStr); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1RemoveActionProfile, args, &replyStr); err != nil {
t.Error(err)
} else if replyStr != utils.OK {
t.Error("Unexpected reply returned", replyStr)
}
// Get RateProfile
- if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActionProfile, args, &reply); err == nil ||
+ if err := dispEngine.RPC.Call(context.Background(), utils.ReplicatorSv1GetActionProfile, args, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expecting: %+v, received: %+v, ", utils.ErrNotFound, err)
}
diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go
index d071124c1..b76d3ad17 100644
--- a/dispatchers/resources_it_test.go
+++ b/dispatchers/resources_it_test.go
@@ -25,6 +25,7 @@ import (
"reflect"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -67,7 +68,7 @@ func TestDspResourceSIT(t *testing.T) {
func testDspResPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ResourceSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -79,19 +80,19 @@ func testDspResPingFailover(t *testing.T) {
utils.OptsAPIKey: "res12345",
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -100,12 +101,12 @@ func testDspResPingFailover(t *testing.T) {
func testDspResPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ResourceSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "res12345",
@@ -133,7 +134,7 @@ func testDspResTestAuthKey(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1GetResourcesForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1GetResourcesForEvent,
args, &rs); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -162,7 +163,7 @@ func testDspResTestAuthKey2(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1GetResourcesForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1GetResourcesForEvent,
args, &rs); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRs, rs) {
@@ -186,7 +187,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsResourcesUnits: 1,
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1AllocateResources,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1AllocateResources,
argsRU, &reply); err != nil {
t.Error(err)
}
@@ -195,7 +196,7 @@ func testDspResTestAuthKey3(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply)
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil {
t.Error(err)
} else if reply != eAllocationMsg { // already 3 usages active before allow call, we should have now more than allowed
t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply)
@@ -213,7 +214,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsResourcesUnits: 17,
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1AuthorizeResources,
&argsRU, &reply); err == nil || err.Error() != utils.ErrResourceUnauthorized.Error() {
t.Error(err)
}
@@ -231,7 +232,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e51",
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1ReleaseResources,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1ReleaseResources,
argsRU, &reply); err != nil {
t.Error(err)
}
@@ -250,7 +251,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsResourcesUnits: 6,
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil {
t.Error(err)
} else if reply != "ResGroup1" {
t.Error("Unexpected reply returned", reply)
@@ -268,7 +269,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsResourcesUsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61",
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil {
t.Error(err)
} else if len(*rs) != 1 {
t.Errorf("Resources: %+v", utils.ToJSON(rs))
@@ -290,7 +291,7 @@ func testDspResTestAuthKey3(t *testing.T) {
utils.OptsAPIKey: "res12345",
},
}
- if err := dispEngine.RPC.Call(utils.ResourceSv1GetResource, argsGetResource, &r); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ResourceSv1GetResource, argsGetResource, &r); err != nil {
t.Fatal(err)
}
// make sure Resource1 have no more active resources
diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go
index ec4b68ce4..17d67a550 100644
--- a/dispatchers/routes_it_test.go
+++ b/dispatchers/routes_it_test.go
@@ -27,6 +27,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -73,12 +74,12 @@ func TestDspSupplierS(t *testing.T) {
func testDspSupPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.RouteSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "sup12345",
@@ -92,7 +93,7 @@ func testDspSupPing(t *testing.T) {
func testDspSupPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.RouteSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -104,19 +105,19 @@ func testDspSupPingFailover(t *testing.T) {
utils.OptsAPIKey: "sup12345",
},
}
- if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -178,14 +179,14 @@ func testDspSupGetSupFailover(t *testing.T) {
utils.OptsAPIKey: "sup12345",
},
}
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRpl1, rpl) {
t.Errorf("Expecting : %+v, received: %+v", utils.ToJSON(eRpl1), utils.ToJSON(rpl))
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRpl, rpl) {
@@ -210,7 +211,7 @@ func testDspSupTestAuthKey(t *testing.T) {
utils.OptsAPIKey: "12345",
},
}
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -257,7 +258,7 @@ func testDspSupTestAuthKey2(t *testing.T) {
utils.OptsAPIKey: "sup12345",
},
}
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRpl, rpl) {
@@ -320,13 +321,13 @@ func testDspSupGetSupRoundRobin(t *testing.T) {
utils.OptsAPIKey: "sup12345",
},
}
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRpl1, rpl) {
t.Errorf("Expecting : %+v, received: %+v", utils.ToJSON(eRpl1), utils.ToJSON(rpl))
}
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRoutes,
args, &rpl); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eRpl, rpl) {
@@ -381,7 +382,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) {
expected.SortingParameters = nil // empty slices are nil in gob
}
var supProf []*engine.RouteProfile
- if err := dispEngine.RPC.Call(utils.RouteSv1GetRouteProfilesForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.RouteSv1GetRouteProfilesForEvent,
ev, &supProf); err != nil {
t.Fatal(err)
}
diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go
index 84b924506..5b57f75a2 100644
--- a/dispatchers/sessions_it_test.go
+++ b/dispatchers/sessions_it_test.go
@@ -100,7 +100,7 @@ import (
},
}
var reply string
- if err := allEngine.RPC.Call(utils.APIerSv2SetBalance, attrSetBalance, &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.APIerSv2SetBalance, attrSetBalance, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Received: %s", reply)
@@ -111,18 +111,18 @@ import (
Account: attrSetBalance.Account,
}
eAcntVal := float64(initUsage)
- if err := allEngine.RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
t.Error(err)
} else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal {
t.Errorf("Expecting: %v, received: %v",
time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.MetaVoice].GetTotalValue()))
}
- if err := allEngine2.RPC.Call(utils.APIerSv2SetBalance, attrSetBalance, &reply); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.APIerSv2SetBalance, attrSetBalance, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Received: %s", reply)
}
- if err := allEngine2.RPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
+ if err := allEngine2.RPC.Call(context.Background(), utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
t.Error(err)
} else if acnt.BalanceMap[utils.MetaVoice].GetTotalValue() != eAcntVal {
t.Errorf("Expecting: %v, received: %v",
@@ -132,12 +132,12 @@ import (
func testDspSessionPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.SessionSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
@@ -152,7 +152,7 @@ import (
func testDspSessionPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.SessionSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -164,19 +164,19 @@ import (
utils.OptsAPIKey: "ses12345",
},
}
- if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -211,7 +211,7 @@ import (
},
}
var rply sessions.V1AuthorizeReplyWithDigest
- if err := dispEngine.RPC.Call(utils.SessionSv1AuthorizeEventWithDigest,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1AuthorizeEventWithDigest,
args, &rply); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -247,7 +247,7 @@ import (
},
}
var rply sessions.V1AuthorizeReplyWithDigest
- if err := dispEngine.RPC.Call(utils.SessionSv1AuthorizeEventWithDigest,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1AuthorizeEventWithDigest,
argsAuth, &rply); err != nil {
t.Error(err)
return
@@ -300,7 +300,7 @@ import (
},
}
var rply sessions.V1InitReplyWithDigest
- if err := dispEngine.RPC.Call(utils.SessionSv1InitiateSessionWithDigest,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1InitiateSessionWithDigest,
argsInit, &rply); err != nil {
t.Fatal(err)
}
@@ -321,28 +321,28 @@ import (
Filters: []string{},
}
var reply int
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
&filtr, &reply); err != nil {
t.Fatal(err)
} else if reply != 3 {
t.Errorf("Expected 3 active sessions received %v", reply)
}
var rply []*sessions.ExternalSession
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessions,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessions,
&filtr, &rply); err != nil {
t.Fatal(err)
} else if len(rply) != 3 {
t.Errorf("Unexpected number of sessions returned %v :%s", len(rply), utils.ToJSON(rply))
}
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
&filtr, &reply); err != nil {
t.Fatal(err)
} else if reply != 0 {
t.Errorf("Expected no pasive sessions received %v", reply)
}
rply = nil
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessions,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessions,
&filtr, &rply); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Fatalf("Expected %v received %v with reply %s", utils.ErrNotFound, err, utils.ToJSON(rply))
}
@@ -376,7 +376,7 @@ import (
},
}
var rply sessions.V1UpdateSessionReply
- if err := dispEngine.RPC.Call(utils.SessionSv1UpdateSession,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1UpdateSession,
argsUpdate, &rply); err != nil {
t.Error(err)
}
@@ -447,7 +447,7 @@ import (
},
}
var rply sessions.V1UpdateSessionReply
- if err := dispEngine.RPC.Call(utils.SessionSv1UpdateSession,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1UpdateSession,
argsUpdate, &rply); err != nil {
t.Fatal(err)
}
@@ -526,7 +526,7 @@ import (
},
}
var rply string
- if err := dispEngine.RPC.Call(utils.SessionSv1TerminateSession,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1TerminateSession,
args, &rply); err != nil {
t.Error(err)
}
@@ -557,7 +557,7 @@ import (
}
var rply string
- if err := dispEngine.RPC.Call(utils.SessionSv1ProcessCDR,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ProcessCDR,
args, &rply); err != nil {
t.Fatal(err)
}
@@ -596,7 +596,7 @@ import (
},
}
var rply sessions.V1ProcessMessageReply
- if err := dispEngine.RPC.Call(utils.SessionSv1ProcessMessage,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ProcessMessage,
args, &rply); err != nil {
t.Fatal(err)
}
@@ -675,7 +675,7 @@ import (
},
}
var rply sessions.V1ProcessMessageReply
- if err := dispEngine.RPC.Call(utils.SessionSv1ProcessMessage,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ProcessMessage,
args, &rply); err != nil {
t.Fatal(err)
}
@@ -729,7 +729,7 @@ import (
var reply string
// reload cache in order to corectly cahce the indexes
- if err := allEngine.RPC.Call(utils.CacheSv1Clear, &utils.AttrCacheIDsWithAPIOpts{
+ if err := allEngine.RPC.Call(context.Background(), utils.CacheSv1Clear, &utils.AttrCacheIDsWithAPIOpts{
CacheIDs: nil,
}, &reply); err != nil {
t.Error(err)
@@ -741,7 +741,7 @@ import (
testDspSessionAuthorize(t)
testDspSessionInit(t)
- if err := dispEngine.RPC.Call(utils.SessionSv1ReplicateSessions, &ArgsReplicateSessionsWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ReplicateSessions, &ArgsReplicateSessionsWithAPIOpts{
APIOpts: map[string]any{
utils.OptsAPIKey: "ses12345",
},
@@ -759,7 +759,7 @@ import (
var repl int
time.Sleep(10 * time.Millisecond)
- if err := allEngine2.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := allEngine2.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
new(utils.SessionFilter), &repl); err != nil {
t.Fatal(err)
} else if repl != 3 {
@@ -779,13 +779,13 @@ import (
Filters: []string{},
}
time.Sleep(10 * time.Millisecond)
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 0 {
t.Errorf("Expected no passive sessions received %v", repl)
}
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 3 {
@@ -793,7 +793,7 @@ import (
}
var rply []*sessions.ExternalSession
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessions,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessions,
&filtr, &rply); err != nil {
t.Fatal(err)
} else if len(rply) != 3 {
@@ -801,7 +801,7 @@ import (
}
var reply string
- if err := dispEngine.RPC.Call(utils.SessionSv1SetPassiveSession, sessions.Session{
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1SetPassiveSession, sessions.Session{
CGRID: rply[0].CGRID,
Tenant: rply[0].Tenant,
ResourceID: "TestSSv1It1",
@@ -850,13 +850,13 @@ import (
t.Errorf("Unexpected reply %s", reply)
}
time.Sleep(10 * time.Millisecond)
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 1 {
t.Errorf("Expected 1 passive sessions received %v", repl)
}
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 0 {
@@ -881,13 +881,13 @@ import (
Filters: []string{},
}
time.Sleep(10 * time.Millisecond)
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 0 {
t.Errorf("Expected no passive sessions received %v", repl)
}
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 3 {
@@ -895,7 +895,7 @@ import (
}
var rply []*sessions.ExternalSession
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessions,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessions,
&filtr, &rply); err != nil {
t.Fatal(err)
} else if len(rply) != 3 {
@@ -903,19 +903,19 @@ import (
}
var reply string
- if err := dispEngine.RPC.Call(utils.SessionSv1ForceDisconnect, &filtr, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ForceDisconnect, &filtr, &reply); err != nil {
t.Fatal(err)
} else if reply != utils.OK {
t.Errorf("Unexpected reply %s", reply)
}
time.Sleep(10 * time.Millisecond)
- if err := dispEngine.RPC.Call(utils.SessionSv1GetPassiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetPassiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 0 {
t.Errorf("Expected 1 passive sessions received %v", repl)
}
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
filtr, &repl); err != nil {
t.Fatal(err)
} else if repl != 0 {
@@ -948,13 +948,13 @@ import (
},
}
var rply sessions.V1ProcessEventReply
- if err := dispEngine.RPC.Call(utils.SessionSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1ProcessEvent,
args, &rply); err != nil {
t.Error(err)
}
var repl int
- if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetActiveSessionsCount,
utils.SessionFilter{
APIOpts: map[string]any{
utils.OptsAPIKey: "ses12345",
@@ -993,7 +993,7 @@ func testDspSessionGetCost(t *testing.T) {
}
var rply sessions.V1GetCostReply
- if err := dispEngine.RPC.Call(utils.SessionSv1GetCost,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1GetCost,
args, &rply); err != nil {
t.Error(err)
}
@@ -1010,7 +1010,7 @@ func testDspSessionGetCost(t *testing.T) {
func testDspSessionSTIRAuthenticate(t *testing.T) {
var rply string
- if err := dispEngine.RPC.Call(utils.SessionSv1STIRAuthenticate,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1STIRAuthenticate,
&sessions.V1STIRAuthenticateArgs{
Attest: []string{"A"},
PayloadMaxDuration: "-1",
@@ -1044,7 +1044,7 @@ func testDspSessionSTIRIdentity(t *testing.T) {
},
}
var rply string
- if err := dispEngine.RPC.Call(utils.SessionSv1STIRIdentity,
+ if err := dispEngine.RPC.Call(context.Background(), utils.SessionSv1STIRIdentity,
args, &rply); err != nil {
t.Error(err)
}
diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go
index 3671b4a76..1f5e07d81 100644
--- a/dispatchers/stats_it_test.go
+++ b/dispatchers/stats_it_test.go
@@ -27,6 +27,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
)
@@ -69,7 +70,7 @@ func TestDspStatS(t *testing.T) {
func testDspStsPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.StatSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.StatSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -80,19 +81,19 @@ func testDspStsPingFailover(t *testing.T) {
utils.OptsAPIKey: "stat12345",
},
}
- if err := dispEngine.RPC.Call(utils.StatSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.StatSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.StatSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -119,7 +120,7 @@ func testDspStsGetStatFailover(t *testing.T) {
utils.OptsAPIKey: "stat12345",
},
}
- if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1ProcessEvent, args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(reply, expected) {
t.Errorf("Expecting: %+v, received: %+v", expected, reply)
@@ -135,7 +136,7 @@ func testDspStsGetStatFailover(t *testing.T) {
},
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueStringMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueStringMetrics,
args2, &metrics); err != nil {
t.Error(err)
}
@@ -143,7 +144,7 @@ func testDspStsGetStatFailover(t *testing.T) {
allEngine.startEngine(t)
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueStringMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueStringMetrics,
args2, &metrics); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expected error NOT_FOUND but received %v and reply %v\n", err, reply)
}
@@ -152,12 +153,12 @@ func testDspStsGetStatFailover(t *testing.T) {
func testDspStsPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.StatSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.StatSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.StatSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "stat12345",
@@ -185,7 +186,7 @@ func testDspStsTestAuthKey(t *testing.T) {
utils.OptsAPIKey: "12345",
},
}
- if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1ProcessEvent,
args, &reply); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -201,7 +202,7 @@ func testDspStsTestAuthKey(t *testing.T) {
}
var metrics map[string]string
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueStringMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueStringMetrics,
args2, &metrics); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -226,7 +227,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
utils.OptsAPIKey: "stat12345",
},
}
- if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1ProcessEvent, args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(reply, expected) {
t.Errorf("Expecting: %+v, received: %+v", expected, reply)
@@ -246,7 +247,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
utils.MetaTCD: "2m15s",
}
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueStringMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueStringMetrics,
args2, &metrics); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -268,7 +269,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
utils.OptsAPIKey: "stat12345",
},
}
- if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1ProcessEvent, args, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(reply, expected) {
t.Errorf("Expecting: %+v, received: %+v", expected, reply)
@@ -278,7 +279,7 @@ func testDspStsTestAuthKey2(t *testing.T) {
utils.MetaTCC: "133",
utils.MetaTCD: "3m0s",
}
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueStringMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueStringMetrics,
args2, &metrics); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -304,7 +305,7 @@ func testDspStsTestAuthKey3(t *testing.T) {
utils.MetaTCD: 180 * 1e9,
}
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueFloatMetrics,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueFloatMetrics,
args2, &metrics); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -312,7 +313,7 @@ func testDspStsTestAuthKey3(t *testing.T) {
}
estats := []string{"Stats2", "Stats2_1"}
- if err := dispEngine.RPC.Call(utils.StatSv1GetQueueIDs,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetQueueIDs,
&utils.TenantWithAPIOpts{
Tenant: "cgrates.org",
APIOpts: map[string]any{
@@ -328,7 +329,7 @@ func testDspStsTestAuthKey3(t *testing.T) {
}
estats = []string{"Stats2"}
- if err := dispEngine.RPC.Call(utils.StatSv1GetStatQueuesForEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.StatSv1GetStatQueuesForEvent,
&utils.CGREvent{
Tenant: "cgrates.org",
ID: "GetStats",
diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go
index fa797ca69..3d88f1fb2 100644
--- a/dispatchers/thresholds_it_test.go
+++ b/dispatchers/thresholds_it_test.go
@@ -26,6 +26,7 @@ import (
"sort"
"testing"
+ "github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -69,7 +70,7 @@ func TestDspThresholdS(t *testing.T) {
func testDspThPingFailover(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ThresholdSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
@@ -81,19 +82,19 @@ func testDspThPingFailover(t *testing.T) {
utils.OptsAPIKey: "thr12345",
},
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &ev, &reply); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, &ev, &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &ev, &reply); err == nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, &ev, &reply); err == nil {
t.Errorf("Expected error but received %v and reply %v\n", err, reply)
}
allEngine.startEngine(t)
@@ -115,12 +116,12 @@ func testDspThProcessEventFailover(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1ProcessEvent, args,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1ProcessEvent, args,
&ids); err == nil || err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expected error NOT_FOUND but received %v and reply %v\n", err, ids)
}
allEngine2.stopEngine(t)
- if err := dispEngine.RPC.Call(utils.ThresholdSv1ProcessEvent, args, &ids); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1ProcessEvent, args, &ids); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eIDs, ids) {
t.Errorf("expecting: %+v, received: %+v", eIDs, ids)
@@ -130,12 +131,12 @@ func testDspThProcessEventFailover(t *testing.T) {
func testDspThPing(t *testing.T) {
var reply string
- if err := allEngine.RPC.Call(utils.ThresholdSv1Ping, new(utils.CGREvent), &reply); err != nil {
+ if err := allEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, new(utils.CGREvent), &reply); err != nil {
t.Error(err)
} else if reply != utils.Pong {
t.Errorf("Received: %s", reply)
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &utils.CGREvent{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1Ping, &utils.CGREvent{
Tenant: "cgrates.org",
APIOpts: map[string]any{
@@ -161,12 +162,12 @@ func testDspThTestAuthKey(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1ProcessEvent,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1ProcessEvent,
args, &ids); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
var th *engine.Thresholds
- if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThresholdsForEvent, args,
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1GetThresholdsForEvent, args,
&th); err == nil || err.Error() != utils.ErrUnauthorizedApi.Error() {
t.Error(err)
}
@@ -186,7 +187,7 @@ func testDspThTestAuthKey2(t *testing.T) {
},
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1ProcessEvent, args, &ids); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1ProcessEvent, args, &ids); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eIDs, ids) {
t.Errorf("expecting: %+v, received: %+v", eIDs, ids)
@@ -199,7 +200,7 @@ func testDspThTestAuthKey2(t *testing.T) {
Hits: 1,
},
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThresholdsForEvent, args, &th); err != nil {
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1GetThresholdsForEvent, args, &th); err != nil {
t.Error(err)
} else if !reflect.DeepEqual((*eTh)[0].Tenant, (*th)[0].Tenant) {
t.Errorf("expecting: %+v, received: %+v", (*eTh)[0].Tenant, (*th)[0].Tenant)
@@ -217,7 +218,7 @@ func testDspThTestAuthKey3(t *testing.T) {
ID: "THD_ACNT_1002",
Hits: 1,
}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThreshold, &utils.TenantIDWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1GetThreshold, &utils.TenantIDWithAPIOpts{
TenantID: &utils.TenantID{
Tenant: "cgrates.org",
ID: "THD_ACNT_1002",
@@ -238,7 +239,7 @@ func testDspThTestAuthKey3(t *testing.T) {
var ids []string
eIDs := []string{"THD_ACNT_1002"}
- if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThresholdIDs, &utils.TenantWithAPIOpts{
+ if err := dispEngine.RPC.Call(context.Background(), utils.ThresholdSv1GetThresholdIDs, &utils.TenantWithAPIOpts{
Tenant: "cgrates.org",
APIOpts: map[string]any{
utils.OptsAPIKey: "thr12345",
diff --git a/ees/amqp_it_test.go b/ees/amqp_it_test.go
index 856b4a7d4..c61e2fb8d 100644
--- a/ees/amqp_it_test.go
+++ b/ees/amqp_it_test.go
@@ -22,11 +22,11 @@ along with this program. If not, see
package ees
import (
- "net/rpc"
"path"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
amqp "github.com/rabbitmq/amqp091-go"
@@ -39,7 +39,7 @@ var (
amqpConfigDir string
amqpCfgPath string
amqpCfg *config.CGRConfig
- amqpRPC *rpc.Client
+ amqpRPC *birpc.Client
amqpExportPath string
sTestsAMQP = []func(t *testing.T){
@@ -95,7 +95,7 @@ func testAMQPStartEngine(t *testing.T) {
func testAMQPRPCConn(t *testing.T) {
var err error
- amqpRPC, err = newRPCClient(amqpCfg.ListenCfg())
+ amqpRPC, err = engine.NewRPCClient(amqpCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -127,7 +127,7 @@ func testAMQPExportEvent(t *testing.T) {
}
var reply map[string]map[string]any
- if err := amqpRPC.Call(utils.EeSv1ProcessEvent, event, &reply); err != nil {
+ if err := amqpRPC.Call(context.Background(), utils.EeSv1ProcessEvent, event, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
diff --git a/ees/amqpv1_it_test.go b/ees/amqpv1_it_test.go
index fb68e7c2a..422b38a00 100644
--- a/ees/amqpv1_it_test.go
+++ b/ees/amqpv1_it_test.go
@@ -20,12 +20,12 @@ package ees
import (
"flag"
- "net/rpc"
"path"
"testing"
"time"
amqpv1 "github.com/Azure/go-amqp"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -37,7 +37,7 @@ var (
amqpv1ConfDir string
amqpv1CfgPath string
amqpv1Cfg *config.CGRConfig
- amqpv1RPC *rpc.Client
+ amqpv1RPC *birpc.Client
amqpv1DialURL string
amqpv1ConnOpts *amqpv1.ConnOptions
@@ -99,7 +99,7 @@ func testAMQPv1StartEngine(t *testing.T) {
func testAMQPv1RPCConn(t *testing.T) {
var err error
- amqpv1RPC, err = newRPCClient(amqpv1Cfg.ListenCfg())
+ amqpv1RPC, err = engine.NewRPCClient(amqpv1Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -134,7 +134,7 @@ func testAMQPv1ExportEvent(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := amqpv1RPC.Call(utils.EeSv1ProcessEvent, ev, &reply); err != nil {
+ if err := amqpv1RPC.Call(context.Background(), utils.EeSv1ProcessEvent, ev, &reply); err != nil {
t.Error(err)
}
time.Sleep(2 * time.Second)
diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go
index 434452cdc..deec24d6d 100644
--- a/ees/elastic_it_test.go
+++ b/ees/elastic_it_test.go
@@ -25,13 +25,13 @@ import (
"bytes"
"encoding/json"
"flag"
- "net/rpc"
"os/exec"
"path"
"reflect"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
elasticsearch "github.com/elastic/go-elasticsearch/v8"
@@ -44,7 +44,7 @@ var (
elasticConfigDir string
elasticCfgPath string
elasticCfg *config.CGRConfig
- elasticRpc *rpc.Client
+ elasticRpc *birpc.Client
elasticServerPath = flag.Bool("elastic", false, "Run only if the user specify it")
sTestsElastic = []func(t *testing.T){
@@ -101,7 +101,7 @@ func testElasticStartEngine(t *testing.T) {
func testElasticRPCConn(t *testing.T) {
var err error
- elasticRpc, err = newRPCClient(elasticCfg.ListenCfg())
+ elasticRpc, err = engine.NewRPCClient(elasticCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -231,16 +231,16 @@ func testElasticExportEvents(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := elasticRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := elasticRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
- if err := elasticRpc.Call(utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
+ if err := elasticRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
t.Error(err)
}
- if err := elasticRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := elasticRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
- if err := elasticRpc.Call(utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
+ if err := elasticRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
t.Error(err)
}
}
diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go
index 0bd1ee1fc..a15a49062 100644
--- a/ees/filecsv_it_test.go
+++ b/ees/filecsv_it_test.go
@@ -25,7 +25,6 @@ import (
"archive/zip"
"bytes"
"encoding/csv"
- "net/rpc"
"os"
"path"
"path/filepath"
@@ -34,6 +33,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -46,7 +46,7 @@ var (
csvConfigDir string
csvCfgPath string
csvCfg *config.CGRConfig
- csvRpc *rpc.Client
+ csvRpc *birpc.Client
sTestsCsv = []func(t *testing.T){
testCreateDirectory,
@@ -101,7 +101,7 @@ func testCsvStartEngine(t *testing.T) {
func testCsvRPCConn(t *testing.T) {
var err error
- csvRpc, err = newRPCClient(csvCfg.ListenCfg())
+ csvRpc, err = engine.NewRPCClient(csvCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -190,13 +190,13 @@ func testCsvExportEvent(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
t.Error(err)
}
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
@@ -291,10 +291,10 @@ func testCsvExportComposedEvent(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
@@ -448,7 +448,7 @@ func testCsvExportBufferedEvent(t *testing.T) {
},
}
var reply []byte
- if err := csvRpc.Call(utils.EeSv1ArchiveEventsInReply,
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ArchiveEventsInReply,
eventVoice, &reply); err != nil {
t.Error(err)
}
@@ -504,7 +504,7 @@ func testCsvExportBufferedEventNoExports(t *testing.T) {
}
var reply []byte
expectedErr := "exporter config with ID: InexistentExport is missing"
- if err := csvRpc.Call(utils.EeSv1ArchiveEventsInReply,
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ArchiveEventsInReply,
eventVoice, &reply); err == nil || err.Error() != expectedErr {
t.Errorf("Expected %q \n received %q", utils.ToJSON(expectedErr), utils.ToJSON(err))
}
@@ -549,7 +549,7 @@ func testCsvExportBufferedEventNoExports(t *testing.T) {
},
}
expectedErr = "SERVER_ERROR: NO EXPORTS"
- if err := csvRpc.Call(utils.EeSv1ArchiveEventsInReply,
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ArchiveEventsInReply,
eventVoice, &reply); err == nil || err.Error() != expectedErr {
t.Errorf("Expected %q \n received %q", utils.ToJSON(expectedErr), utils.ToJSON(err))
}
@@ -646,13 +646,13 @@ func testCsvExportEventWithInflateTemplate(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
t.Error(err)
}
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
@@ -717,7 +717,7 @@ func testCsvExportNotFoundExporter(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := csvRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err == nil ||
+ if err := csvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Error(err)
}
diff --git a/ees/filefwv_it_test.go b/ees/filefwv_it_test.go
index 2b602dccb..661de6dc2 100644
--- a/ees/filefwv_it_test.go
+++ b/ees/filefwv_it_test.go
@@ -23,7 +23,6 @@ package ees
import (
"io"
- "net/rpc"
"os"
"path"
"path/filepath"
@@ -31,6 +30,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -41,7 +41,7 @@ var (
fwvConfigDir string
fwvCfgPath string
fwvCfg *config.CGRConfig
- fwvRpc *rpc.Client
+ fwvRpc *birpc.Client
sTestsFwv = []func(t *testing.T){
testCreateDirectory,
@@ -89,7 +89,7 @@ func testFwvStartEngine(t *testing.T) {
func testFwvRPCConn(t *testing.T) {
var err error
- fwvRpc, err = newRPCClient(fwvCfg.ListenCfg())
+ fwvRpc, err = engine.NewRPCClient(fwvCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -127,7 +127,7 @@ func testFwvExportEvent(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := fwvRpc.Call(utils.EeSv1ProcessEvent, event, &reply); err != nil {
+ if err := fwvRpc.Call(context.Background(), utils.EeSv1ProcessEvent, event, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
diff --git a/ees/httppost_it_test.go b/ees/httppost_it_test.go
index 01fe6b490..b9592d441 100644
--- a/ees/httppost_it_test.go
+++ b/ees/httppost_it_test.go
@@ -24,12 +24,12 @@ package ees
import (
"io"
"net/http"
- "net/rpc"
"net/url"
"path"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -41,7 +41,7 @@ var (
httpPostConfigDir string
httpPostCfgPath string
httpPostCfg *config.CGRConfig
- httpPostRpc *rpc.Client
+ httpPostRpc *birpc.Client
httpValues url.Values
sTestsHTTPPost = []func(t *testing.T){
@@ -90,7 +90,7 @@ func testHTTPPostStartEngine(t *testing.T) {
func testHTTPPostRPCConn(t *testing.T) {
var err error
- httpPostRpc, err = newRPCClient(httpPostCfg.ListenCfg())
+ httpPostRpc, err = engine.NewRPCClient(httpPostCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -230,7 +230,7 @@ func testHTTPExportEvent(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := httpPostRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := httpPostRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -253,7 +253,7 @@ func testHTTPExportEvent(t *testing.T) {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpPostRpc.Call(utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
+ if err := httpPostRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -276,7 +276,7 @@ func testHTTPExportEvent(t *testing.T) {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpPostRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := httpPostRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -298,7 +298,7 @@ func testHTTPExportEvent(t *testing.T) {
if len(httpJsonHdr["Origin"]) == 0 || httpJsonHdr["Origin"][0] != expHeader {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpPostRpc.Call(utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
+ if err := httpPostRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
diff --git a/ees/kafka_it_test.go b/ees/kafka_it_test.go
index 0bb9b4846..4472ac43d 100644
--- a/ees/kafka_it_test.go
+++ b/ees/kafka_it_test.go
@@ -23,12 +23,12 @@ package ees
import (
"net"
- "net/rpc"
"path"
"strconv"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
kafka "github.com/segmentio/kafka-go"
@@ -41,7 +41,7 @@ var (
kafkaConfigDir string
kafkaCfgPath string
kafkaCfg *config.CGRConfig
- kafkaRpc *rpc.Client
+ kafkaRpc *birpc.Client
sTestsKafka = []func(t *testing.T){
testCreateDirectory,
@@ -91,7 +91,7 @@ func testKafkaStartEngine(t *testing.T) {
func testKafkaRPCConn(t *testing.T) {
var err error
- kafkaRpc, err = newRPCClient(kafkaCfg.ListenCfg())
+ kafkaRpc, err = engine.NewRPCClient(kafkaCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -154,7 +154,7 @@ func testKafkaExportEvent(t *testing.T) {
}
var reply map[string]map[string]any
- if err := kafkaRpc.Call(utils.EeSv1ProcessEvent, event, &reply); err != nil {
+ if err := kafkaRpc.Call(context.Background(), utils.EeSv1ProcessEvent, event, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
diff --git a/ees/lib_test.go b/ees/lib_test.go
index 336974885..32407db46 100644
--- a/ees/lib_test.go
+++ b/ees/lib_test.go
@@ -19,16 +19,12 @@ along with this program. If not, see
package ees
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
"os"
"testing"
"github.com/cgrates/cgrates/engine"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -38,17 +34,6 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding would be used for rpc communication")
)
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
var exportPath = []string{"/tmp/testCSV", "/tmp/testComposedCSV", "/tmp/testFWV", "/tmp/testCSVMasked",
"/tmp/testCSVfromVirt", "/tmp/testCSVExpTemp"}
diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go
index 150c28dbd..72cc07e1b 100644
--- a/ees/posterjsonmap_it_test.go
+++ b/ees/posterjsonmap_it_test.go
@@ -24,11 +24,11 @@ package ees
import (
"encoding/json"
"net/http"
- "net/rpc"
"path"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -40,7 +40,7 @@ var (
httpJSONMapConfigDir string
httpJSONMapCfgPath string
httpJSONMapCfg *config.CGRConfig
- httpJSONMapRpc *rpc.Client
+ httpJSONMapRpc *birpc.Client
httpJsonMap map[string]string
httpJsonHdr http.Header
@@ -89,7 +89,7 @@ func testHTTPJsonMapStartEngine(t *testing.T) {
func testHTTPJsonMapRPCConn(t *testing.T) {
var err error
- httpJSONMapRpc, err = newRPCClient(httpJSONMapCfg.ListenCfg())
+ httpJSONMapRpc, err = engine.NewRPCClient(httpJSONMapCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -226,7 +226,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := httpJSONMapRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := httpJSONMapRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -249,7 +249,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
if len(httpJsonHdr["Origin"]) == 0 || httpJsonHdr["Origin"][0] != expHeader {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpJSONMapRpc.Call(utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
+ if err := httpJSONMapRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventData, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -272,7 +272,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
if len(httpJsonHdr["Origin"]) == 0 || httpJsonHdr["Origin"][0] != expHeader {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpJSONMapRpc.Call(utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
+ if err := httpJSONMapRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMS, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -296,7 +296,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) {
t.Errorf("Expected %+v, received: %+v", expHeader, httpJsonHdr["Origin"])
}
- if err := httpJSONMapRpc.Call(utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
+ if err := httpJSONMapRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventSMSNoFields, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
diff --git a/ees/s3_it_test.go b/ees/s3_it_test.go
index 3e58b07f7..08ae161f1 100644
--- a/ees/s3_it_test.go
+++ b/ees/s3_it_test.go
@@ -94,7 +94,7 @@ package ees
// func testS3RPCConn(t *testing.T) {
// var err error
-// s3RPC, err = newRPCClient(s3Cfg.ListenCfg())
+// s3RPC, err = engine.NewRPCClient(s3Cfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go
index 5a45d47c3..6b77bf324 100644
--- a/ees/sql_it_test.go
+++ b/ees/sql_it_test.go
@@ -23,11 +23,11 @@ package ees
import (
"fmt"
- "net/rpc"
"path"
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -43,7 +43,7 @@ var (
sqlEeConfigDir string
sqlEeCfgPath string
sqlEeCfg *config.CGRConfig
- sqlEeRpc *rpc.Client
+ sqlEeRpc *birpc.Client
db2 *gorm.DB
dbConnString = "cgrates:CGRateS.org@tcp(127.0.0.1:3306)/%s?charset=utf8&loc=Local&parseTime=true&sql_mode='ALLOW_INVALID_DATES'"
@@ -140,7 +140,7 @@ func testSqlEeStartEngine(t *testing.T) {
func testSqlEeRPCConn(t *testing.T) {
var err error
- sqlEeRpc, err = newRPCClient(sqlEeCfg.ListenCfg())
+ sqlEeRpc, err = engine.NewRPCClient(sqlEeCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -178,7 +178,7 @@ func testSqlEeExportEventFull(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := sqlEeRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := sqlEeRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -216,7 +216,7 @@ func testSqlEeExportEventPartial(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := sqlEeRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := sqlEeRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
diff --git a/ees/sqs_it_test.go b/ees/sqs_it_test.go
index 6fa863195..78d036621 100644
--- a/ees/sqs_it_test.go
+++ b/ees/sqs_it_test.go
@@ -20,7 +20,6 @@ package ees
import (
"flag"
- "net/rpc"
"path"
"testing"
"time"
@@ -30,6 +29,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sqs"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -43,7 +43,7 @@ var (
sqsConfDir string
sqsCfgPath string
sqsCfg *config.CGRConfig
- sqsRPC *rpc.Client
+ sqsRPC *birpc.Client
sTestsSQS = []func(t *testing.T){
testSQSLoadConfig,
@@ -97,7 +97,7 @@ func testSQSStartEngine(t *testing.T) {
func testSQSRPCConn(t *testing.T) {
var err error
- sqsRPC, err = newRPCClient(sqsCfg.ListenCfg())
+ sqsRPC, err = engine.NewRPCClient(sqsCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -132,7 +132,7 @@ func testSQSExportEvent(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := sqsRPC.Call(utils.EeSv1ProcessEvent, ev, &reply); err != nil {
+ if err := sqsRPC.Call(context.Background(), utils.EeSv1ProcessEvent, ev, &reply); err != nil {
t.Error(err)
}
diff --git a/ees/virtual_ee_it_test.go b/ees/virtual_ee_it_test.go
index 0b0d8a90d..770f801b2 100644
--- a/ees/virtual_ee_it_test.go
+++ b/ees/virtual_ee_it_test.go
@@ -22,7 +22,6 @@ along with this program. If not, see
package ees
import (
- "net/rpc"
"os"
"path"
"path/filepath"
@@ -30,6 +29,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -41,7 +41,7 @@ var (
virtConfigDir string
virtCfgPath string
virtCfg *config.CGRConfig
- virtRpc *rpc.Client
+ virtRpc *birpc.Client
sTestsVirt = []func(t *testing.T){
testCreateDirectory,
@@ -89,7 +89,7 @@ func testVirtStartEngine(t *testing.T) {
func testVirtRPCConn(t *testing.T) {
var err error
- virtRpc, err = newRPCClient(virtCfg.ListenCfg())
+ virtRpc, err = engine.NewRPCClient(virtCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
@@ -125,7 +125,7 @@ func testVirtExportSupplierEvent(t *testing.T) {
}
var reply map[string]utils.MapStorage
- if err := virtRpc.Call(utils.EeSv1ProcessEvent, supplierEvent, &reply); err != nil {
+ if err := virtRpc.Call(context.Background(), utils.EeSv1ProcessEvent, supplierEvent, &reply); err != nil {
t.Error(err)
}
time.Sleep(10 * time.Millisecond)
@@ -160,7 +160,7 @@ func testVirtExportEvents(t *testing.T) {
},
}
var reply map[string]utils.MapStorage
- if err := virtRpc.Call(utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
+ if err := virtRpc.Call(context.Background(), utils.EeSv1ProcessEvent, eventVoice, &reply); err != nil {
t.Error(err)
}
time.Sleep(time.Second)
diff --git a/engine/lib_test.go b/engine/lib_test.go
index 30dbcdfd9..e7f2365d1 100644
--- a/engine/lib_test.go
+++ b/engine/lib_test.go
@@ -19,12 +19,8 @@ along with this program. If not, see
package engine
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -34,14 +30,3 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/engine/libtest.go b/engine/libtest.go
index e35cc479d..161d806d8 100644
--- a/engine/libtest.go
+++ b/engine/libtest.go
@@ -20,9 +20,9 @@ package engine
import (
"bytes"
+ "errors"
"fmt"
"io"
- "net/rpc/jsonrpc"
"os"
"os/exec"
"path"
@@ -30,7 +30,9 @@ import (
"strings"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
+ "github.com/cgrates/birpc/jsonrpc"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
@@ -304,3 +306,14 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats {
utils.CacheReplicationHosts: {},
}
}
+
+func NewRPCClient(cfg *config.ListenCfg, encoding string) (*birpc.Client, error) {
+ switch encoding {
+ case utils.MetaJSON:
+ return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
+ case utils.MetaGOB:
+ return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
+ default:
+ return nil, errors.New("invalid encoding")
+ }
+}
diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go
index a4e98f69d..c064101b2 100644
--- a/engine/z_actions2_it_test.go
+++ b/engine/z_actions2_it_test.go
@@ -92,7 +92,7 @@ func testActionsStartEngine(t *testing.T) {
// Connect rpc client to rater
func testActionsRPCConn(t *testing.T) {
var err error
- actsRPC, err = newRPCClient(actsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ actsRPC, err = NewRPCClient(actsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go
index 48bd304bc..c5eb7392e 100644
--- a/engine/z_actions_it_test.go
+++ b/engine/z_actions_it_test.go
@@ -93,7 +93,7 @@ func testActionsitStartEngine(t *testing.T) {
func testActionsitRpcConn(t *testing.T) {
var err error
// time.Sleep(500 * time.Millisecond)
- actsLclRpc, err = newRPCClient(actsLclCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ actsLclRpc, err = NewRPCClient(actsLclCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/ers/ers_reload_it_test.go b/ers/ers_reload_it_test.go
index 199afe127..47695a2ba 100644
--- a/ers/ers_reload_it_test.go
+++ b/ers/ers_reload_it_test.go
@@ -21,11 +21,11 @@ along with this program. If not, see
package ers
import (
- "net/rpc"
"os"
"path"
"testing"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -35,7 +35,7 @@ import (
var (
reloadCfgPath string
reloadCfg *config.CGRConfig
- reloadRPC *rpc.Client
+ reloadRPC *birpc.Client
ersReloadConfigDIR string
reloadTests = []func(t *testing.T){
@@ -106,7 +106,7 @@ func testReloadITStartEngine(t *testing.T) {
// Connect rpc client to rater
func testReloadITRpcConn(t *testing.T) {
var err error
- reloadRPC, err = newRPCClient(reloadCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ reloadRPC, err = engine.NewRPCClient(reloadCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
@@ -122,7 +122,7 @@ func testReloadVerifyDisabledReaders(t *testing.T) {
func testReloadReloadConfigFromPath(t *testing.T) {
var reply string
- if err := reloadRPC.Call(utils.ConfigSv1ReloadConfig, &config.ReloadArgs{
+ if err := reloadRPC.Call(context.Background(), utils.ConfigSv1ReloadConfig, &config.ReloadArgs{
// Path: path.Join(*dataDir, "conf", "samples", "ers_reload", "first_reload"),
Section: config.ERsJSON,
}, &reply); err != nil {
@@ -134,7 +134,7 @@ func testReloadReloadConfigFromPath(t *testing.T) {
func testReloadVerifyFirstReload(t *testing.T) {
var reply map[string]any
- if err := reloadRPC.Call(utils.ConfigSv1GetConfig, &config.SectionWithAPIOpts{
+ if err := reloadRPC.Call(context.Background(), utils.ConfigSv1GetConfig, &config.SectionWithAPIOpts{
Sections: []string{config.ERsJSON},
}, &reply); err != nil {
t.Error(err)
diff --git a/ers/filecsv_it_test.go b/ers/filecsv_it_test.go
index 0e34a52f5..dede15700 100644
--- a/ers/filecsv_it_test.go
+++ b/ers/filecsv_it_test.go
@@ -125,7 +125,7 @@ package ers
// // Connect rpc client to rater
// func testCsvITRpcConn(t *testing.T) {
// var err error
-// csvRPC, err = newRPCClient(csvCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// csvRPC, err = engine.NewRPCClient(csvCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal("Could not connect to rater: ", err.Error())
// }
diff --git a/ers/filefwv_it_test.go b/ers/filefwv_it_test.go
index dfaef8166..0f173c3c8 100644
--- a/ers/filefwv_it_test.go
+++ b/ers/filefwv_it_test.go
@@ -104,7 +104,7 @@ func testFWVITStartEngine(t *testing.T) {
// Connect rpc client to rater
func testFWVITRpcConn(t *testing.T) {
var err error
- fwvRPC, err = newRPCClient(fwvCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ fwvRPC, err = engine.NewRPCClient(fwvCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/ers/filejson_it_test.go b/ers/filejson_it_test.go
index 91fe96b45..9ebad539c 100644
--- a/ers/filejson_it_test.go
+++ b/ers/filejson_it_test.go
@@ -113,7 +113,7 @@ var (
func testJSONRpcConn(t *testing.T) {
var err error
- jsonRPC, err = newRPCClient(jsonCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ jsonRPC, err = engine.NewRPCClient(jsonCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/ers/filexml_it_test.go b/ers/filexml_it_test.go
index 0e23a77a1..527ad4365 100644
--- a/ers/filexml_it_test.go
+++ b/ers/filexml_it_test.go
@@ -23,7 +23,6 @@ package ers
import (
"bytes"
"fmt"
- "net/rpc"
"os"
"path"
"reflect"
@@ -31,6 +30,7 @@ import (
"testing"
"time"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
@@ -42,7 +42,7 @@ var (
xmlCfgPath string
xmlCfgDIR string
xmlCfg *config.CGRConfig
- xmlRPC *rpc.Client
+ xmlRPC *birpc.Client
xmlTests = []func(t *testing.T){
testCreateDirs,
@@ -130,7 +130,7 @@ func testXMLITStartEngine(t *testing.T) {
// Connect rpc client to rater
func testXMLITRpcConn(t *testing.T) {
var err error
- xmlRPC, err = newRPCClient(xmlCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ xmlRPC, err = engine.NewRPCClient(xmlCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go
index 699885d3f..4b7d4a003 100644
--- a/ers/flatstore_it_test.go
+++ b/ers/flatstore_it_test.go
@@ -142,7 +142,7 @@ package ers
// // Connect rpc client to rater
// func testFlatstoreITRpcConn(t *testing.T) {
// var err error
-// flatstoreRPC, err = newRPCClient(flatstoreCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// flatstoreRPC, err = engine.NewRPCClient(flatstoreCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal("Could not connect to rater: ", err.Error())
// }
diff --git a/ers/lib_test.go b/ers/lib_test.go
index ceaaeedc1..988dea236 100644
--- a/ers/lib_test.go
+++ b/ers/lib_test.go
@@ -19,14 +19,10 @@ along with this program. If not, see
package ers
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
"os"
"testing"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -37,17 +33,6 @@ var (
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
func testCreateDirs(t *testing.T) {
for _, dir := range []string{"/tmp/ers/in", "/tmp/ers/out",
"/tmp/ers2/in", "/tmp/ers2/out",
diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go
index 48d5b5fc4..72353354c 100644
--- a/ers/partial_csv_it_test.go
+++ b/ers/partial_csv_it_test.go
@@ -111,7 +111,7 @@ package ers
// // Connect rpc client to rater
// func testPartITRpcConn(t *testing.T) {
// var err error
-// partRPC, err = newRPCClient(partCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// partRPC, err = engine.NewRPCClient(partCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal("Could not connect to rater: ", err.Error())
// }
diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go
index 2252e3d26..4051a2773 100644
--- a/general_tests/a1_it_test.go
+++ b/general_tests/a1_it_test.go
@@ -96,7 +96,7 @@ package general_tests
// func testA1itRPCConn(t *testing.T) {
// var err error
-// a1rpc, err = newRPCClient(a1Cfg.ListenCfg())
+// a1rpc, err = engine.NewRPCClient(a1Cfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/accountactions_it_test.go b/general_tests/accountactions_it_test.go
index 87b6fd979..2fafba9fb 100644
--- a/general_tests/accountactions_it_test.go
+++ b/general_tests/accountactions_it_test.go
@@ -104,7 +104,7 @@ func testAccActionsStartEngine(t *testing.T) {
// Connect rpc client to rater
func testAccActionsRPCConn(t *testing.T) {
var err error
- accSRPC, err = newRPCClient(accPrfCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ accSRPC, err = engine.NewRPCClient(accPrfCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go
index 8682b901e..5f8ed517a 100644
--- a/general_tests/accounts_it_test.go
+++ b/general_tests/accounts_it_test.go
@@ -106,7 +106,7 @@ func testV1AccStartEngine(t *testing.T) {
func testV1AccRpcConn(t *testing.T) {
var err error
- accRpc, err = newRPCClient(accCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ accRpc, err = engine.NewRPCClient(accCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/all_cfg_rld_it_test.go b/general_tests/all_cfg_rld_it_test.go
index 72d2e045a..711d1387b 100644
--- a/general_tests/all_cfg_rld_it_test.go
+++ b/general_tests/all_cfg_rld_it_test.go
@@ -90,7 +90,7 @@ func testStartEngine(t *testing.T) {
func testRPCConn(t *testing.T) {
var err error
- testRPC, err = newRPCClient(testCfg.ListenCfg())
+ testRPC, err = engine.NewRPCClient(testCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/all_sections_cfg_rld_it_test.go b/general_tests/all_sections_cfg_rld_it_test.go
index af5dbaf0b..888cd9b7a 100644
--- a/general_tests/all_sections_cfg_rld_it_test.go
+++ b/general_tests/all_sections_cfg_rld_it_test.go
@@ -126,7 +126,7 @@ func testSectStartEngine(t *testing.T) {
func testSectRPCConn(t *testing.T) {
var err error
- testSectRPC, err = newRPCClient(testSectCfg.ListenCfg())
+ testSectRPC, err = engine.NewRPCClient(testSectCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/analyzers_doc_it_test.go b/general_tests/analyzers_doc_it_test.go
index 009f18d84..508556074 100644
--- a/general_tests/analyzers_doc_it_test.go
+++ b/general_tests/analyzers_doc_it_test.go
@@ -112,7 +112,7 @@ func testAnzDocInitCfg(t *testing.T) {
func testAnzDocRPCConn(t *testing.T) {
var err error
- anzDocRPC, err = newRPCClient(anzDocCfg.ListenCfg())
+ anzDocRPC, err = engine.NewRPCClient(anzDocCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/attributes_filters_index_it_test.go b/general_tests/attributes_filters_index_it_test.go
index c72bad9a8..cc604c9a5 100644
--- a/general_tests/attributes_filters_index_it_test.go
+++ b/general_tests/attributes_filters_index_it_test.go
@@ -100,7 +100,7 @@ func testAttributeFltrSStartEngine(t *testing.T) {
// Connect rpc client to rater
func testAttributeFltrSRPCConn(t *testing.T) {
var err error
- attrFltrRPC, err = newRPCClient(attrFltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ attrFltrRPC, err = engine.NewRPCClient(attrFltrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go
index 8f039ff7f..da3f6f54d 100644
--- a/general_tests/attributes_it_test.go
+++ b/general_tests/attributes_it_test.go
@@ -108,7 +108,7 @@ func testAttributeSStartEngine(t *testing.T) {
// Connect rpc client to rater
func testAttributeSRPCConn(t *testing.T) {
var err error
- attrRPC, err = newRPCClient(attrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ attrRPC, err = engine.NewRPCClient(attrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go
index 919663de7..1d4f1b692 100644
--- a/general_tests/broadcast_client_it_test.go
+++ b/general_tests/broadcast_client_it_test.go
@@ -105,11 +105,11 @@ package general_tests
// func testbrodcastItRPCConn(t *testing.T) {
// var err error
-// brodcastRPC, err = newRPCClient(brodcastCfg.ListenCfg())
+// brodcastRPC, err = engine.NewRPCClient(brodcastCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
-// brodcastInternalRPC, err = newRPCClient(brodcastInternalCfg.ListenCfg())
+// brodcastInternalRPC, err = engine.NewRPCClient(brodcastInternalCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go
index 0b9da556a..abe4d8ff7 100644
--- a/general_tests/cacherpl_it_test.go
+++ b/general_tests/cacherpl_it_test.go
@@ -181,15 +181,15 @@ func testCacheRplStartEngine(t *testing.T) {
func testCacheRplRpcConn(t *testing.T) {
var err error
- dspEngine1RPC, err = newRPCClient(dspEngine1Cfg.ListenCfg())
+ dspEngine1RPC, err = engine.NewRPCClient(dspEngine1Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
- dspEngine2RPC, err = newRPCClient(dspEngine2Cfg.ListenCfg())
+ dspEngine2RPC, err = engine.NewRPCClient(dspEngine2Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
- engine1RPC, err = newRPCClient(engine1Cfg.ListenCfg())
+ engine1RPC, err = engine.NewRPCClient(engine1Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go
index fbfce3ccd..bc762ca25 100644
--- a/general_tests/cdrs_it_test.go
+++ b/general_tests/cdrs_it_test.go
@@ -117,7 +117,7 @@ func testCDRsStartEngine(t *testing.T) {
// Connect rpc client to rater
func testCDRsRpcConn(t *testing.T) {
- cdrsRpc, err = newRPCClient(cdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ cdrsRpc, err = engine.NewRPCClient(cdrsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go
index cba93b98b..965291e55 100644
--- a/general_tests/cdrs_post_failover_it_test.go
+++ b/general_tests/cdrs_post_failover_it_test.go
@@ -106,7 +106,7 @@ func testCDRsPostFailoverStartEngine(t *testing.T) {
// Connect rpc client to rater
func testCDRsPostFailoverRpcConn(t *testing.T) {
- cdrsPostFailRpc, err = newRPCClient(cdrsPostFailCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ cdrsPostFailRpc, err = engine.NewRPCClient(cdrsPostFailCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go
index 890033fcf..8a64a90b5 100644
--- a/general_tests/cdrs_processevent_it_test.go
+++ b/general_tests/cdrs_processevent_it_test.go
@@ -105,7 +105,7 @@ package general_tests
// func testV1CDRsRpcConn(t *testing.T) {
// var err error
-// pecdrsRpc, err = newRPCClient(pecdrsCfg.ListenCfg())
+// pecdrsRpc, err = engine.NewRPCClient(pecdrsCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal("Could not connect to rater: ", err.Error())
// }
diff --git a/general_tests/cgrloader_it_test.go b/general_tests/cgrloader_it_test.go
index c22791200..a343d7c1a 100644
--- a/general_tests/cgrloader_it_test.go
+++ b/general_tests/cgrloader_it_test.go
@@ -100,7 +100,7 @@ func testCGRLoaderStartEngine(t *testing.T) {
func testCGRLoaderRpcConn(t *testing.T) {
var err error
- cgrloaderRPC, err = newRPCClient(cgrloaderCfg.ListenCfg())
+ cgrloaderRPC, err = engine.NewRPCClient(cgrloaderCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/config_reload_rates_it_test.go b/general_tests/config_reload_rates_it_test.go
index 72b40f45c..74e632633 100644
--- a/general_tests/config_reload_rates_it_test.go
+++ b/general_tests/config_reload_rates_it_test.go
@@ -122,7 +122,7 @@ func testRateConfigSReloadRates(t *testing.T) {
func testRateRPCConn(t *testing.T) {
var err error
- testRateRPC, err = newRPCClient(testRateCfg.ListenCfg())
+ testRateRPC, err = engine.NewRPCClient(testRateCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go
index 1b4178b40..49fdbc6d1 100644
--- a/general_tests/data_it_test.go
+++ b/general_tests/data_it_test.go
@@ -100,7 +100,7 @@ package general_tests
// func testV1DataRpcConn(t *testing.T) {
// var err error
-// dataRpc, err = newRPCClient(dataCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// dataRpc, err = engine.NewRPCClient(dataCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal("Could not connect to rater: ", err.Error())
// }
diff --git a/general_tests/dataconverter_it_test.go b/general_tests/dataconverter_it_test.go
index 7393c0bde..852a92dc1 100644
--- a/general_tests/dataconverter_it_test.go
+++ b/general_tests/dataconverter_it_test.go
@@ -105,7 +105,7 @@ func testDCStartEngine(t *testing.T) {
}
func testDCRpcConn(t *testing.T) {
- dcRPC, err = newRPCClient(dcCfg.ListenCfg())
+ dcRPC, err = engine.NewRPCClient(dcCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/dispatcher_opts_it_test.go b/general_tests/dispatcher_opts_it_test.go
index 841a1f995..54d9c3916 100644
--- a/general_tests/dispatcher_opts_it_test.go
+++ b/general_tests/dispatcher_opts_it_test.go
@@ -129,7 +129,7 @@ func testDispatcherOptsAdminStartEngine(t *testing.T) {
func testDispatcherOptsAdminRPCConn(t *testing.T) {
var err error
- adminsRPC, err = newRPCClient(adminsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ adminsRPC, err = engine.NewRPCClient(adminsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
@@ -154,7 +154,7 @@ func testDispatcherOptsDSPStartEngine(t *testing.T) {
func testDispatcherOptsDSPRPCConn(t *testing.T) {
var err error
- dspOptsRPC, err = newRPCClient(dspOptsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ dspOptsRPC, err = engine.NewRPCClient(dspOptsCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go
index 85e44f00c..bd158233e 100644
--- a/general_tests/doubleremove_it_test.go
+++ b/general_tests/doubleremove_it_test.go
@@ -107,7 +107,7 @@ func testdoubleRemoveStartEngine(t *testing.T) {
func testdoubleRemoveRpcConn(t *testing.T) {
var err error
- doubleRemoveRPC, err = newRPCClient(doubleRemove.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ doubleRemoveRPC, err = engine.NewRPCClient(doubleRemove.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/ees_blocker_it_test.go b/general_tests/ees_blocker_it_test.go
index 7812cfea4..2edba568a 100644
--- a/general_tests/ees_blocker_it_test.go
+++ b/general_tests/ees_blocker_it_test.go
@@ -115,7 +115,7 @@ func testEEsBlockerStartEngine(t *testing.T) {
func testEEsBlockerRpcConn(t *testing.T) {
var err error
- eesBlockerRPC, err = newRPCClient(eesBlockerCfg.ListenCfg())
+ eesBlockerRPC, err = engine.NewRPCClient(eesBlockerCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go
index 52eae048f..82f6acd39 100644
--- a/general_tests/export_it_test.go
+++ b/general_tests/export_it_test.go
@@ -135,7 +135,7 @@ func testExpStartEngineChangedLoderDirectory(t *testing.T) {
func testExpRPCConn(t *testing.T) {
var err error
- expRpc, err = newRPCClient(expCfg.ListenCfg())
+ expRpc, err = engine.NewRPCClient(expCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/filter_update_it_test.go b/general_tests/filter_update_it_test.go
index 3fdd300fc..d7f2246d8 100644
--- a/general_tests/filter_update_it_test.go
+++ b/general_tests/filter_update_it_test.go
@@ -133,10 +133,10 @@ func testFilterUpdateStartEngine(t *testing.T) {
// Connect rpc client to rater
func testFilterUpdateRpcConn(t *testing.T) {
var err error
- if fltrUpdateRPC1, err = newRPCClient(fltrUpdateCfg1.ListenCfg()); err != nil {
+ if fltrUpdateRPC1, err = engine.NewRPCClient(fltrUpdateCfg1.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if fltrUpdateRPC2, err = newRPCClient(fltrUpdateCfg2.ListenCfg()); err != nil {
+ if fltrUpdateRPC2, err = engine.NewRPCClient(fltrUpdateCfg2.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go
index 2a15d370d..7210b5654 100644
--- a/general_tests/filtered_replication_it_test.go
+++ b/general_tests/filtered_replication_it_test.go
@@ -140,13 +140,13 @@ func testFltrRplRPCConn(t *testing.T) {
tmp := *encoding
// run only under *gob encoding
*encoding = utils.MetaGOB
- if fltrRplInternalRPC, err = newRPCClient(fltrRplInternalCfg.ListenCfg()); err != nil {
+ if fltrRplInternalRPC, err = engine.NewRPCClient(fltrRplInternalCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if fltrRplEngine1RPC, err = newRPCClient(fltrRplEngine1Cfg.ListenCfg()); err != nil {
+ if fltrRplEngine1RPC, err = engine.NewRPCClient(fltrRplEngine1Cfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if fltrRplEngine2RPC, err = newRPCClient(fltrRplEngine2Cfg.ListenCfg()); err != nil {
+ if fltrRplEngine2RPC, err = engine.NewRPCClient(fltrRplEngine2Cfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
*encoding = tmp
diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go
index 76ceaf15d..1b03b93c5 100644
--- a/general_tests/filters_it_test.go
+++ b/general_tests/filters_it_test.go
@@ -114,7 +114,7 @@ func testV1FltrStartEngine(t *testing.T) {
func testV1FltrRpcConn(t *testing.T) {
var err error
- fltrRpc, err = newRPCClient(fltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ fltrRpc, err = engine.NewRPCClient(fltrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/fltr_sep_it_test.go b/general_tests/fltr_sep_it_test.go
index 1e4c443a1..b8732d371 100644
--- a/general_tests/fltr_sep_it_test.go
+++ b/general_tests/fltr_sep_it_test.go
@@ -107,7 +107,7 @@ func testFltrSepStartEngine(t *testing.T) {
func testFltrSepRpcConn(t *testing.T) {
var err error
- fltrSepRPC, err = newRPCClient(fltrSepCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ fltrSepRPC, err = engine.NewRPCClient(fltrSepCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go
index 3e7a55b5b..c03b9b90d 100644
--- a/general_tests/gocs_it_test.go
+++ b/general_tests/gocs_it_test.go
@@ -123,13 +123,13 @@ func testGOCSStartEngine(t *testing.T) {
// Connect rpc client to rater
func testGOCSApierRpcConn(t *testing.T) {
- if auRPC, err = newRPCClient(auCfg.ListenCfg()); err != nil {
+ if auRPC, err = engine.NewRPCClient(auCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if usRPC, err = newRPCClient(usCfg.ListenCfg()); err != nil {
+ if usRPC, err = engine.NewRPCClient(usCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if dspRPC, err = newRPCClient(dspCfg.ListenCfg()); err != nil {
+ if dspRPC, err = engine.NewRPCClient(dspCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/kafka_ssl_it_test.go b/general_tests/kafka_ssl_it_test.go
index 238f2c99d..cd3862db6 100644
--- a/general_tests/kafka_ssl_it_test.go
+++ b/general_tests/kafka_ssl_it_test.go
@@ -112,7 +112,7 @@ func testKafkaSSLStartEngine(t *testing.T) {
func testKafkaSSLRPCConn(t *testing.T) {
var err error
- kafkaSSLRpc, err = newRPCClient(kafkaSSLCfg.ListenCfg())
+ kafkaSSLRpc, err = engine.NewRPCClient(kafkaSSLCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/ld_process_match_ac_it_test.go b/general_tests/ld_process_match_ac_it_test.go
index 4157bc9c9..3bb331c35 100644
--- a/general_tests/ld_process_match_ac_it_test.go
+++ b/general_tests/ld_process_match_ac_it_test.go
@@ -124,7 +124,7 @@ func testLdPrMatchAcStartEngine(t *testing.T) {
func testLdPrMatchAcRPCConn(t *testing.T) {
var err error
- testLdPrMatchAcRPC, err = newRPCClient(testLdPrMatchAcCfg.ListenCfg())
+ testLdPrMatchAcRPC, err = engine.NewRPCClient(testLdPrMatchAcCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/ld_process_match_rt_it_test.go b/general_tests/ld_process_match_rt_it_test.go
index 56ae854e9..455e09265 100644
--- a/general_tests/ld_process_match_rt_it_test.go
+++ b/general_tests/ld_process_match_rt_it_test.go
@@ -124,7 +124,7 @@ func testLdPrMatchRtStartEngine(t *testing.T) {
func testLdPrMatchRtRPCConn(t *testing.T) {
var err error
- testLdPrMatchRtRPC, err = newRPCClient(testLdPrMatchRtCfg.ListenCfg())
+ testLdPrMatchRtRPC, err = engine.NewRPCClient(testLdPrMatchRtCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/libtest.go b/general_tests/libtest.go
index acad0d51d..68dbabed1 100644
--- a/general_tests/libtest.go
+++ b/general_tests/libtest.go
@@ -18,12 +18,8 @@ along with this program. If not, see
package general_tests
import (
- "errors"
"flag"
- "github.com/cgrates/birpc"
- "github.com/cgrates/birpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -34,14 +30,3 @@ var (
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
err error
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/general_tests/loaders_internal_indexes_it_test.go b/general_tests/loaders_internal_indexes_it_test.go
index 959485ce6..5ea58516d 100644
--- a/general_tests/loaders_internal_indexes_it_test.go
+++ b/general_tests/loaders_internal_indexes_it_test.go
@@ -103,10 +103,10 @@ func testLoadersIDBIdxItStartEngines(t *testing.T) {
func testLoadersIDBIdxItRPCConn(t *testing.T) {
var err error
- if loadersIDBIdxRPC, err = newRPCClient(loadersIDBIdxCfg.ListenCfg()); err != nil {
+ if loadersIDBIdxRPC, err = engine.NewRPCClient(loadersIDBIdxCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if loadersIDBIdxRPCInternal, err = newRPCClient(loadersIDBIdxCfgInternal.ListenCfg()); err != nil {
+ if loadersIDBIdxRPCInternal, err = engine.NewRPCClient(loadersIDBIdxCfgInternal.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/loadersold2new_it_test.go b/general_tests/loadersold2new_it_test.go
index a9b5a0262..a280f46ea 100644
--- a/general_tests/loadersold2new_it_test.go
+++ b/general_tests/loadersold2new_it_test.go
@@ -116,7 +116,7 @@ func testLdro2nRtStartEngine(t *testing.T) {
func testLdro2nRtRPCConn(t *testing.T) {
var err error
- if testLdro2nRtRPC, err = newRPCClient(testLdro2nRtCfg.ListenCfg()); err != nil {
+ if testLdro2nRtRPC, err = engine.NewRPCClient(testLdro2nRtCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go
index c13ab9361..a6f90301f 100644
--- a/general_tests/poster_it_test.go
+++ b/general_tests/poster_it_test.go
@@ -105,7 +105,7 @@ package general_tests
// func testPosterITRpcConn(t *testing.T) {
// var err error
-// pstrRpc, err = newRPCClient(pstrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// pstrRpc, err = engine.NewRPCClient(pstrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go
index b5c82967b..1ff4c186f 100644
--- a/general_tests/redis_cluster_it_test.go
+++ b/general_tests/redis_cluster_it_test.go
@@ -182,7 +182,7 @@ func testClsrStartEngine(t *testing.T) {
func testClsrRPCConection(t *testing.T) {
var err error
- clsrRPC, err = newRPCClient(clsrConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ clsrRPC, err = engine.NewRPCClient(clsrConfig.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/redis_tls_it_test.go b/general_tests/redis_tls_it_test.go
index 183e33815..e607a4a1c 100644
--- a/general_tests/redis_tls_it_test.go
+++ b/general_tests/redis_tls_it_test.go
@@ -99,7 +99,7 @@ func testRedisTLSStartEngine(t *testing.T) {
func testRedisTLSRPCCon(t *testing.T) {
var err error
- redisTLSRPC, err = newRPCClient(redisTLSCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ redisTLSRPC, err = engine.NewRPCClient(redisTLSCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go
index 3d58d94f9..816472737 100644
--- a/general_tests/resourcesv1_it_test.go
+++ b/general_tests/resourcesv1_it_test.go
@@ -94,7 +94,7 @@ func testV1RsStartEngine(t *testing.T) {
func testV1RsRpcConn(t *testing.T) {
var err error
- rlsV1Rpc, err = newRPCClient(rlsV1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ rlsV1Rpc, err = engine.NewRPCClient(rlsV1Cfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go
index 6990e08e0..9cd082c82 100644
--- a/general_tests/route_it_test.go
+++ b/general_tests/route_it_test.go
@@ -108,7 +108,7 @@ func testV1SplSStartEngine(t *testing.T) {
func testV1SplSRpcConn(t *testing.T) {
var err error
- splSv1Rpc, err = newRPCClient(splSv1Cfg.ListenCfg())
+ splSv1Rpc, err = engine.NewRPCClient(splSv1Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go
index 634400cb5..63912ca29 100644
--- a/general_tests/rpccaching_it_test.go
+++ b/general_tests/rpccaching_it_test.go
@@ -114,7 +114,7 @@ func testRPCMethodsStartEngine(t *testing.T) {
func testRPCMethodsRpcConn(t *testing.T) {
var err error
- rpcRpc, err = newRPCClient(rpcCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ rpcRpc, err = engine.NewRPCClient(rpcCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/rpcexp_opts_it_test.go b/general_tests/rpcexp_opts_it_test.go
index 6d8e53dcf..cddd3eb5b 100644
--- a/general_tests/rpcexp_opts_it_test.go
+++ b/general_tests/rpcexp_opts_it_test.go
@@ -119,11 +119,11 @@ func testRPCExpStartEngine(t *testing.T) {
func testRPCExpRPCConn(t *testing.T) {
var err error
- ng1RPC, err = newRPCClient(ng1Cfg.ListenCfg())
+ ng1RPC, err = engine.NewRPCClient(ng1Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
- ng2RPC, err = newRPCClient(ng2Cfg.ListenCfg())
+ ng2RPC, err = engine.NewRPCClient(ng2Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go
index 0d7382b09..431f5ab60 100644
--- a/general_tests/sentinel_it_test.go
+++ b/general_tests/sentinel_it_test.go
@@ -133,7 +133,7 @@ package general_tests
// func testRedisSentinelRPCCon(t *testing.T) {
// var err error
-// sentinelRPC, err = newRPCClient(sentinelConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+// sentinelRPC, err = engine.NewRPCClient(sentinelConfig.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go
index 7ec121af5..91899a431 100644
--- a/general_tests/session2_it_test.go
+++ b/general_tests/session2_it_test.go
@@ -100,7 +100,7 @@ func testSes2ItStartEngine(t *testing.T) {
func testSes2ItRPCConn(t *testing.T) {
var err error
- ses2RPC, err = newRPCClient(ses2Cfg.ListenCfg())
+ ses2RPC, err = engine.NewRPCClient(ses2Cfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go
index 8564d8c3b..af2298620 100644
--- a/general_tests/session3_it_test.go
+++ b/general_tests/session3_it_test.go
@@ -102,7 +102,7 @@ package general_tests
// func testSes3ItRPCConn(t *testing.T) {
// var err error
-// ses3RPC, err = newRPCClient(ses3Cfg.ListenCfg())
+// ses3RPC, err = engine.NewRPCClient(ses3Cfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go
index 9e59c04bc..02f59a9f9 100644
--- a/general_tests/session4_it_test.go
+++ b/general_tests/session4_it_test.go
@@ -92,7 +92,7 @@ package general_tests
// func testSes4ItRPCConn(t *testing.T) {
// var err error
-// ses4RPC, err = newRPCClient(ses4Cfg.ListenCfg())
+// ses4RPC, err = engine.NewRPCClient(ses4Cfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/session_graceful_shutdown_it_test.go b/general_tests/session_graceful_shutdown_it_test.go
index 4fc7678c8..c65b77d9e 100644
--- a/general_tests/session_graceful_shutdown_it_test.go
+++ b/general_tests/session_graceful_shutdown_it_test.go
@@ -118,10 +118,10 @@ func testSessionSRplcStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSessionSRplcApierRpcConn(t *testing.T) {
- if smgRplcRPC1, err = newRPCClient(smgRplCfg1.ListenCfg()); err != nil {
+ if smgRplcRPC1, err = engine.NewRPCClient(smgRplCfg1.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
- if smgRplcRPC2, err = newRPCClient(smgRplCfg2.ListenCfg()); err != nil {
+ if smgRplcRPC2, err = engine.NewRPCClient(smgRplCfg2.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go
index 74913136a..35150fd3d 100644
--- a/general_tests/session_it_test.go
+++ b/general_tests/session_it_test.go
@@ -93,7 +93,7 @@ package general_tests
// func testSesItRPCConn(t *testing.T) {
// var err error
-// sesRPC, err = newRPCClient(sesCfg.ListenCfg())
+// sesRPC, err = engine.NewRPCClient(sesCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/session_nonereq_it_test.go b/general_tests/session_nonereq_it_test.go
index da2f97dc5..634456c52 100644
--- a/general_tests/session_nonereq_it_test.go
+++ b/general_tests/session_nonereq_it_test.go
@@ -92,7 +92,7 @@ package general_tests
// func testSesNoneReqTypeItRPCConn(t *testing.T) {
// var err error
-// sesNoneReqTypeRPC, err = newRPCClient(sesNoneReqTypeCfg.ListenCfg())
+// sesNoneReqTypeRPC, err = engine.NewRPCClient(sesNoneReqTypeCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go
index eb545a825..83b775caf 100644
--- a/general_tests/session_replications_automaticdebit_it_test.go
+++ b/general_tests/session_replications_automaticdebit_it_test.go
@@ -141,10 +141,10 @@ package general_tests
// // Connect rpc client to rater
// func testSessionSRplApierRpcConn(t *testing.T) {
-// if smgRplcMstrRPC, err = newRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil {
+// if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
-// if smgRplcSlvRPC, err = newRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil {
+// if smgRplcSlvRPC, err = engine.NewRPCClient(smgRplcSlaveCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
// }
diff --git a/general_tests/session_rpl_prepaid_it_test.go b/general_tests/session_rpl_prepaid_it_test.go
index 00fc0b671..1f48b98c5 100644
--- a/general_tests/session_rpl_prepaid_it_test.go
+++ b/general_tests/session_rpl_prepaid_it_test.go
@@ -90,7 +90,7 @@ func testSeSRplPrepaidStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSeSRplPrepaidApierRpcConn(t *testing.T) {
- if sesRplPrePaidRPC, err = newRPCClient(sesRplPrePaidCfg.ListenCfg()); err != nil {
+ if sesRplPrePaidRPC, err = engine.NewRPCClient(sesRplPrePaidCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/general_tests/sessionpause_it_test.go b/general_tests/sessionpause_it_test.go
index c1678d607..32c33a79a 100644
--- a/general_tests/sessionpause_it_test.go
+++ b/general_tests/sessionpause_it_test.go
@@ -97,7 +97,7 @@ package general_tests
// func testSesPauseItRPCConn(t *testing.T) {
// var err error
-// sesPauseRPC, err = newRPCClient(sesPauseCfg.ListenCfg())
+// sesPauseRPC, err = engine.NewRPCClient(sesPauseCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go
index d7ef581f5..b1a95ecae 100644
--- a/general_tests/sessionrefund_it_test.go
+++ b/general_tests/sessionrefund_it_test.go
@@ -96,7 +96,7 @@ package general_tests
// func testSrItRPCConn(t *testing.T) {
// var err error
-// srrpc, err = newRPCClient(srCfg.ListenCfg())
+// srrpc, err = engine.NewRPCClient(srCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/sessionroutes_it_test.go b/general_tests/sessionroutes_it_test.go
index 3b187d573..d58253058 100644
--- a/general_tests/sessionroutes_it_test.go
+++ b/general_tests/sessionroutes_it_test.go
@@ -95,7 +95,7 @@ package general_tests
// func testSesRoutesItRPCConn(t *testing.T) {
// var err error
-// sesRoutesRPC, err = newRPCClient(sesRoutesCfg.ListenCfg())
+// sesRoutesRPC, err = engine.NewRPCClient(sesRoutesCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/sessions_concur_test.go b/general_tests/sessions_concur_test.go
index 5f7391da0..1878b3639 100644
--- a/general_tests/sessions_concur_test.go
+++ b/general_tests/sessions_concur_test.go
@@ -98,7 +98,7 @@ func testSCncrStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSCncrRPCConn(t *testing.T) {
var err error
- sCncrRPC, err = newRPCClient(sCncrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ sCncrRPC, err = engine.NewRPCClient(sCncrCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/general_tests/sessions_tnt_change_cdr_it_test.go b/general_tests/sessions_tnt_change_cdr_it_test.go
index 9db4bab03..ae90c8536 100644
--- a/general_tests/sessions_tnt_change_cdr_it_test.go
+++ b/general_tests/sessions_tnt_change_cdr_it_test.go
@@ -92,7 +92,7 @@ package general_tests
// func testSesTntChngCdrsRPCConn(t *testing.T) {
// var err error
-// sesTntChngRPC, err = newRPCClient(sesTntChngCfg.ListenCfg())
+// sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/sessions_tnt_change_it_test.go b/general_tests/sessions_tnt_change_it_test.go
index 92c3a36bf..c85c46d34 100644
--- a/general_tests/sessions_tnt_change_it_test.go
+++ b/general_tests/sessions_tnt_change_it_test.go
@@ -92,7 +92,7 @@ package general_tests
// func testSesTntChngRPCConn(t *testing.T) {
// var err error
-// sesTntChngRPC, err = newRPCClient(sesTntChngCfg.ListenCfg())
+// sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg(), *encoding)
// if err != nil {
// t.Fatal(err)
// }
diff --git a/general_tests/shared_client_lock_it_test.go b/general_tests/shared_client_lock_it_test.go
index 8b4a14746..c16f415db 100644
--- a/general_tests/shared_client_lock_it_test.go
+++ b/general_tests/shared_client_lock_it_test.go
@@ -143,7 +143,7 @@ func testSharedClientLockStartEngine(t *testing.T) {
func testSharedClientLockRpcConn(t *testing.T) {
var err error
- clntLockRPC, err = newRPCClient(clntLockCfg.ListenCfg())
+ clntLockRPC, err = engine.NewRPCClient(clntLockCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to engine: ", err.Error())
}
diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go
index e72168020..06ed03d37 100644
--- a/general_tests/suretax_it_test.go
+++ b/general_tests/suretax_it_test.go
@@ -91,7 +91,7 @@ func testSTIStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSTIRpcConn(t *testing.T) {
var err error
- stiRpc, err = newRPCClient(stiCfg) // We connect over JSON so we can also troubleshoot if needed
+ stiRpc, err = engine.NewRPCClient(stiCfg, *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go
index 0b1fdf376..3b711056e 100644
--- a/general_tests/tp_it_test.go
+++ b/general_tests/tp_it_test.go
@@ -108,7 +108,7 @@ func testTpStartEngine(t *testing.T) {
// Connect rpc client to rater
func testTpRpcConn(t *testing.T) {
var err error
- tpRPC, err = newRPCClient(tpCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ tpRPC, err = engine.NewRPCClient(tpCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go
index 2f0c4493d..7c59859c3 100644
--- a/general_tests/tut_smgeneric_it_test.go
+++ b/general_tests/tut_smgeneric_it_test.go
@@ -102,7 +102,7 @@ func testTutSMGStartEngine(t *testing.T) {
// Connect rpc client to rater
func testTutSMGRpcConn(t *testing.T) {
var err error
- tutSMGRpc, err = newRPCClient(tutSMGCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ tutSMGRpc, err = engine.NewRPCClient(tutSMGCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}
diff --git a/general_tests/twoengines_it_test.go b/general_tests/twoengines_it_test.go
index d95caec35..3820de68c 100644
--- a/general_tests/twoengines_it_test.go
+++ b/general_tests/twoengines_it_test.go
@@ -96,11 +96,11 @@ func testTwoEnginesStartEngine(t *testing.T) {
func testTwoEnginesRPC(t *testing.T) {
var err error
- engineOneRpc, err = newRPCClient(engineOneCfg.ListenCfg())
+ engineOneRpc, err = engine.NewRPCClient(engineOneCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
- engineTwoRpc, err = newRPCClient(engineTwoCfg.ListenCfg())
+ engineTwoRpc, err = engine.NewRPCClient(engineTwoCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go
index dc116e16e..362efd4da 100644
--- a/loaders/loader_it_test.go
+++ b/loaders/loader_it_test.go
@@ -21,7 +21,6 @@ along with this program. If not, see
package loaders
import (
- "errors"
"flag"
"os"
"path"
@@ -32,7 +31,6 @@ import (
"github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
- "github.com/cgrates/birpc/jsonrpc"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
@@ -107,17 +105,6 @@ var loaderPaths = []string{"/tmp/In", "/tmp/Out", "/tmp/LoaderIn", "/tmp/Subpath
"/tmp/SubpathLoaderWithMove", "/tmp/SubpathOut", "/tmp/templateLoaderIn", "/tmp/templateLoaderOut",
"/tmp/customSepLoaderIn", "/tmp/customSepLoaderOut"}
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
-
// Test start here
func TestLoaderIT(t *testing.T) {
switch *dbType {
@@ -176,7 +163,7 @@ func testLoaderStartEngine(t *testing.T) {
// Connect rpc client to rater
func testLoaderRPCConn(t *testing.T) {
var err error
- if loaderRPC, err = newRPCClient(loaderCfg.ListenCfg()); err != nil {
+ if loaderRPC, err = engine.NewRPCClient(loaderCfg.ListenCfg(), *encoding); err != nil {
t.Fatal(err)
}
}
diff --git a/migrator/lib_test.go b/migrator/lib_test.go
index c36e9090b..bb418e5da 100644
--- a/migrator/lib_test.go
+++ b/migrator/lib_test.go
@@ -19,12 +19,8 @@ along with this program. If not, see
package migrator
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -35,14 +31,3 @@ var (
inPath string
outPath string
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/registrarc/lib_test.go b/registrarc/lib_test.go
index c99378ff5..ad95e6acf 100644
--- a/registrarc/lib_test.go
+++ b/registrarc/lib_test.go
@@ -18,12 +18,8 @@ along with this program. If not, see
package registrarc
import (
- "errors"
"flag"
- "github.com/cgrates/birpc"
- "github.com/cgrates/birpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -33,14 +29,3 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding would be used for rpc communication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return birpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/registrarc/registrarc_it_test.go b/registrarc/registrarc_it_test.go
index 043170bf0..a6f15952f 100644
--- a/registrarc/registrarc_it_test.go
+++ b/registrarc/registrarc_it_test.go
@@ -107,7 +107,7 @@ func testDsphStartEngine(t *testing.T) {
if dspCmd, err = engine.StopStartEngine(dspCfgPath, *waitRater); err != nil {
t.Fatal(err)
}
- dspRPC, err = newRPCClient(dspCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ dspRPC, err = engine.NewRPCClient(dspCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/registrarc/registrarcrpc_it_test.go b/registrarc/registrarcrpc_it_test.go
index 4c300462b..f20f5ebdd 100644
--- a/registrarc/registrarcrpc_it_test.go
+++ b/registrarc/registrarcrpc_it_test.go
@@ -104,7 +104,7 @@ func testRPCStartEngine(t *testing.T) {
if _, err = engine.StopStartEngine(rpcsCfgPath, *waitRater); err != nil {
t.Fatal(err)
}
- rpcsRPC, err = newRPCClient(rpcsCfg.ListenCfg())
+ rpcsRPC, err = engine.NewRPCClient(rpcsCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal("Could not connect to rater: ", err.Error())
}
diff --git a/sessions/lib_test.go b/sessions/lib_test.go
index ea157fa8c..2e36f4121 100644
--- a/sessions/lib_test.go
+++ b/sessions/lib_test.go
@@ -19,12 +19,8 @@ along with this program. If not, see
package sessions
import (
- "errors"
"flag"
- "net/rpc"
- "net/rpc/jsonrpc"
- "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -34,14 +30,3 @@ var (
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
-
-func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
- switch *encoding {
- case utils.MetaJSON:
- return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
- case utils.MetaGOB:
- return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
- default:
- return nil, errors.New("UNSUPPORTED_RPC")
- }
-}
diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go
index 62c3d9d4d..898067f5d 100644
--- a/sessions/sessions_birpc_it_test.go
+++ b/sessions/sessions_birpc_it_test.go
@@ -115,7 +115,7 @@ package sessions
// clntHandlers); err != nil {
// t.Fatal(err)
// }
-// if sessionsRPC, err = newRPCClient(sessionsBiRPCCfg.ListenCfg()); err != nil { // Connect also simple RPC so we can check accounts and such
+// if sessionsRPC, err = engine.NewRPCClient(sessionsBiRPCCfg.ListenCfg(), *encoding); err != nil { // Connect also simple RPC so we can check accounts and such
// t.Fatal(err)
// }
// dummyClnt.Close() // close so we don't get EOF error when disconnecting server
diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go
index 048d02878..657084ad2 100644
--- a/sessions/sessions_data_it_test.go
+++ b/sessions/sessions_data_it_test.go
@@ -21,10 +21,10 @@ along with this program. If not, see
package sessions
import (
- "net/rpc"
"path"
"testing"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -35,7 +35,7 @@ var (
dataCfgPath string
dataCfgDIR string
dataCfg *config.CGRConfig
- sDataRPC *rpc.Client
+ sDataRPC *birpc.Client
SessionsDataTests = []func(t *testing.T){
testSessionsDataInitCfg,
@@ -106,7 +106,7 @@ func testSessionsDataStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSessionsDataApierRpcConn(t *testing.T) {
var err error
- sDataRPC, err = newRPCClient(dataCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ sDataRPC, err = engine.NewRPCClient(dataCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go
index dd1ceb116..e0d5e6d01 100644
--- a/sessions/sessions_it_test.go
+++ b/sessions/sessions_it_test.go
@@ -21,10 +21,10 @@ along with this program. If not, see
package sessions
import (
- "net/rpc"
"path"
"testing"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -35,7 +35,7 @@ var (
sItCfgPath string
sItCfgDIR string
sItCfg *config.CGRConfig
- sItRPC *rpc.Client
+ sItRPC *birpc.Client
sessionsITtests = []func(t *testing.T){
testSessionsItInitCfg,
@@ -102,7 +102,7 @@ func testSessionsItStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSessionsItApierRpcConn(t *testing.T) {
var err error
- sItRPC, err = newRPCClient(sItCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ sItRPC, err = engine.NewRPCClient(sItCfg.ListenCfg(), *encoding)
if err != nil {
t.Fatal(err)
}
diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go
index 2ae5c6e3c..56e5a4199 100644
--- a/sessions/sessions_rpl_it_test.go
+++ b/sessions/sessions_rpl_it_test.go
@@ -113,10 +113,10 @@ package sessions
// // Connect rpc client to rater
// func testSessionSRplApierRpcConn(t *testing.T) {
// var err error
-// if smgRplcMstrRPC, err = newRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil {
+// if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
-// if smgRplcSlvRPC, err = newRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil {
+// if smgRplcSlvRPC, err = engine.NewRPCClient(smgRplcSlaveCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
// }
@@ -349,7 +349,7 @@ package sessions
// if err != nil { // Kill both and start Master
// t.Fatal(err)
// }
-// if smgRplcMstrRPC, err = newRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil {
+// if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
// // create two sessions
@@ -426,7 +426,7 @@ package sessions
// if _, err := engine.StartEngine(smgRplcSlaveCfgPath, *waitRater); err != nil {
// t.Fatal(err)
// }
-// if smgRplcSlvRPC, err = newRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil {
+// if smgRplcSlvRPC, err = engine.NewRPCClient(smgRplcSlaveCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
// // when we start slave after master we expect to don't have sessions
@@ -465,7 +465,7 @@ package sessions
// if _, err := engine.StartEngine(smgRplcMasterCfgPath, *waitRater); err != nil {
// t.Fatal(err)
// }
-// if smgRplcMstrRPC, err = newRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil {
+// if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg(), *encoding); err != nil {
// t.Fatal(err)
// }
// // Master should have no session active/passive
diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go
index e533a3c1f..fc276884a 100644
--- a/sessions/sessions_voice_it_test.go
+++ b/sessions/sessions_voice_it_test.go
@@ -21,10 +21,10 @@ along with this program. If not, see
package sessions
import (
- "net/rpc"
"path"
"testing"
+ "github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
@@ -35,7 +35,7 @@ var (
voiceCfgPath string
voiceCfgDIR string
voiceCfg *config.CGRConfig
- sessionsRPC *rpc.Client
+ sessionsRPC *birpc.Client
sessionsVoiceTests = []func(t *testing.T){
testSessionsVoiceInitCfg,
@@ -108,7 +108,7 @@ func testSessionsVoiceStartEngine(t *testing.T) {
// Connect rpc client to rater
func testSessionsVoiceApierRpcConn(t *testing.T) {
var err error
- sessionsRPC, err = newRPCClient(voiceCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed
+ sessionsRPC, err = engine.NewRPCClient(voiceCfg.ListenCfg(), *encoding) // We connect over JSON so we can also troubleshoot if needed
if err != nil {
t.Fatal(err)
}