From 7a72d1d42d2d610887376bc9a9ab73fc865eab20 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 21 Dec 2015 20:23:56 +0200 Subject: [PATCH] updated listening ports --- agents/hapool_it_test.go | 17 ++++++++++------- data/conf/samples/hapool/cgrsmg1/cgr.json | 7 ++++++- data/conf/samples/hapool/cgrsmg2/cgr.json | 7 ++++++- data/conf/samples/hapool/dagent/cgr.json | 6 +++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/agents/hapool_it_test.go b/agents/hapool_it_test.go index 08d788528..6ca260be6 100644 --- a/agents/hapool_it_test.go +++ b/agents/hapool_it_test.go @@ -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) } } diff --git a/data/conf/samples/hapool/cgrsmg1/cgr.json b/data/conf/samples/hapool/cgrsmg1/cgr.json index a6d002f38..71d9e4cb0 100644 --- a/data/conf/samples/hapool/cgrsmg1/cgr.json +++ b/data/conf/samples/hapool/cgrsmg1/cgr.json @@ -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: "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"} diff --git a/data/conf/samples/hapool/cgrsmg2/cgr.json b/data/conf/samples/hapool/cgrsmg2/cgr.json index 400a47eda..e0d98bc7f 100644 --- a/data/conf/samples/hapool/cgrsmg2/cgr.json +++ b/data/conf/samples/hapool/cgrsmg2/cgr.json @@ -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: "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"} diff --git a/data/conf/samples/hapool/dagent/cgr.json b/data/conf/samples/hapool/dagent/cgr.json index 6a3bd6388..164f9bfec 100644 --- a/data/conf/samples/hapool/dagent/cgr.json +++ b/data/conf/samples/hapool/dagent/cgr.json @@ -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"}, ], }, -} \ No newline at end of file +}