diff --git a/apier/v1/tpaccountactions_it_test.go b/apier/v1/tpaccountactions_it_test.go index b742511d4..f15404efd 100644 --- a/apier/v1/tpaccountactions_it_test.go +++ b/apier/v1/tpaccountactions_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpactionplans_it_test.go b/apier/v1/tpactionplans_it_test.go index bc03fefb6..689292f4e 100644 --- a/apier/v1/tpactionplans_it_test.go +++ b/apier/v1/tpactionplans_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpactions_it_test.go b/apier/v1/tpactions_it_test.go index 545df967c..bc0c44d2f 100644 --- a/apier/v1/tpactions_it_test.go +++ b/apier/v1/tpactions_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpactiontriggers_it_test.go b/apier/v1/tpactiontriggers_it_test.go index e3c045ef8..8640bcb1f 100644 --- a/apier/v1/tpactiontriggers_it_test.go +++ b/apier/v1/tpactiontriggers_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpattributes_it_test.go b/apier/v1/tpattributes_it_test.go index 7aafab821..9d4a35d5e 100644 --- a/apier/v1/tpattributes_it_test.go +++ b/apier/v1/tpattributes_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpchargers_it_test.go b/apier/v1/tpchargers_it_test.go index 4aa9adf08..6f92bdfd7 100644 --- a/apier/v1/tpchargers_it_test.go +++ b/apier/v1/tpchargers_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpdestinationrates_it_test.go b/apier/v1/tpdestinationrates_it_test.go index 74795813b..dbf91f78b 100644 --- a/apier/v1/tpdestinationrates_it_test.go +++ b/apier/v1/tpdestinationrates_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpdestinations_it_test.go b/apier/v1/tpdestinations_it_test.go index 10dc78d86..4deb110c6 100644 --- a/apier/v1/tpdestinations_it_test.go +++ b/apier/v1/tpdestinations_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpdispatchers_it_test.go b/apier/v1/tpdispatchers_it_test.go index a524320a9..995e67566 100644 --- a/apier/v1/tpdispatchers_it_test.go +++ b/apier/v1/tpdispatchers_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpfilters_it_test.go b/apier/v1/tpfilters_it_test.go index 54c215d1c..e99eab5a5 100644 --- a/apier/v1/tpfilters_it_test.go +++ b/apier/v1/tpfilters_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tprates_it_test.go b/apier/v1/tprates_it_test.go index fa172349a..88d8d2a1c 100644 --- a/apier/v1/tprates_it_test.go +++ b/apier/v1/tprates_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpratingplans_it_test.go b/apier/v1/tpratingplans_it_test.go index d592695ad..fe13a2cfb 100644 --- a/apier/v1/tpratingplans_it_test.go +++ b/apier/v1/tpratingplans_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpratingprofiles.go b/apier/v1/tpratingprofiles.go index d1e407600..20546228b 100644 --- a/apier/v1/tpratingprofiles.go +++ b/apier/v1/tpratingprofiles.go @@ -120,7 +120,7 @@ func (self *ApierV1) GetTPRatingProfileIds(attrs AttrGetTPRatingProfileIds, repl return utils.NewErrMandatoryIeMissing(missing...) } if ids, err := self.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPRateProfiles, - utils.TPDistinctIds{"loadid", "direction", "tenant", "category", "subject"}, + utils.TPDistinctIds{"loadid", "tenant", "category", "subject"}, nil, &attrs.Paginator); err != nil { if err.Error() != utils.ErrNotFound.Error() { err = utils.NewErrServerError(err) diff --git a/apier/v1/tpratingprofiles_it_test.go b/apier/v1/tpratingprofiles_it_test.go index c31e689d5..478847d36 100644 --- a/apier/v1/tpratingprofiles_it_test.go +++ b/apier/v1/tpratingprofiles_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments @@ -55,6 +55,7 @@ var sTestsTPRatingProfiles = []func(t *testing.T){ testTPRatingProfilesGetTPRatingProfilesByLoadId, testTPRatingProfilesUpdateTPRatingProfile, testTPRatingProfilesGetTPRatingProfileAfterUpdate, + testTPRatingProfilesGetTPRatingProfileIds, testTPRatingProfilesRemTPRatingProfile, testTPRatingProfilesGetTPRatingProfileAfterRemove, testTPRatingProfilesKillEngine, @@ -256,6 +257,17 @@ func testTPRatingProfilesGetTPRatingProfileAfterUpdate(t *testing.T) { } } +func testTPRatingProfilesGetTPRatingProfileIds(t *testing.T) { + var respond []string + expected := []string{"RPrf:Tenant1:Category:Subject"} + if err := tpRatingProfileRPC.Call("ApierV1.GetTPRatingProfileIds", + &AttrGetTPRatingProfileIds{TPid: "TPRProf1"}, &respond); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(expected, respond) { + t.Errorf("Expecting : %+v, received: %+v", expected, respond) + } +} + func testTPRatingProfilesRemTPRatingProfile(t *testing.T) { var resp string if err := tpRatingProfileRPC.Call("ApierV1.RemTPRatingProfile", diff --git a/apier/v1/tpresources_it_test.go b/apier/v1/tpresources_it_test.go index 720ddb497..3035e5682 100644 --- a/apier/v1/tpresources_it_test.go +++ b/apier/v1/tpresources_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpsharedgroups_it_test.go b/apier/v1/tpsharedgroups_it_test.go index 296011768..ad5b95108 100644 --- a/apier/v1/tpsharedgroups_it_test.go +++ b/apier/v1/tpsharedgroups_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpstats_it_test.go b/apier/v1/tpstats_it_test.go index d53c0d1a7..5103158a3 100644 --- a/apier/v1/tpstats_it_test.go +++ b/apier/v1/tpstats_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpsuppliers_it_test.go b/apier/v1/tpsuppliers_it_test.go index e00c84b0e..51d8eab53 100644 --- a/apier/v1/tpsuppliers_it_test.go +++ b/apier/v1/tpsuppliers_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tpthresholds_it_test.go b/apier/v1/tpthresholds_it_test.go index 806165984..31d677f7a 100644 --- a/apier/v1/tpthresholds_it_test.go +++ b/apier/v1/tpthresholds_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/apier/v1/tptimings_it_test.go b/apier/v1/tptimings_it_test.go index 41a2f69e7..b6533ef59 100644 --- a/apier/v1/tptimings_it_test.go +++ b/apier/v1/tptimings_it_test.go @@ -1,4 +1,4 @@ -// +build offline_tp +// +build integration /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/config/config_defaults.go b/config/config_defaults.go index aa50fe6c0..8d6a882c5 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -755,7 +755,7 @@ const CGRATES_CFG_JSON = ` "apier": { "caches_conns":[ // connections to CacheS for reloads - {"address": "*internal"}, + {"address": "127.0.0.1:2012", "transport": "*json"}, ], },