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

Updated filterscfg AsMapInterface method

Browse Source
This commit is contained in:
porosnicuadrian
2020-09-21 14:53:47 +03:00
committed by Dan Christian Bogos
parent 645fba0a1e
commit 1ff60ca1b5
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/filterscfg.go
View File

@@ -66,10 +66,11 @@ func (fSCfg *FilterSCfg) loadFromJsonCfg(jsnCfg *FilterSJsonCfg) (err error) {
return
}
func (fSCfg *FilterSCfg) AsMapInterface() map[string]interface{} {
return map[string]interface{}{
func (fSCfg *FilterSCfg) AsMapInterface() (initialMP map[string]interface{}) {
initialMP = map[string]interface{}{
utils.StatSConnsCfg: fSCfg.StatSConns,
utils.ResourceSConnsCfg: fSCfg.ResourceSConns,
utils.ApierSConnsCfg: fSCfg.ApierSConns,
}
return
}

36
config/filterscfg_test.go
View File

@@ -56,27 +56,37 @@ func TestFilterSCfgloadFromJsonCfg(t *testing.T) {
}
func TestFilterSCfgAsMapInterface(t *testing.T) {
var fscfg FilterSCfg
cfgJSONStr := `{
"filters": {
"stats_conns": ["*localhost"],
"resources_conns": [],
"apiers_conns": [],
"resources_conns": ["*conn1", "*conn2"],
},
}`
var emptySlice []string
eMap := map[string]interface{}{
"stats_conns": []string{"*localhost"},
"resources_conns": emptySlice,
"apiers_conns": emptySlice,
utils.StatSConnsCfg: []string{utils.MetaLocalHost},
utils.ResourceSConnsCfg: []string{"*conn1", "*conn2"},
utils.ApierSConnsCfg: []string{},
}
if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
t.Error(err)
} else if jsnFsCfg, err := jsnCfg.FilterSJsonCfg(); err != nil {
} else if rcv := cgrCfg.filterSCfg.AsMapInterface(); !reflect.DeepEqual(rcv, eMap) {
t.Errorf("Expected %+v, received %+v", eMap, rcv)
}
}
func TestFilterSCfgAsMapInterface2(t *testing.T) {
cfgJSONStr := `{
"filters": {}
}`
eMap := map[string]interface{}{
utils.StatSConnsCfg: []string{},
utils.ResourceSConnsCfg: []string{},
utils.ApierSConnsCfg: []string{},
}
if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
t.Error(err)
} else if err = fscfg.loadFromJsonCfg(jsnFsCfg); err != nil {
t.Error(err)
} else if rcv := fscfg.AsMapInterface(); reflect.DeepEqual(eMap, rcv) {
t.Errorf("Expected: %+v ,\n recived: %+v", utils.ToJSON(eMap), utils.ToJSON(rcv))
} else if rcv := cgrCfg.filterSCfg.AsMapInterface(); !reflect.DeepEqual(rcv, eMap) {
t.Errorf("Expected %+v, received %+v", eMap, rcv)
}
}