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 constants

Browse Source
This commit is contained in:
Trial97
2020-10-16 13:33:49 +03:00
committed by Dan Christian Bogos
parent 616f7b283c
commit 1e6b5848e3
14 changed files with 55 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/kamagent.go
View File

@@ -79,7 +79,7 @@ func (self *KamailioAgent) Connect() (err error) {
if self.conns[connIdx], err = kamevapi.NewKamEvapi(connCfg.Address, connIdx, connCfg.Reconnects, eventHandlers, logger); err != nil {
return
}
utils.Logger.Info(fmt.Sprintf("<%s> successfully connected to Kamailio at: <%s>", utils.KamAgentCfg, connCfg.Address))
utils.Logger.Info(fmt.Sprintf("<%s> successfully connected to Kamailio at: <%s>", utils.KamailioAgent, connCfg.Address))
go func(conn *kamevapi.KamEvapi) { // Start reading in own goroutine, return on error
if err := conn.ReadEvents(); err != nil {
errChan <- err

72
config/config.go
View File

@@ -1645,42 +1645,42 @@ func (cfg *CGRConfig) AsMapInterface(separator string) map[string]interface{} {
}
return map[string]interface{}{
utils.LoaderCfg: loaderCfg,
utils.HttpAgentCfg: httpAgentCfg,
utils.RpcConns: rpcConns,
utils.GeneralCfg: cfg.generalCfg.AsMapInterface(),
LoaderJson: loaderCfg,
HttpAgentJson: httpAgentCfg,
RPCConnsJsonName: rpcConns,
GENERAL_JSN: cfg.generalCfg.AsMapInterface(),
//utils.DataDbCfg: cfg.dataDbCfg.AsMapInterface(),
utils.StorDbCfg: cfg.storDbCfg.AsMapInterface(),
utils.TlsCfg: cfg.tlsCfg.AsMapInterface(),
utils.CacheCfg: cfg.cacheCfg.AsMapInterface(),
utils.ListenCfg: cfg.listenCfg.AsMapInterface(),
utils.HttpCfg: cfg.httpCfg.AsMapInterface(),
utils.FilterSCfg: cfg.filterSCfg.AsMapInterface(),
utils.RalsCfg: cfg.ralsCfg.AsMapInterface(),
utils.SchedulerCfg: cfg.schedulerCfg.AsMapInterface(),
utils.CdrsCfg: cfg.cdrsCfg.AsMapInterface(),
utils.SessionSCfg: cfg.sessionSCfg.AsMapInterface(),
utils.FsAgentCfg: cfg.fsAgentCfg.AsMapInterface(separator),
utils.KamAgentCfg: cfg.kamAgentCfg.AsMapInterface(),
utils.AsteriskAgentCfg: cfg.asteriskAgentCfg.AsMapInterface(),
utils.DiameterAgentCfg: cfg.diameterAgentCfg.AsMapInterface(separator),
utils.RadiusAgentCfg: cfg.radiusAgentCfg.AsMapInterface(separator),
utils.DnsAgentCfg: cfg.dnsAgentCfg.AsMapInterface(separator),
utils.AttributeSCfg: cfg.attributeSCfg.AsMapInterface(),
utils.ChargerSCfg: cfg.chargerSCfg.AsMapInterface(),
utils.ResourceSCfg: cfg.resourceSCfg.AsMapInterface(),
utils.StatsCfg: cfg.statsCfg.AsMapInterface(),
utils.ThresholdSCfg: cfg.thresholdSCfg.AsMapInterface(),
utils.RouteSCfg: cfg.routeSCfg.AsMapInterface(),
utils.SureTaxCfg: cfg.sureTaxCfg.AsMapInterface(separator),
utils.DispatcherSCfg: cfg.dispatcherSCfg.AsMapInterface(),
utils.DispatcherHCfg: cfg.dispatcherHCfg.AsMapInterface(),
utils.LoaderCgrCfg: cfg.loaderCgrCfg.AsMapInterface(),
utils.MigratorCgrCfg: cfg.migratorCgrCfg.AsMapInterface(),
utils.MailerCfg: cfg.mailerCfg.AsMapInterface(),
utils.AnalyzerSCfg: cfg.analyzerSCfg.AsMapInterface(),
utils.Apier: cfg.apier.AsMapInterface(),
utils.ErsCfg: cfg.ersCfg.AsMapInterface(separator),
APIBanCfgJson: cfg.apiBanCfg.AsMapInterface(),
STORDB_JSN: cfg.storDbCfg.AsMapInterface(),
TlsCfgJson: cfg.tlsCfg.AsMapInterface(),
CACHE_JSN: cfg.cacheCfg.AsMapInterface(),
LISTEN_JSN: cfg.listenCfg.AsMapInterface(),
HTTP_JSN: cfg.httpCfg.AsMapInterface(),
FilterSjsn: cfg.filterSCfg.AsMapInterface(),
RALS_JSN: cfg.ralsCfg.AsMapInterface(),
SCHEDULER_JSN: cfg.schedulerCfg.AsMapInterface(),
CDRS_JSN: cfg.cdrsCfg.AsMapInterface(),
SessionSJson: cfg.sessionSCfg.AsMapInterface(),
FreeSWITCHAgentJSN: cfg.fsAgentCfg.AsMapInterface(separator),
KamailioAgentJSN: cfg.kamAgentCfg.AsMapInterface(),
AsteriskAgentJSN: cfg.asteriskAgentCfg.AsMapInterface(),
DA_JSN: cfg.diameterAgentCfg.AsMapInterface(separator),
RA_JSN: cfg.radiusAgentCfg.AsMapInterface(separator),
DNSAgentJson: cfg.dnsAgentCfg.AsMapInterface(separator),
ATTRIBUTE_JSN: cfg.attributeSCfg.AsMapInterface(),
ChargerSCfgJson: cfg.chargerSCfg.AsMapInterface(),
RESOURCES_JSON: cfg.resourceSCfg.AsMapInterface(),
STATS_JSON: cfg.statsCfg.AsMapInterface(),
THRESHOLDS_JSON: cfg.thresholdSCfg.AsMapInterface(),
RouteSJson: cfg.routeSCfg.AsMapInterface(),
SURETAX_JSON: cfg.sureTaxCfg.AsMapInterface(separator),
DispatcherSJson: cfg.dispatcherSCfg.AsMapInterface(),
DispatcherHJson: cfg.dispatcherHCfg.AsMapInterface(),
CgrLoaderCfgJson: cfg.loaderCgrCfg.AsMapInterface(),
CgrMigratorCfgJson: cfg.migratorCgrCfg.AsMapInterface(),
MAILER_JSN: cfg.mailerCfg.AsMapInterface(),
AnalyzerCfgJson: cfg.analyzerSCfg.AsMapInterface(),
ApierS: cfg.apier.AsMapInterface(),
ERsJson: cfg.ersCfg.AsMapInterface(separator),
APIBanCfgJson: cfg.apiBanCfg.AsMapInterface(),
}
}

2
config/dnsagentcfg_test.go
View File

@@ -255,7 +255,7 @@ func TestDNSAgentCfgAsMapInterface1(t *testing.T) {
utils.RequestProcessorsCfg: []map[string]interface{}{
{
utils.IdCfg: "OutboundAUTHDryRun",
utils.FilterSCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.FiltersCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.TenantCfg: "cgrates.org",
utils.FlagsCfg: []string{"*dryrun"},
utils.TimezoneCfg: "UTC",

2
config/erscfg.go
View File

@@ -297,7 +297,7 @@ func (er *EventReaderCfg) AsMapInterface(separator string) (initialMP map[string
for i, item := range er.XmlRootPath {
xmlRootPath[i] = item
}
initialMP[utils.XmlRootPathCfg] = xmlRootPath
initialMP[utils.XMLRootPathCfg] = xmlRootPath
}
var tenant string
values := make([]string, len(er.Tenant))

8
config/erscfg_test.go
View File

@@ -843,7 +843,7 @@ func TestERsCfgAsMapInterfaceCase1(t *testing.T) {
utils.SourcePathCfg: "/var/spool/cgrates/ers/in",
utils.TenantCfg: "",
utils.TimezoneCfg: "",
utils.XmlRootPathCfg: []string{""},
utils.XMLRootPathCfg: []string{""},
utils.CacheDumpFieldsCfg: []map[string]interface{}{},
utils.ConcurrentRequestsCfg: 1024,
utils.TypeCfg: "*none",
@@ -896,7 +896,7 @@ func TestERsCfgAsMapInterfaceCase1(t *testing.T) {
utils.SourcePathCfg: "/tmp/ers/in",
utils.TenantCfg: "~*req.Destination1",
utils.TimezoneCfg: "",
utils.XmlRootPathCfg: []string{""},
utils.XMLRootPathCfg: []string{""},
utils.OptsCfg: make(map[string]interface{}),
},
},
@@ -946,7 +946,7 @@ func TestERSCfgAsMapInterfaceCase2(t *testing.T) {
utils.SourcePathCfg: "/var/spool/cgrates/ers/in",
utils.TenantCfg: "",
utils.TimezoneCfg: "",
utils.XmlRootPathCfg: []string{""},
utils.XMLRootPathCfg: []string{""},
utils.CacheDumpFieldsCfg: []map[string]interface{}{},
utils.ConcurrentRequestsCfg: 1024,
utils.TypeCfg: "*none",
@@ -1001,7 +1001,7 @@ func TestERSCfgAsMapInterfaceCase2(t *testing.T) {
utils.SourcePathCfg: "/tmp/ers/in",
utils.TenantCfg: "~*req.Destination1",
utils.TimezoneCfg: "",
utils.XmlRootPathCfg: []string{""},
utils.XMLRootPathCfg: []string{""},
utils.OptsCfg: make(map[string]interface{}),
},
},

2
config/httpagntcfg_test.go
View File

@@ -541,7 +541,7 @@ func TestHttpAgentCfgAsMapInterface(t *testing.T) {
utils.RequestProcessorsCfg: []map[string]interface{}{
{
utils.IdCfg: "OutboundAUTHDryRun",
utils.FilterSCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.FiltersCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.TenantCfg: "cgrates.org",
utils.FlagsCfg: []string{"*dryrun"},
utils.TimezoneCfg: "",

4
config/listencfg_test.go
View File

@@ -57,7 +57,7 @@ func TestListenCfgAsMapInterface(t *testing.T) {
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.HTTPListenCfg: "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",
@@ -82,7 +82,7 @@ func TestListenCfgAsMapInterface1(t *testing.T) {
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.HTTPListenCfg: "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",

2
config/radiuscfg_test.go
View File

@@ -186,7 +186,7 @@ func TestRadiusAgentCfgAsMapInterface(t *testing.T) {
utils.RequestProcessorsCfg: []map[string]interface{}{
{
utils.IdCfg: "OutboundAUTHDryRun",
utils.FilterSCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.FiltersCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.TenantCfg: "cgrates.org",
utils.FlagsCfg: []string{"*dryrun"},
utils.TimezoneCfg: "",

4
config/sipagentcfg_test.go
View File

@@ -261,7 +261,7 @@ func TestSIPAgentCfgAsMapInterface1(t *testing.T) {
utils.RequestProcessorsCfg: []map[string]interface{}{
{
utils.IdCfg: "OutboundAUTHDryRun",
utils.FilterSCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.FiltersCfg: []string{"*string:~*req.request_type:OutboundAUTH", "*string:~*req.Msisdn:497700056231"},
utils.TenantCfg: "cgrates.org",
utils.FlagsCfg: []string{"*dryrun"},
utils.TimezoneCfg: "",
@@ -315,7 +315,7 @@ func TestSIPAgentCfgAsMapInterface2(t *testing.T) {
utils.RequestProcessorsCfg: []map[string]interface{}{
{
utils.IdCfg: "Register",
utils.FilterSCfg: []string{"*notstring:~*vars.Method:INVITE"},
utils.FiltersCfg: []string{"*notstring:~*vars.Method:INVITE"},
utils.TenantCfg: "cgrates.org",
utils.FlagsCfg: []string{"*none"},
utils.TimezoneCfg: "",

2
config/stordbcfg.go
View File

@@ -142,7 +142,7 @@ func (dbcfg *StorDbCfg) AsMapInterface() (initialMP map[string]interface{}) {
utils.StringIndexedFieldsCfg: dbcfg.StringIndexedFields,
utils.PrefixIndexedFieldsCfg: dbcfg.PrefixIndexedFields,
utils.RmtConnsCfg: dbcfg.RmtConns,
utils.RpcConns: dbcfg.RplConns,
utils.RplConnsCfg: dbcfg.RplConns,
utils.OptsCfg: dbcfg.Opts,
}
if dbcfg.Items != nil {

2
config/stordbcfg_test.go
View File

@@ -238,7 +238,7 @@ func TestStorDbCfgAsMapInterface(t *testing.T) {
},
utils.ItemsCfg: map[string]interface{}{
utils.SessionCostsTBL: map[string]interface{}{utils.RemoteCfg: false, utils.ReplicateCfg: false},
utils.CdrsCfg: map[string]interface{}{utils.RemoteCfg: false, utils.ReplicateCfg: false},
utils.CDRsTBL: map[string]interface{}{utils.RemoteCfg: false, utils.ReplicateCfg: false},
},
}
if cfgCgr, err := NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr); err != nil {

2
packages/debian/changelog
View File

@@ -38,7 +38,7 @@ cgrates (0.11.0~dev) UNRELEASED; urgency=medium
* [Loader] Added support to load CSV files from URL
* [Loader] Added configurable gapi_credentials
* [Loader] Added configurable gapi_token
* [Agents] Add authentication mechanism for Radius (PAP, CHAP,
* [AgentS] Add authentication mechanism for Radius (PAP, CHAP,
MSCHAPV2)
* [SessionS] Update subflags for *rals ( *authorize and *initiate )
* [AgentS] Uniformize flags (*auth -> *authorize)

2
services/httpagent.go
View File

@@ -62,7 +62,7 @@ func (ha *HTTPAgent) Start() (err error) {
ha.Lock()
defer ha.Unlock()
utils.Logger.Info(fmt.Sprintf("<%s> successfully started HTTPAgent", utils.HttpAgentCfg))
utils.Logger.Info(fmt.Sprintf("<%s> successfully started HTTPAgent", utils.HTTPAgent))
for _, agntCfg := range ha.cfg.HttpAgentCfg() {
ha.server.RegisterHttpHandler(agntCfg.Url,
agents.NewHTTPAgent(ha.connMgr, agntCfg.SessionSConns, filterS,

43
utils/consts.go
View File

@@ -2265,13 +2265,14 @@ const (
// EventReaderCfg
const (
IDCfg = "id"
CacheCfg = "cache"
RowLengthCfg = "row_length"
FieldSepCfg = "field_separator"
HeaderDefCharCfg = "header_define_character"
RunDelayCfg = "run_delay"
SourcePathCfg = "source_path"
ProcessedPathCfg = "processed_path"
XmlRootPathCfg = "xml_root_path"
XMLRootPathCfg = "xml_root_path"
TenantCfg = "tenant"
FlagsCfg = "flags"
FailedCallsPrefixCfg = "failed_calls_prefix"
@@ -2290,46 +2291,6 @@ const (
RegisterTLSCfg = "register_tls"
)
// CGRConfig
const (
LoaderCfg = "loaders" // from JSON
HttpAgentCfg = "http_agent" // from JSON
RpcConns = "rpc_conns" // from JSON
GeneralCfg = "general" // from JSON
DataDbCfg = "data_db" // from JSON
StorDbCfg = "stor_db" // from JSON
TlsCfg = "tls" // from JSON
CacheCfg = "cache" //from JSON
CachesCfg = "caches" // from JSON
HttpCfg = "http" // from JSON
FilterSCfg = "filters" // from JSON
RalsCfg = "rals" // from JSON
SchedulerCfg = "schedulers" // from JSON
CdrsCfg = "cdrs" // from JSON
SessionSCfg = "sessions" // from JSON
FsAgentCfg = "freeswitch_agent" // from JSON
KamAgentCfg = "kamailio_agent" // from JSON
AsteriskAgentCfg = "asterisk_agent" // from JSON
DiameterAgentCfg = "diameter_agent" // from JSON
RadiusAgentCfg = "radius_agent" // from JSON
DnsAgentCfg = "dns_agent" // from JSON
AttributeSCfg = "attributes" // from JSON
ChargerSCfg = "chargers" // from JSON
ResourceSCfg = "resources" // from JSON
StatsCfg = "stats" // from JSON
ThresholdSCfg = "thresholds" // from JSON
RouteSCfg = "routes" // from JSON
SureTaxCfg = "suretax" // from JSON
DispatcherSCfg = "dispatchers" // from JSON
DispatcherHCfg = "dispatcherh" // from JSON
LoaderCgrCfg = "loader" // from JSON
MigratorCgrCfg = "migrator" // from JSON
MailerCfg = "mailer" // from JSON
AnalyzerSCfg = "analyzers" // from JSON
Apier = "apiers" // from JSON
ErsCfg = "ers" // from JSON
)
// APIBanCfg
const (
KeysCfg = "keys"