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

Merge branch 'hapool' of https://github.com/cgrates/cgrates into hapool

Browse Source
This commit is contained in:
DanB
2015-12-21 19:27:52 +01:00
parent 2f66d81ff9 7a72d1d42d
commit 37802efe2d
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
agents/hapool_it_test.go
View File

@@ -20,6 +20,7 @@ package agents
import (
"net/rpc/jsonrpc"
"os/exec"
"path"
"testing"
"time"
@@ -30,6 +31,8 @@ import (
"github.com/fiorix/go-diameter/diam/dict"
)
var cgrRater1Cmd, cgrSmg1Cmd *exec.Cmd
func TestHaPoolInitCfg(t *testing.T) {
if !*testIntegration {
return
@@ -71,26 +74,26 @@ func TestHaPoolStartEngine(t *testing.T) {
return
}
engine.KillEngine(*waitRater) // just to make sure
var err error
cgrRater1 := path.Join(*dataDir, "conf", "samples", "hapool", "cgrrater1")
if _, err := engine.StartEngine(cgrRater1, *waitRater); err != nil {
if cgrRater1Cmd, err = engine.StartEngine(cgrRater1, *waitRater); err != nil {
t.Fatal("cgrRater1: ", err)
}
cgrRater2 := path.Join(*dataDir, "conf", "samples", "hapool", "cgrrater2")
if _, err := engine.StartEngine(cgrRater2, *waitRater); err != nil {
if _, err = engine.StartEngine(cgrRater2, *waitRater); err != nil {
t.Fatal("cgrRater2: ", err)
}
cgrSmg1 := path.Join(*dataDir, "conf", "samples", "hapool", "cgrsmg1")
if _, err := engine.StartEngine(cgrSmg1, *waitRater); err != nil {
if cgrSmg1Cmd, err = engine.StartEngine(cgrSmg1, *waitRater); err != nil {
t.Fatal("cgrSmg1: ", err)
}
cgrSmg2 := path.Join(*dataDir, "conf", "samples", "hapool", "cgrsmg2")
if _, err := engine.StartEngine(cgrSmg2, *waitRater); err != nil {
if _, err = engine.StartEngine(cgrSmg2, *waitRater); err != nil {
t.Fatal("cgrSmg2: ", err)
}
cgrDa := path.Join(*dataDir, "conf", "samples", "hapool", "dagent")
if _, err := engine.StartEngine(cgrDa, *waitRater); err != nil {
t.Fatal("cgrSmg2: ", err)
if _, err = engine.StartEngine(cgrDa, *waitRater); err != nil {
t.Fatal("cgrDa: ", err)
}
}

7
data/conf/samples/hapool/cgrsmg1/cgr.json
View File

@@ -1,4 +1,10 @@
{
"listen": {
"rpc_json": "127.0.0.1:2018", // RPC JSON listening address
"rpc_gob": "127.0.0.1:2019", // RPC GOB listening address
"http": "127.0.0.1:2083", // HTTP listening address
},
"cdrs": {
"enabled": true, // start the CDR Server service: <true|false>
"rater": "127.0.0.1:2014", // address where to reach the Rater for cost calculation, empty to disable functionality: <""|internal|x.y.z.y:1234>
@@ -7,7 +13,6 @@
"sm_generic": {
"enabled": true,
"listen_bijson": "127.0.0.1:3014",
"rater_conns": [
{"server": "127.0.0.1:2014"},
{"server": "127.0.0.1:2016"}

7
data/conf/samples/hapool/cgrsmg2/cgr.json
View File

@@ -1,4 +1,10 @@
{
"listen": {
"rpc_json": "127.0.0.1:2020", // RPC JSON listening address
"rpc_gob": "127.0.0.1:2021", // RPC GOB listening address
"http": "127.0.0.1:2084", // HTTP listening address
},
"cdrs": {
"enabled": true, // start the CDR Server service: <true|false>
"rater": "127.0.0.1:2014", // address where to reach the Rater for cost calculation, empty to disable functionality: <""|internal|x.y.z.y:1234>
@@ -7,7 +13,6 @@
"sm_generic": {
"enabled": true,
"listen_bijson": "127.0.0.1:3015",
"rater_conns": [
{"server": "127.0.0.1:2014"},
{"server": "127.0.0.1:2016"}

6
data/conf/samples/hapool/dagent/cgr.json
View File

@@ -3,8 +3,8 @@
"enabled": true,
"listen": "127.0.0.1:3868",
"sm_generic_conns": [
{"server": "127.0.0.1:3014"},
{"server": "127.0.0.1:3015"},
{"server": "127.0.0.1:3018"},
{"server": "127.0.0.1:3020"},
],
},
}
}