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

Removed err from function's signature of loadFromJsonCfg RPCCOnns

Browse Source
This commit is contained in:
porosnicuadrian
2020-11-10 11:36:44 +02:00
committed by Dan Christian Bogos
parent 0db1532fd7
commit e92bfcfd4c
3 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/rpcconn.go
View File

@@ -42,7 +42,7 @@ type RPCConn struct {
Conns []*RemoteHost
}
func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) (err error) {
func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) {
if jsnCfg == nil {
return
}
@@ -56,7 +56,7 @@ func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) (err error) {
rC.Conns = make([]*RemoteHost, len(*jsnCfg.Conns))
for idx, jsnHaCfg := range *jsnCfg.Conns {
rC.Conns[idx] = NewDfltRemoteHost()
rC.Conns[idx].loadFromJsonCfg(jsnHaCfg)
rC.Conns[idx].loadFromJsonCfg(jsnHaCfg) //To review if the function signature changes
}
}
return
@@ -95,9 +95,9 @@ type RemoteHost struct {
TLS bool
}
func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) error {
func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) {
if jsnCfg == nil {
return nil
return
}
if jsnCfg.Address != nil {
self.Address = *jsnCfg.Address
@@ -111,7 +111,7 @@ func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) error {
if jsnCfg.Tls != nil {
self.TLS = *jsnCfg.Tls
}
return nil
return
}
func (rh *RemoteHost) AsMapInterface() map[string]interface{} {

44
config/rpcconn_test.go
View File

@@ -66,19 +66,49 @@ func TestRPCConnsloadFromJsonCfgCase1(t *testing.T) {
}
if jsonCfg, err := NewDefaultCGRConfig(); err != nil {
t.Error(err)
} else if err = jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(cfgJSON); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(jsonCfg.rpcConns, expected) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
} else {
jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(cfgJSON)
if !reflect.DeepEqual(jsonCfg.rpcConns, expected) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
}
}
}
func TestRPCConnsloadFromJsonCfgCase2(t *testing.T) {
if jsonCfg, err := NewDefaultCGRConfig(); err != nil {
t.Error(err)
} else if err = jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(nil); err != nil {
expected := RpcConns{
utils.MetaInternal: {
Strategy: utils.MetaFirst,
PoolSize: 0,
Conns: []*RemoteHost{
{
Address: utils.MetaInternal,
Transport: utils.EmptyString,
Synchronous: false,
TLS: false,
},
},
},
utils.MetaLocalHost: {
Strategy: utils.MetaFirst,
PoolSize: 0,
Conns: []*RemoteHost{
{
Address: "127.0.0.1:2012",
Transport: "*json",
Synchronous: false,
TLS: false,
},
},
},
}
jsonCfg, err := NewDefaultCGRConfig()
if err != nil {
t.Error(err)
}
jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(nil)
if !reflect.DeepEqual(expected, jsonCfg.rpcConns) {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
}
}
func TestRPCConnsAsMapInterface(t *testing.T) {

15
config/sessionscfg_test.go
View File

@@ -634,14 +634,12 @@ func TestFsConnCfgloadFromJsonCfg(t *testing.T) {
func TestRemoteHostloadFromJsonCfg(t *testing.T) {
var hpoolcfg, expected RemoteHost
if err := hpoolcfg.loadFromJsonCfg(nil); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(hpoolcfg, expected) {
hpoolcfg.loadFromJsonCfg(nil)
if !reflect.DeepEqual(hpoolcfg, expected) {
t.Errorf("Expected: %+v ,received: %+v", expected, hpoolcfg)
}
if err := hpoolcfg.loadFromJsonCfg(new(RemoteHostJson)); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(hpoolcfg, expected) {
hpoolcfg.loadFromJsonCfg(new(RemoteHostJson))
if !reflect.DeepEqual(hpoolcfg, expected) {
t.Errorf("Expected: %+v ,received: %+v", expected, hpoolcfg)
}
json := &RemoteHostJson{
@@ -652,9 +650,8 @@ func TestRemoteHostloadFromJsonCfg(t *testing.T) {
Address: "127.0.0.1:8448",
Synchronous: true,
}
if err = hpoolcfg.loadFromJsonCfg(json); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(expected, hpoolcfg) {
hpoolcfg.loadFromJsonCfg(json)
if !reflect.DeepEqual(expected, hpoolcfg) {
t.Errorf("Expected: %+v , received: %+v", utils.ToJSON(expected), utils.ToJSON(hpoolcfg))
}
}