revise IPService implementation

This commit is contained in:
ionutboangiu
2025-12-04 14:10:05 +02:00
committed by Dan Christian Bogos
parent 5aee85a12d
commit eb372148d1
34 changed files with 1201 additions and 1666 deletions

View File

@@ -114,7 +114,7 @@ const CGRATES_CFG_JSON = `
"*resource_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*resources": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*ip_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*ips": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*ip_allocations": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*ranking_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*rankings": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
"*trend_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate":false},
@@ -312,7 +312,7 @@ const CGRATES_CFG_JSON = `
"*resources": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control resources caching
"*event_resources": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate": false}, // matching resources to events
"*ip_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control ip profiles caching
"*ips": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control ips caching
"*ip_allocations": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control ips caching
"*event_ips": {"limit": -1, "ttl": "", "static_ttl": false, "remote":false, "replicate": false}, // matching ips to events
"*trend_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control trend profiles caching
"*trends": {"limit": -1, "ttl": "", "static_ttl": false, "precache": false, "remote":false, "replicate": false}, // control trends caching

View File

@@ -127,7 +127,7 @@ func TestCacheJsonCfg(t *testing.T) {
utils.CacheIPProfiles: {Limit: utils.IntPointer(-1),
Ttl: utils.StringPointer(""), Static_ttl: utils.BoolPointer(false),
Precache: utils.BoolPointer(false), Remote: utils.BoolPointer(false), Replicate: utils.BoolPointer(false)},
utils.CacheIPs: {Limit: utils.IntPointer(-1),
utils.CacheIPAllocations: {Limit: utils.IntPointer(-1),
Ttl: utils.StringPointer(""), Static_ttl: utils.BoolPointer(false),
Precache: utils.BoolPointer(false), Remote: utils.BoolPointer(false), Replicate: utils.BoolPointer(false)},
utils.CacheEventIPs: {Limit: utils.IntPointer(-1),
@@ -436,7 +436,7 @@ func TestDfDataDbJsonCfg(t *testing.T) {
Ttl: utils.StringPointer(utils.EmptyString),
Static_ttl: utils.BoolPointer(false),
},
utils.MetaIPs: {
utils.MetaIPAllocations: {
Replicate: utils.BoolPointer(false),
Remote: utils.BoolPointer(false),
Limit: utils.IntPointer(-1),

File diff suppressed because one or more lines are too long

View File

@@ -174,7 +174,7 @@ func (scfg *SessionSCfg) loadFromJSONCfg(jsnCfg *SessionSJsonCfg) (err error) {
scfg.IPsConns = tagInternalConns(*jsnCfg.IPsConns, utils.MetaIPs)
}
if jsnCfg.ResourceSConns != nil {
scfg.ResourceSConns = tagInternalConns(*jsnCfg.IPsConns, utils.MetaResources)
scfg.ResourceSConns = tagInternalConns(*jsnCfg.ResourceSConns, utils.MetaResources)
}
if jsnCfg.ThresholdSConns != nil {
scfg.ThresholdSConns = tagInternalConns(*jsnCfg.ThresholdSConns, utils.MetaThresholds)