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

Switch from fiorix/go-diameter library to cgrates/go-diameter

Browse Source
This commit is contained in:
arberkatellari
2026-01-09 18:37:15 +02:00
committed by Dan Christian Bogos
parent 67a0543dde
commit 7171efa579
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
agents/agentreq_test.go
View File

@@ -31,10 +31,10 @@ import (
"github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/cgrates/go-diameter/diam"
"github.com/cgrates/go-diameter/diam/avp"
"github.com/cgrates/go-diameter/diam/datatype"
"github.com/cgrates/radigo" "github.com/cgrates/radigo"
"github.com/fiorix/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype"
) )
func TestAgReqSetFields(t *testing.T) { func TestAgReqSetFields(t *testing.T) {

8
agents/diam_it_test.go
View File

@@ -35,10 +35,10 @@ import (
"github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/fiorix/go-diameter/diam" "github.com/cgrates/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp" "github.com/cgrates/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype" "github.com/cgrates/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/dict" "github.com/cgrates/go-diameter/diam/dict"
) )
var ( var (

6
agents/diamagent.go
View File

@@ -29,9 +29,9 @@ import (
"github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/sessions" "github.com/cgrates/cgrates/sessions"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/fiorix/go-diameter/diam" "github.com/cgrates/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/datatype" "github.com/cgrates/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/sm" "github.com/cgrates/go-diameter/diam/sm"
) )
func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS, func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS,

8
agents/diamclient.go
View File

@@ -26,10 +26,10 @@ import (
"time" "time"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/fiorix/go-diameter/diam" "github.com/cgrates/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp" "github.com/cgrates/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype" "github.com/cgrates/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/sm" "github.com/cgrates/go-diameter/diam/sm"
) )
var dictOnce sync.Once var dictOnce sync.Once

8
agents/libdiam.go
View File

@@ -31,10 +31,10 @@ import (
"github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/fiorix/go-diameter/diam" "github.com/cgrates/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp" "github.com/cgrates/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype" "github.com/cgrates/go-diameter/diam/datatype"
"github.com/fiorix/go-diameter/diam/dict" "github.com/cgrates/go-diameter/diam/dict"
) )
func loadDictionaries(dictsDir, componentID string) error { func loadDictionaries(dictsDir, componentID string) error {

6
agents/libdiam_test.go
View File

@@ -31,9 +31,9 @@ import (
"github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils" "github.com/cgrates/cgrates/utils"
"github.com/fiorix/go-diameter/diam" "github.com/cgrates/go-diameter/diam"
"github.com/fiorix/go-diameter/diam/avp" "github.com/cgrates/go-diameter/diam/avp"
"github.com/fiorix/go-diameter/diam/datatype" "github.com/cgrates/go-diameter/diam/datatype"
) )
func TestDPFieldAsInterface(t *testing.T) { func TestDPFieldAsInterface(t *testing.T) {

4
engine/actions_test.go
View File

@@ -1625,7 +1625,7 @@ func TestActionWithExpireWithoutExpire(t *testing.T) {
Balance: &BalanceFilter{ Balance: &BalanceFilter{
Type: utils.StringPointer(utils.VOICE), Type: utils.StringPointer(utils.VOICE),
Value: &utils.ValueFormula{Static: 30}, Value: &utils.ValueFormula{Static: 30},
ExpirationDate: utils.TimePointer(time.Date(2025, time.November, 11, 22, 39, 0, 0, time.UTC)), ExpirationDate: utils.TimePointer(time.Now().AddDate(0, 0, 1)),
}, },
}, },
}, },
@@ -1699,7 +1699,7 @@ func TestActionRemoveExpiredBalance(t *testing.T) {
&Balance{ &Balance{
Value: 10, Value: 10,
DestinationIDs: utils.NewStringMap("NAT", "RET"), DestinationIDs: utils.NewStringMap("NAT", "RET"),
ExpirationDate: time.Date(2025, time.November, 11, 22, 39, 0, 0, time.UTC), ExpirationDate: time.Now().AddDate(0, 0, 1),
}, },
&Balance{ &Balance{
Value: 10, Value: 10,

2
go.mod
View File

@@ -13,12 +13,12 @@ require (
github.com/cgrates/aringo v0.0.0-20220525160735-b5990313d99e github.com/cgrates/aringo v0.0.0-20220525160735-b5990313d99e
github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084 github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084
github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b
github.com/cgrates/go-diameter v0.0.0-20260107110131-c7c2da637acf
github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf
github.com/cgrates/ltcache v0.0.0-20240411152156-e673692056db github.com/cgrates/ltcache v0.0.0-20240411152156-e673692056db
github.com/cgrates/radigo v0.0.0-20240123163129-491c899df727 github.com/cgrates/radigo v0.0.0-20240123163129-491c899df727
github.com/cgrates/rpcclient v0.0.0-20240816141816-52dd1074499e github.com/cgrates/rpcclient v0.0.0-20240816141816-52dd1074499e
github.com/creack/pty v1.1.23 github.com/creack/pty v1.1.23
github.com/fiorix/go-diameter v3.0.3-0.20190716165154-f4823472d0e0+incompatible
github.com/fsnotify/fsnotify v1.7.0 github.com/fsnotify/fsnotify v1.7.0
github.com/go-sql-driver/mysql v1.8.1 github.com/go-sql-driver/mysql v1.8.1
github.com/google/go-cmp v0.6.0 github.com/google/go-cmp v0.6.0

4
go.sum
View File

@@ -31,6 +31,8 @@ github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084 h1:YIEepjEOjeHaFre
github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084/go.mod h1:z/PmNnDPqSQALedKJv5T8+eXIq6XHa9J0St1YsvAVns= github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084/go.mod h1:z/PmNnDPqSQALedKJv5T8+eXIq6XHa9J0St1YsvAVns=
github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b h1:PQzDye+0GcgJ3cKG5NcAOjdRyX0v76ZFkolu3X70fbs= github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b h1:PQzDye+0GcgJ3cKG5NcAOjdRyX0v76ZFkolu3X70fbs=
github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b/go.mod h1:bKByLko2HF33K+PbiiToAgevrrbr96C+7Pp3HGS6oag= github.com/cgrates/fsock v0.0.0-20240522220429-b6cc1d96fd2b/go.mod h1:bKByLko2HF33K+PbiiToAgevrrbr96C+7Pp3HGS6oag=
github.com/cgrates/go-diameter v0.0.0-20260107110131-c7c2da637acf h1:GHRbG17c8E+RjPKrH5WTdxC+nBDmUfESJw5h99ISX2g=
github.com/cgrates/go-diameter v0.0.0-20260107110131-c7c2da637acf/go.mod h1:Vfjo2o1DEmpI+csUo3cYRpCzfM9DajXZ8CR73MNeNh4=
github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf h1:GbMJzvtwdX1OCEmsqSts/cRCIcIMvo8AYtC2dQExWlg= github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf h1:GbMJzvtwdX1OCEmsqSts/cRCIcIMvo8AYtC2dQExWlg=
github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf/go.mod h1:oEq/JbubkOD2pXHvDy4r7519NkxriONisrnVpkCaNJw= github.com/cgrates/kamevapi v0.0.0-20240307160311-26273f03eedf/go.mod h1:oEq/JbubkOD2pXHvDy4r7519NkxriONisrnVpkCaNJw=
github.com/cgrates/ltcache v0.0.0-20240411152156-e673692056db h1:JRgzMS5kJ1WxaveoZ1YG/FowUDxFQXD3GjCHR7rH0Gk= github.com/cgrates/ltcache v0.0.0-20240411152156-e673692056db h1:JRgzMS5kJ1WxaveoZ1YG/FowUDxFQXD3GjCHR7rH0Gk=
@@ -56,8 +58,6 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fiorix/go-diameter v3.0.3-0.20190716165154-f4823472d0e0+incompatible h1:Xf8Q9AW9zNFFV4h5R/1bcMjMcbtZy1FFbCy/bzf/ZSw=
github.com/fiorix/go-diameter v3.0.3-0.20190716165154-f4823472d0e0+incompatible/go.mod h1:GgNrDCADT8o3k8zV1UsI473j8CFdLGY9ikZYDNEeYU8=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=