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

Updated AsMapInterface method for FsAgent/Added test

Browse Source
This commit is contained in:
adragusin
2020-04-28 18:03:17 +03:00
committed by Dan Christian Bogos
parent 7c2555e2c6
commit 3eec5034f4
2 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@@ -1470,7 +1470,7 @@ func (cfg *CGRConfig) AsMapInterface(separator string) map[string]interface{} {
utils.SchedulerCfg: cfg.schedulerCfg.AsMapInterface(),
utils.CdrsCfg: cfg.cdrsCfg.AsMapInterface(),
utils.SessionSCfg: cfg.sessionSCfg.AsMapInterface(),
utils.FsAgentCfg: cfg.fsAgentCfg.AsMapInterface(),
utils.FsAgentCfg: cfg.fsAgentCfg.AsMapInterface(separator),
utils.KamAgentCfg: cfg.kamAgentCfg.AsMapInterface(),
utils.AsteriskAgentCfg: cfg.asteriskAgentCfg.AsMapInterface(),
utils.DiameterAgentCfg: cfg.diameterAgentCfg.AsMapInterface(separator),

52
config/sessionscfg.go
View File

@@ -20,6 +20,7 @@ package config
import (
"fmt"
"strings"
"time"
"github.com/cgrates/cgrates/utils"
@@ -390,23 +391,46 @@ func (fscfg *FsAgentCfg) loadFromJsonCfg(jsnCfg *FreeswitchAgentJsonCfg) error {
return nil
}
func (fscfg *FsAgentCfg) AsMapInterface() map[string]interface{} {
var eventSocketConns []map[string]interface{}
// eventSocketConns := make(map[string]interface{}, len(fscfg.EventSocketConns))
for _, item := range fscfg.EventSocketConns {
eventSocketConns = append(eventSocketConns, item.AsMapInterface())
func (fscfg *FsAgentCfg) AsMapInterface(separator string) map[string]interface{} {
sessionSConns := make([]string, len(fscfg.SessionSConns))
for i, item := range fscfg.SessionSConns {
buf := utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)
if item == buf {
sessionSConns[i] = strings.ReplaceAll(item, utils.CONCATENATED_KEY_SEP+utils.MetaSessionS, utils.EmptyString)
} else {
sessionSConns[i] = item
}
}
var extraFields string
if fscfg.ExtraFields != nil {
values := make([]string, len(fscfg.ExtraFields))
for i, item := range fscfg.ExtraFields {
values[i] = item.Rules
}
extraFields = strings.Join(values, separator)
}
var maxWaitConnection string = ""
if fscfg.MaxWaitConnection != 0 {
maxWaitConnection = fscfg.MaxWaitConnection.String()
}
eventSocketConns := make([]map[string]interface{}, len(fscfg.EventSocketConns))
for key, item := range fscfg.EventSocketConns {
eventSocketConns[key] = item.AsMapInterface()
}
return map[string]interface{}{
utils.EnabledCfg: fscfg.Enabled,
utils.SessionSConnsCfg: fscfg.SessionSConns,
utils.SessionSConnsCfg: sessionSConns,
utils.SubscribeParkCfg: fscfg.SubscribePark,
utils.CreateCdrCfg: fscfg.CreateCdr,
utils.ExtraFieldsCfg: fscfg.ExtraFields,
utils.ExtraFieldsCfg: extraFields,
utils.LowBalanceAnnFileCfg: fscfg.LowBalanceAnnFile,
utils.EmptyBalanceContextCfg: fscfg.EmptyBalanceContext,
utils.EmptyBalanceAnnFileCfg: fscfg.EmptyBalanceAnnFile,
utils.MaxWaitConnectionCfg: fscfg.MaxWaitConnection,
utils.MaxWaitConnectionCfg: maxWaitConnection,
utils.EventSocketConnsCfg: eventSocketConns,
}
}
@@ -518,9 +542,19 @@ func (aCfg *AsteriskAgentCfg) AsMapInterface() map[string]interface{} {
conns[i] = item.AsMapInterface()
}
sessionSConns := make([]string, len(aCfg.SessionSConns))
for i, item := range aCfg.SessionSConns {
buf := utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)
if item == buf {
sessionSConns[i] = strings.ReplaceAll(item, utils.CONCATENATED_KEY_SEP+utils.MetaSessionS, utils.EmptyString)
} else {
sessionSConns[i] = item
}
}
return map[string]interface{}{
utils.EnabledCfg: aCfg.Enabled,
utils.SessionSConnsCfg: aCfg.SessionSConns,
utils.SessionSConnsCfg: sessionSConns,
utils.CreateCDRCfg: aCfg.CreateCDR,
utils.AsteriskConnsCfg: conns,
}