From 0d4b727635fd35fc62a21ed751fdedf666d0cda5 Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 5 Mar 2019 19:39:14 +0100 Subject: [PATCH] Started using github.com/cgrates/go-diameter --- agents/agentreq_test.go | 6 +++--- agents/diam_it_test.go | 8 ++++---- agents/diamagent.go | 6 +++--- agents/diamclient.go | 8 ++++---- agents/libdiam.go | 8 ++++---- agents/libdiam_test.go | 6 +++--- glide.lock | 4 ++-- glide.yaml | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index d16bcb9ae..b3ae3cf5f 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -30,10 +30,10 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "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/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/avp" - "github.com/fiorix/go-diameter/diam/datatype" ) func TestAgReqAsNavigableMap(t *testing.T) { diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index d88103c91..a0c052f9c 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -29,10 +29,10 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" - "github.com/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/avp" - "github.com/fiorix/go-diameter/diam/datatype" - "github.com/fiorix/go-diameter/diam/dict" + "github.com/cgrates/go-diameter/diam" + "github.com/cgrates/go-diameter/diam/avp" + "github.com/cgrates/go-diameter/diam/datatype" + "github.com/cgrates/go-diameter/diam/dict" ) var waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache") diff --git a/agents/diamagent.go b/agents/diamagent.go index 2560b0972..03fac8f83 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -29,10 +29,10 @@ import ( "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/sessions" "github.com/cgrates/cgrates/utils" + "github.com/cgrates/go-diameter/diam" + "github.com/cgrates/go-diameter/diam/datatype" + "github.com/cgrates/go-diameter/diam/sm" "github.com/cgrates/rpcclient" - "github.com/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/datatype" - "github.com/fiorix/go-diameter/diam/sm" ) func NewDiameterAgent(cgrCfg *config.CGRConfig, filterS *engine.FilterS, diff --git a/agents/diamclient.go b/agents/diamclient.go index e8b035851..e0e23df9a 100644 --- a/agents/diamclient.go +++ b/agents/diamclient.go @@ -26,10 +26,10 @@ import ( "time" "github.com/cgrates/cgrates/utils" - "github.com/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/avp" - "github.com/fiorix/go-diameter/diam/datatype" - "github.com/fiorix/go-diameter/diam/sm" + "github.com/cgrates/go-diameter/diam" + "github.com/cgrates/go-diameter/diam/avp" + "github.com/cgrates/go-diameter/diam/datatype" + "github.com/cgrates/go-diameter/diam/sm" ) var dictOnce sync.Once diff --git a/agents/libdiam.go b/agents/libdiam.go index 9c2d55975..1a965c70b 100644 --- a/agents/libdiam.go +++ b/agents/libdiam.go @@ -31,10 +31,10 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" - "github.com/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/avp" - "github.com/fiorix/go-diameter/diam/datatype" - "github.com/fiorix/go-diameter/diam/dict" + "github.com/cgrates/go-diameter/diam" + "github.com/cgrates/go-diameter/diam/avp" + "github.com/cgrates/go-diameter/diam/datatype" + "github.com/cgrates/go-diameter/diam/dict" ) func loadDictionaries(dictsDir, componentId string) error { diff --git a/agents/libdiam_test.go b/agents/libdiam_test.go index ab2bf1b3f..0ecabfc9e 100644 --- a/agents/libdiam_test.go +++ b/agents/libdiam_test.go @@ -24,9 +24,9 @@ import ( "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "github.com/fiorix/go-diameter/diam" - "github.com/fiorix/go-diameter/diam/avp" - "github.com/fiorix/go-diameter/diam/datatype" + "github.com/cgrates/go-diameter/diam" + "github.com/cgrates/go-diameter/diam/avp" + "github.com/cgrates/go-diameter/diam/datatype" ) func TestDPFieldAsInterface(t *testing.T) { diff --git a/glide.lock b/glide.lock index d3ccb4d67..6ecd792bd 100644 --- a/glide.lock +++ b/glide.lock @@ -21,8 +21,8 @@ imports: version: e5c8f3272cccf795f47b82e25a8f3408312c14e0 - name: github.com/cgrates/rpcclient version: dd1d74bc1fe774ddec5146c94464741b6849053a -- name: github.com/fiorix/go-diameter - version: abaf0a5b14a05f3a4a75b8fe23066ab1f898aeac +- name: github.com/cgrates/go-diameter + version: 74cc2c72ff0c6ff7af51868c6e541b6d1b7c5514 subpackages: - diam - diam/avp diff --git a/glide.yaml b/glide.yaml index 06ea53de6..e20f95bb5 100644 --- a/glide.yaml +++ b/glide.yaml @@ -6,7 +6,7 @@ import: - package: github.com/cgrates/kamevapi - package: github.com/cgrates/osipsdagram - package: github.com/cgrates/rpcclient -- package: github.com/fiorix/go-diameter +- package: github.com/cgrates/go-diameter subpackages: - diam - diam/avp