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

Updated listencfg AsMapInterface Method

Browse Source
This commit is contained in:
porosnicuadrian
2020-09-22 10:29:39 +03:00
committed by Dan Christian Bogos
parent 47ffcf2caa
commit 426abac7f2
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/listencfg.go
View File

@@ -56,8 +56,8 @@ func (lstcfg *ListenCfg) loadFromJsonCfg(jsnListenCfg *ListenJsonCfg) (err error
return nil
}
func (lstcfg *ListenCfg) AsMapInterface() map[string]interface{} {
return map[string]interface{}{
func (lstcfg *ListenCfg) AsMapInterface() (initialMP map[string]interface{}) {
initialMP = map[string]interface{}{
utils.RPCJSONListenCfg: lstcfg.RPCJSONListen,
utils.RPCGOBListenCfg: lstcfg.RPCGOBListen,
utils.HTTPListenCfg: lstcfg.HTTPListen,
@@ -65,4 +65,5 @@ func (lstcfg *ListenCfg) AsMapInterface() map[string]interface{} {
utils.RPCGOBTLSListenCfg: lstcfg.RPCGOBTLSListen,
utils.HTTPTLSListenCfg: lstcfg.HTTPTLSListen,
}
return
}

46
config/listencfg_test.go
View File

@@ -20,6 +20,8 @@ package config
import (
"reflect"
"testing"
"github.com/cgrates/cgrates/utils"
)
func TestListenCfgloadFromJsonCfg(t *testing.T) {
@@ -62,3 +64,47 @@ func TestListenCfgloadFromJsonCfg(t *testing.T) {
t.Errorf("Expected: %+v , recived: %+v", expected, lstcfg)
}
}
func TestListenCfgAsMapInterface(t *testing.T) {
cfgJSONStr := `{
"listen": {},
}`
eMap := map[string]interface{}{
utils.RPCJSONListenCfg: "127.0.0.1:2012",
utils.RPCGOBListenCfg: "127.0.0.1:2013",
utils.HttpCfg: "127.0.0.1:2080",
utils.RPCJSONTLSListenCfg: "127.0.0.1:2022",
utils.RPCGOBTLSListenCfg: "127.0.0.1:2023",
utils.HTTPTLSListenCfg: "127.0.0.1:2280",
}
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
t.Error(err)
} else if rcv := cgrCfg.listenCfg.AsMapInterface(); !reflect.DeepEqual(eMap, rcv) {
t.Errorf("Expected %+v, received %+v", eMap, rcv)
}
}
func TestListenCfgAsMapInterface1(t *testing.T) {
cfgJSONStr := `{
"listen": {
"rpc_json": "127.0.0.1:2010",
"rpc_gob": "127.0.0.1:2018",
"rpc_json_tls" : "127.0.0.1:2025",
"rpc_gob_tls": "127.0.0.1:2001",
"http_tls": "127.0.0.1:2288",
}
}`
eMap := map[string]interface{}{
utils.RPCJSONListenCfg: "127.0.0.1:2010",
utils.RPCGOBListenCfg: "127.0.0.1:2018",
utils.HttpCfg: "127.0.0.1:2080",
utils.RPCJSONTLSListenCfg: "127.0.0.1:2025",
utils.RPCGOBTLSListenCfg: "127.0.0.1:2001",
utils.HTTPTLSListenCfg: "127.0.0.1:2288",
}
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
t.Error(err)
} else if rcv := cgrCfg.listenCfg.AsMapInterface(); !reflect.DeepEqual(eMap, rcv) {
t.Errorf("Expected %+v, received %+v", eMap, rcv)
}
}