From 426abac7f2b82acfc67bc1bfe20e8b5da3135b4d Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Tue, 22 Sep 2020 10:29:39 +0300 Subject: [PATCH] Updated listencfg AsMapInterface Method --- config/listencfg.go | 5 +++-- config/listencfg_test.go | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/config/listencfg.go b/config/listencfg.go index 49c2b668e..537746e8e 100644 --- a/config/listencfg.go +++ b/config/listencfg.go @@ -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 } diff --git a/config/listencfg_test.go b/config/listencfg_test.go index 6a721bd39..49aae00bb 100644 --- a/config/listencfg_test.go +++ b/config/listencfg_test.go @@ -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) + } +}