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

Rename Pool type to IPPool for clarity

Browse Source
This commit is contained in:
ionutboangiu
2025-06-03 14:32:40 +03:00
committed by Dan Christian Bogos
parent df10601b18
commit 33735613e7
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apis/loaders_it_test.go
View File

@@ -1002,7 +1002,7 @@ func testLoadersGetIPProfiles(t *testing.T) {
}, },
TTL: time.Second, TTL: time.Second,
Stored: true, Stored: true,
Pools: []*utils.Pool{ Pools: []*utils.IPPool{
{ {
ID: "POOL1", ID: "POOL1",
FilterIDs: []string{"*string:~*req.Destination:2001"}, FilterIDs: []string{"*string:~*req.Destination:2001"},
@@ -1060,7 +1060,7 @@ func testLoadersGetIPProfiles(t *testing.T) {
}, },
TTL: 2 * time.Second, TTL: 2 * time.Second,
Stored: false, Stored: false,
Pools: []*utils.Pool{ Pools: []*utils.IPPool{
{ {
ID: "POOL1", ID: "POOL1",
FilterIDs: []string{"*string:~*req.Destination:3001"}, FilterIDs: []string{"*string:~*req.Destination:3001"},

2
ips/ips_it_test.go
View File

@@ -152,7 +152,7 @@ cgrates.org,IPs2,*string:~*req.Account:1002,;20,2s,false,POOL1,*string:~*req.Des
}, },
TTL: -1, TTL: -1,
Stored: false, Stored: false,
Pools: []*utils.Pool{ Pools: []*utils.IPPool{
{ {
ID: "FIRST_POOL", ID: "FIRST_POOL",
FilterIDs: []string{}, FilterIDs: []string{},

26
utils/ips.go
View File

@@ -31,7 +31,7 @@ type IPProfile struct {
Weights DynamicWeights Weights DynamicWeights
TTL time.Duration TTL time.Duration
Stored bool Stored bool
Pools []*Pool Pools []*IPPool
} }
// IPProfileWithAPIOpts wraps IPProfile with APIOpts. // IPProfileWithAPIOpts wraps IPProfile with APIOpts.
@@ -50,7 +50,7 @@ func (p *IPProfile) Clone() *IPProfile {
if p == nil { if p == nil {
return nil return nil
} }
pools := make([]*Pool, 0, len(p.Pools)) pools := make([]*IPPool, 0, len(p.Pools))
for _, pool := range p.Pools { for _, pool := range p.Pools {
pools = append(pools, pool.Clone()) pools = append(pools, pool.Clone())
} }
@@ -102,7 +102,7 @@ func (p *IPProfile) Set(path []string, val any, newBranch bool) error {
return nil return nil
} }
if len(p.Pools) == 0 || newBranch { if len(p.Pools) == 0 || newBranch {
p.Pools = append(p.Pools, new(Pool)) p.Pools = append(p.Pools, new(IPPool))
} }
pool := p.Pools[len(p.Pools)-1] pool := p.Pools[len(p.Pools)-1]
return pool.Set(path[1:], val, newBranch) return pool.Set(path[1:], val, newBranch)
@@ -127,7 +127,7 @@ func (p *IPProfile) Merge(other any) {
p.Stored = o.Stored p.Stored = o.Stored
} }
for _, pool := range o.Pools { for _, pool := range o.Pools {
if idx := slices.IndexFunc(p.Pools, func(p *Pool) bool { if idx := slices.IndexFunc(p.Pools, func(p *IPPool) bool {
return p.ID == pool.ID return p.ID == pool.ID
}); idx != -1 { }); idx != -1 {
p.Pools[idx].Merge(pool) p.Pools[idx].Merge(pool)
@@ -189,7 +189,7 @@ func IPProfileLockKey(tnt, id string) string {
return ConcatenatedKey(CacheIPProfiles, tnt, id) return ConcatenatedKey(CacheIPProfiles, tnt, id)
} }
type Pool struct { type IPPool struct {
ID string ID string
FilterIDs []string FilterIDs []string
Type string Type string
@@ -201,11 +201,11 @@ type Pool struct {
} }
// Clone creates a deep copy of Pool for thread-safe use. // Clone creates a deep copy of Pool for thread-safe use.
func (p *Pool) Clone() *Pool { func (p *IPPool) Clone() *IPPool {
if p == nil { if p == nil {
return nil return nil
} }
return &Pool{ return &IPPool{
ID: p.ID, ID: p.ID,
FilterIDs: slices.Clone(p.FilterIDs), FilterIDs: slices.Clone(p.FilterIDs),
Type: p.Type, Type: p.Type,
@@ -217,7 +217,7 @@ func (p *Pool) Clone() *Pool {
} }
} }
func (p *Pool) Set(path []string, val any, _ bool) error { func (p *IPPool) Set(path []string, val any, _ bool) error {
if len(path) != 1 { if len(path) != 1 {
return ErrWrongPath return ErrWrongPath
} }
@@ -251,8 +251,8 @@ func (p *Pool) Set(path []string, val any, _ bool) error {
return err return err
} }
func (p *Pool) Merge(other any) { func (p *IPPool) Merge(other any) {
o := other.(*Pool) o := other.(*IPPool)
// NOTE: Merge gets called when the IDs are equal, so this is a no-op. // NOTE: Merge gets called when the IDs are equal, so this is a no-op.
// Kept for consistency with other components. // Kept for consistency with other components.
@@ -277,9 +277,9 @@ func (p *Pool) Merge(other any) {
p.Blockers = append(p.Blockers, o.Blockers...) p.Blockers = append(p.Blockers, o.Blockers...)
} }
func (p *Pool) String() string { return ToJSON(p) } func (p *IPPool) String() string { return ToJSON(p) }
func (p *Pool) FieldAsString(fldPath []string) (string, error) { func (p *IPPool) FieldAsString(fldPath []string) (string, error) {
val, err := p.FieldAsInterface(fldPath) val, err := p.FieldAsInterface(fldPath)
if err != nil { if err != nil {
return "", err return "", err
@@ -287,7 +287,7 @@ func (p *Pool) FieldAsString(fldPath []string) (string, error) {
return IfaceAsString(val), nil return IfaceAsString(val), nil
} }
func (p *Pool) FieldAsInterface(fldPath []string) (any, error) { func (p *IPPool) FieldAsInterface(fldPath []string) (any, error) {
if len(fldPath) == 0 { if len(fldPath) == 0 {
return p, nil return p, nil
} }