diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index b004c5fd6..b9733fa1a 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -253,7 +253,7 @@ func testApierTPTiming(t *testing.T) { } // Test get var rplyTmAlways2 *utils.ApierTPTiming - if err := rater.Call(utils.APIerSv1GetTPTiming, AttrGetTPTiming{tmAlways2.TPid, tmAlways2.ID}, &rplyTmAlways2); err != nil { + if err := rater.Call(utils.APIerSv1GetTPTiming, &AttrGetTPTiming{tmAlways2.TPid, tmAlways2.ID}, &rplyTmAlways2); err != nil { t.Error("Calling APIerSv1.GetTPTiming, got error: ", err.Error()) } else if !reflect.DeepEqual(tmAlways2, rplyTmAlways2) { t.Errorf("Calling APIerSv1.GetTPTiming expected: %v, received: %v", tmAlways, rplyTmAlways2) @@ -267,7 +267,7 @@ func testApierTPTiming(t *testing.T) { // Test getIds var rplyTmIds []string expectedTmIds := []string{"ALWAYS", "ASAP"} - if err := rater.Call(utils.APIerSv1GetTPTimingIds, AttrGetTPTimingIds{tmAlways.TPid, utils.PaginatorWithSearch{}}, &rplyTmIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPTimingIds, &AttrGetTPTimingIds{tmAlways.TPid, utils.PaginatorWithSearch{}}, &rplyTmIds); err != nil { t.Error("Calling APIerSv1.GetTPTimingIds, got error: ", err.Error()) } sort.Strings(expectedTmIds) @@ -307,13 +307,13 @@ func testApierTPDestination(t *testing.T) { } // Test get var rplyDstDe2 *utils.TPDestination - if err := rater.Call(utils.APIerSv1GetTPDestination, AttrGetTPDestination{dstDe2.TPid, dstDe2.ID}, &rplyDstDe2); err != nil { + if err := rater.Call(utils.APIerSv1GetTPDestination, &AttrGetTPDestination{dstDe2.TPid, dstDe2.ID}, &rplyDstDe2); err != nil { t.Error("Calling APIerSv1.GetTPDestination, got error: ", err.Error()) } else if !reflect.DeepEqual(dstDe2, rplyDstDe2) { t.Errorf("Calling APIerSv1.GetTPDestination expected: %v, received: %v", dstDe2, rplyDstDe2) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPDestination, AttrGetTPDestination{dstDe2.TPid, dstDe2.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPDestination, &AttrGetTPDestination{dstDe2.TPid, dstDe2.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPTiming, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPTiming received: ", reply) @@ -321,7 +321,7 @@ func testApierTPDestination(t *testing.T) { // Test getIds var rplyDstIds []string expectedDstIds := []string{"FS_USERS", "GERMANY", "GERMANY_MOBILE"} - if err := rater.Call(utils.APIerSv1GetTPDestinationIDs, AttrGetTPDestinationIds{TPid: dstDe.TPid}, &rplyDstIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPDestinationIDs, &AttrGetTPDestinationIds{TPid: dstDe.TPid}, &rplyDstIds); err != nil { t.Error("Calling APIerSv1.GetTPDestinationIDs, got error: ", err.Error()) } sort.Strings(expectedDstIds) @@ -361,13 +361,13 @@ func testApierTPRate(t *testing.T) { } // Test get var rplyRt2 *utils.TPRate - if err := rater.Call(utils.APIerSv1GetTPRate, AttrGetTPRate{rt2.TPid, rt2.ID}, &rplyRt2); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRate, &AttrGetTPRate{rt2.TPid, rt2.ID}, &rplyRt2); err != nil { t.Error("Calling APIerSv1.GetTPRate, got error: ", err.Error()) } else if !reflect.DeepEqual(rt2, rplyRt2) { t.Errorf("Calling APIerSv1.GetTPRate expected: %+v, received: %+v", rt2, rplyRt2) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPRate, AttrGetTPRate{rt2.TPid, rt2.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPRate, &AttrGetTPRate{rt2.TPid, rt2.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPRate, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPRate received: ", reply) @@ -375,7 +375,7 @@ func testApierTPRate(t *testing.T) { // Test getIds var rplyRtIds []string expectedRtIds := []string{"RT_FS_USERS"} - if err := rater.Call(utils.APIerSv1GetTPRateIds, AttrGetTPRateIds{rt.TPid, utils.PaginatorWithSearch{}}, &rplyRtIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRateIds, &AttrGetTPRateIds{rt.TPid, utils.PaginatorWithSearch{}}, &rplyRtIds); err != nil { t.Error("Calling APIerSv1.GetTPRateIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedRtIds, rplyRtIds) { t.Errorf("Calling APIerSv1.GetTPDestinationIDs expected: %v, received: %v", expectedRtIds, rplyRtIds) @@ -415,13 +415,13 @@ func testApierTPDestinationRate(t *testing.T) { } // Test get var rplyDr2 *utils.TPDestinationRate - if err := rater.Call(utils.APIerSv1GetTPDestinationRate, AttrGetTPDestinationRate{dr2.TPid, dr2.ID, utils.Paginator{}}, &rplyDr2); err != nil { + if err := rater.Call(utils.APIerSv1GetTPDestinationRate, &AttrGetTPDestinationRate{dr2.TPid, dr2.ID, utils.Paginator{}}, &rplyDr2); err != nil { t.Error("Calling APIerSv1.GetTPDestinationRate, got error: ", err.Error()) } else if !reflect.DeepEqual(dr2, rplyDr2) { t.Errorf("Calling APIerSv1.GetTPDestinationRate expected: %v, received: %v", dr2, rplyDr2) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPDestinationRate, AttrGetTPDestinationRate{dr2.TPid, dr2.ID, utils.Paginator{}}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPDestinationRate, &AttrGetTPDestinationRate{dr2.TPid, dr2.ID, utils.Paginator{}}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPRate, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPRate received: ", reply) @@ -429,7 +429,7 @@ func testApierTPDestinationRate(t *testing.T) { // Test getIds var rplyDrIds []string expectedDrIds := []string{"DR_FREESWITCH_USERS"} - if err := rater.Call(utils.APIerSv1GetTPDestinationRateIds, AttrTPDestinationRateIds{dr.TPid, utils.PaginatorWithSearch{}}, &rplyDrIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPDestinationRateIds, &AttrTPDestinationRateIds{dr.TPid, utils.PaginatorWithSearch{}}, &rplyDrIds); err != nil { t.Error("Calling APIerSv1.GetTPDestinationRateIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedDrIds, rplyDrIds) { t.Errorf("Calling APIerSv1.GetTPDestinationRateIds expected: %v, received: %v", expectedDrIds, rplyDrIds) @@ -466,13 +466,13 @@ func testApierTPRatingPlan(t *testing.T) { } // Test get var rplyRpTst *utils.TPRatingPlan - if err := rater.Call(utils.APIerSv1GetTPRatingPlan, AttrGetTPRatingPlan{TPid: rpTst.TPid, ID: rpTst.ID}, &rplyRpTst); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRatingPlan, &AttrGetTPRatingPlan{TPid: rpTst.TPid, ID: rpTst.ID}, &rplyRpTst); err != nil { t.Error("Calling APIerSv1.GetTPRatingPlan, got error: ", err.Error()) } else if !reflect.DeepEqual(rpTst, rplyRpTst) { t.Errorf("Calling APIerSv1.GetTPRatingPlan expected: %v, received: %v", rpTst, rplyRpTst) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPRatingPlan, AttrGetTPRatingPlan{TPid: rpTst.TPid, ID: rpTst.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPRatingPlan, &AttrGetTPRatingPlan{TPid: rpTst.TPid, ID: rpTst.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPRatingPlan, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPRatingPlan received: ", reply) @@ -480,7 +480,7 @@ func testApierTPRatingPlan(t *testing.T) { // Test getIds var rplyRpIds []string expectedRpIds := []string{"RETAIL1"} - if err := rater.Call(utils.APIerSv1GetTPRatingPlanIds, AttrGetTPRatingPlanIds{rp.TPid, utils.PaginatorWithSearch{}}, &rplyRpIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRatingPlanIds, &AttrGetTPRatingPlanIds{rp.TPid, utils.PaginatorWithSearch{}}, &rplyRpIds); err != nil { t.Error("Calling APIerSv1.GetTPRatingPlanIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedRpIds, rplyRpIds) { t.Errorf("Calling APIerSv1.GetTPRatingPlanIds expected: %v, received: %v", expectedRpIds, rplyRpIds) @@ -526,13 +526,13 @@ func testApierTPRatingProfile(t *testing.T) { } // Test get var rplyRpf *utils.TPRatingProfile - if err := rater.Call(utils.APIerSv1GetTPRatingProfile, AttrGetTPRatingProfile{TPid: rpfTst.TPid, RatingProfileID: utils.ConcatenatedKey(rpfTst.LoadId, rpfTst.Tenant, rpfTst.Category, rpfTst.Subject)}, &rplyRpf); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRatingProfile, &AttrGetTPRatingProfile{TPid: rpfTst.TPid, RatingProfileID: utils.ConcatenatedKey(rpfTst.LoadId, rpfTst.Tenant, rpfTst.Category, rpfTst.Subject)}, &rplyRpf); err != nil { t.Error("Calling APIerSv1.GetTPRatingProfiles, got error: ", err.Error()) } else if !reflect.DeepEqual(rpfTst, rplyRpf) { t.Errorf("Calling APIerSv1.GetTPRatingProfiles expected: %v, received: %v", rpfTst, rplyRpf) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPRatingProfile, AttrGetTPRatingProfile{TPid: rpfTst.TPid, RatingProfileID: utils.ConcatenatedKey(rpfTst.LoadId, rpfTst.Tenant, rpfTst.Category, rpfTst.Subject)}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPRatingProfile, &AttrGetTPRatingProfile{TPid: rpfTst.TPid, RatingProfileID: utils.ConcatenatedKey(rpfTst.LoadId, rpfTst.Tenant, rpfTst.Category, rpfTst.Subject)}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPRatingProfile, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPRatingProfile received: ", reply) @@ -540,7 +540,7 @@ func testApierTPRatingProfile(t *testing.T) { // Test getLoadIds var rplyRpIds []string expectedRpIds := []string{utils.TEST_SQL} - if err := rater.Call(utils.APIerSv1GetTPRatingProfileLoadIds, utils.AttrTPRatingProfileIds{TPid: rpf.TPid}, &rplyRpIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPRatingProfileLoadIds, &utils.AttrTPRatingProfileIds{TPid: rpf.TPid}, &rplyRpIds); err != nil { t.Error("Calling APIerSv1.GetTPRatingProfileLoadIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedRpIds, rplyRpIds) { t.Errorf("Calling APIerSv1.GetTPRatingProfileLoadIds expected: %v, received: %v", expectedRpIds, rplyRpIds) @@ -585,13 +585,13 @@ func testApierTPActions(t *testing.T) { } // Test get var rplyActs *utils.TPActions - if err := rater.Call(utils.APIerSv1GetTPActions, AttrGetTPActions{TPid: actTst.TPid, ID: actTst.ID}, &rplyActs); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActions, &AttrGetTPActions{TPid: actTst.TPid, ID: actTst.ID}, &rplyActs); err != nil { t.Error("Calling APIerSv1.GetTPActions, got error: ", err.Error()) } else if !reflect.DeepEqual(actTst, rplyActs) { t.Errorf("Calling APIerSv1.GetTPActions expected: %v, received: %v", actTst, rplyActs) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPActions, AttrGetTPActions{TPid: actTst.TPid, ID: actTst.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPActions, &AttrGetTPActions{TPid: actTst.TPid, ID: actTst.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPActions, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPActions received: ", reply) @@ -599,7 +599,7 @@ func testApierTPActions(t *testing.T) { // Test getIds var rplyIds []string expectedIds := []string{"LOG_BALANCE", "PREPAID_10", "WARN_VIA_HTTP"} - if err := rater.Call(utils.APIerSv1GetTPActionIds, AttrGetTPActionIds{TPid: actTst.TPid}, &rplyIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActionIds, &AttrGetTPActionIds{TPid: actTst.TPid}, &rplyIds); err != nil { t.Error("Calling APIerSv1.GetTPActionIds, got error: ", err.Error()) } sort.Strings(expectedIds) @@ -638,13 +638,13 @@ func testApierTPActionPlan(t *testing.T) { } // Test get var rplyActs *utils.TPActionPlan - if err := rater.Call(utils.APIerSv1GetTPActionPlan, AttrGetTPActionPlan{TPid: atTst.TPid, ID: atTst.ID}, &rplyActs); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActionPlan, &AttrGetTPActionPlan{TPid: atTst.TPid, ID: atTst.ID}, &rplyActs); err != nil { t.Error("Calling APIerSv1.GetTPActionPlan, got error: ", err.Error()) } else if !reflect.DeepEqual(atTst, rplyActs) { t.Errorf("Calling APIerSv1.GetTPActionPlan expected: %v, received: %v", atTst, rplyActs) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPActionPlan, AttrGetTPActionPlan{TPid: atTst.TPid, ID: atTst.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPActionPlan, &AttrGetTPActionPlan{TPid: atTst.TPid, ID: atTst.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPActionPlan, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPActionPlan received: ", reply) @@ -652,7 +652,7 @@ func testApierTPActionPlan(t *testing.T) { // Test getIds var rplyIds []string expectedIds := []string{"PREPAID_10"} - if err := rater.Call(utils.APIerSv1GetTPActionPlanIds, AttrGetTPActionPlanIds{TPid: atTst.TPid}, &rplyIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActionPlanIds, &AttrGetTPActionPlanIds{TPid: atTst.TPid}, &rplyIds); err != nil { t.Error("Calling APIerSv1.GetTPActionPlanIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedIds, rplyIds) { t.Errorf("Calling APIerSv1.GetTPActionPlanIds expected: %v, received: %v", expectedIds, rplyIds) @@ -699,13 +699,13 @@ func testApierTPActionTriggers(t *testing.T) { } // Test get var rplyActs *utils.TPActionTriggers - if err := rater.Call(utils.APIerSv1GetTPActionTriggers, AttrGetTPActionTriggers{TPid: atTst.TPid, ID: atTst.ID}, &rplyActs); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActionTriggers, &AttrGetTPActionTriggers{TPid: atTst.TPid, ID: atTst.ID}, &rplyActs); err != nil { t.Errorf("Calling APIerSv1.GetTPActionTriggers %s, got error: %s", atTst.ID, err.Error()) } else if !reflect.DeepEqual(atTst, rplyActs) { t.Errorf("Calling APIerSv1.GetTPActionTriggers expected: %+v, received: %+v", utils.ToJSON(atTst), utils.ToJSON(rplyActs)) } // Test remove - if err := rater.Call(utils.APIerSv1RemoveTPActionTriggers, AttrGetTPActionTriggers{TPid: atTst.TPid, ID: atTst.ID}, &reply); err != nil { + if err := rater.Call(utils.APIerSv1RemoveTPActionTriggers, &AttrGetTPActionTriggers{TPid: atTst.TPid, ID: atTst.ID}, &reply); err != nil { t.Error("Calling APIerSv1.RemoveTPActionTriggers, got error: ", err.Error()) } else if reply != utils.OK { t.Error("Calling APIerSv1.RemoveTPActionTriggers received: ", reply) @@ -713,7 +713,7 @@ func testApierTPActionTriggers(t *testing.T) { // Test getIds var rplyIds []string expectedIds := []string{"STANDARD_TRIGGERS"} - if err := rater.Call(utils.APIerSv1GetTPActionTriggerIds, AttrGetTPActionTriggerIds{TPid: atTst.TPid}, &rplyIds); err != nil { + if err := rater.Call(utils.APIerSv1GetTPActionTriggerIds, &AttrGetTPActionTriggerIds{TPid: atTst.TPid}, &rplyIds); err != nil { t.Error("Calling APIerSv1.GetTPActionTriggerIds, got error: ", err.Error()) } else if !reflect.DeepEqual(expectedIds, rplyIds) { t.Errorf("Calling APIerSv1.GetTPActionTriggerIds expected: %v, received: %v", expectedIds, rplyIds) diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 008ff2b6b..8c358acc4 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -1198,7 +1198,7 @@ func testV1FIdxCaGetResourceProfileWithNotFound(t *testing.T) { t.Error(err) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &reply); err.Error() != utils.ErrNotFound.Error() { + &argsRU, &reply); err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } @@ -1277,7 +1277,7 @@ func testV1FIdxCaSetResourceProfile(t *testing.T) { } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &result); err != nil { + &argsRU, &result); err != nil { t.Error(err) } else if result != "Approved" { t.Error("Unexpected reply returned", result) @@ -1305,7 +1305,7 @@ func testV1FIdxCaGetResourceProfileFromTP(t *testing.T) { t.Error("Unexpected reply returned", reply) } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &reply); err != nil { + &argsRU, &reply); err != nil { t.Error(err) } else if reply != "Approved" { t.Error("Unexpected reply returned", reply) @@ -1324,7 +1324,7 @@ func testV1FIdxCaGetResourceProfileFromTP(t *testing.T) { Units: 6, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - argsReU, &reply); err != nil { + &argsReU, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { t.Error("Unexpected reply returned", reply) @@ -1400,7 +1400,7 @@ func testV1FIdxCaUpdateResourceProfile(t *testing.T) { Units: 6, } if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, - argsReU, &result); err != nil { + &argsReU, &result); err != nil { t.Error(err) } else if result != "MessageAllocation" { t.Error("Unexpected reply returned", result) @@ -1465,7 +1465,7 @@ func testV1FIdxCaUpdateResourceProfileFromTP(t *testing.T) { }, Units: 6, } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, argsReU, &result); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsReU, &result); err != nil { t.Error(err) } else if result != "ResGroup1" { t.Error("Unexpected reply returned", result) @@ -1491,7 +1491,7 @@ func testV1FIdxCaRemoveResourceProfile(t *testing.T) { } else if resp != "MessageAllocation" { t.Error("Unexpected reply returned", resp) } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, argsReU, &resp); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsReU, &resp); err != nil { t.Error(err) } else if resp != "MessageAllocation" { t.Error("Unexpected reply returned", resp) @@ -1508,7 +1508,7 @@ func testV1FIdxCaRemoveResourceProfile(t *testing.T) { }, Units: 6, } - if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, argsRU, &resp); err != nil { + if err := tFIdxCaRpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &resp); err != nil { t.Error(err) } else if resp != "ResGroup1" { t.Error("Unexpected reply returned", resp) diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index eabcd00b7..2e3b625b8 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -423,7 +423,7 @@ func testV1RsAuthorizeResources(t *testing.T) { }, Units: 6, } - if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, argsRU, &reply); err != nil { + if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { // already 3 usages active before allow call, we should have now more than allowed t.Error("Unexpected reply returned", reply) @@ -441,7 +441,7 @@ func testV1RsAuthorizeResources(t *testing.T) { Units: 7, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &reply); err.Error() != utils.ErrResourceUnauthorized.Error() { + &argsRU, &reply); err.Error() != utils.ErrResourceUnauthorized.Error() { t.Error(err) } } @@ -478,7 +478,7 @@ func testV1RsReleaseResource(t *testing.T) { }, Units: 7, } - if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, argsRU, &reply); err != nil { + if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { t.Error("Unexpected reply returned", reply) diff --git a/apier/v1/tpactionplans.go b/apier/v1/tpactionplans.go index ef790874e..8fb774764 100644 --- a/apier/v1/tpactionplans.go +++ b/apier/v1/tpactionplans.go @@ -25,8 +25,8 @@ import ( ) // SetTPActionPlan creates a new ActionTimings profile within a tariff plan -func (apiv1 *APIerSv1) SetTPActionPlan(attrs utils.TPActionPlan, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "ActionPlan"}); len(missing) != 0 { +func (apiv1 *APIerSv1) SetTPActionPlan(attrs *utils.TPActionPlan, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "ActionPlan"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } for _, at := range attrs.ActionPlan { @@ -35,7 +35,7 @@ func (apiv1 *APIerSv1) SetTPActionPlan(attrs utils.TPActionPlan, reply *string) return fmt.Errorf("%s:Action:%s:%v", utils.ErrMandatoryIeMissing.Error(), at.ActionsId, missing) } } - if err := apiv1.StorDb.SetTPActionPlans([]*utils.TPActionPlan{&attrs}); err != nil { + if err := apiv1.StorDb.SetTPActionPlans([]*utils.TPActionPlan{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -48,8 +48,8 @@ type AttrGetTPActionPlan struct { } // GetTPActionPlan queries specific ActionPlan profile on tariff plan -func (apiv1 *APIerSv1) GetTPActionPlan(attrs AttrGetTPActionPlan, reply *utils.TPActionPlan) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) GetTPActionPlan(attrs *AttrGetTPActionPlan, reply *utils.TPActionPlan) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } aps, err := apiv1.StorDb.GetTPActionPlans(attrs.TPid, attrs.ID) @@ -69,8 +69,8 @@ type AttrGetTPActionPlanIds struct { } // GetTPActionPlanIds queries ActionPlan identities on specific tariff plan. -func (apiv1 *APIerSv1) GetTPActionPlanIds(attrs AttrGetTPActionPlanIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) GetTPActionPlanIds(attrs *AttrGetTPActionPlanIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apiv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActionPlans, @@ -86,8 +86,8 @@ func (apiv1 *APIerSv1) GetTPActionPlanIds(attrs AttrGetTPActionPlanIds, reply *[ } // RemoveTPActionPlan removes specific ActionPlan on Tariff plan -func (apiv1 *APIerSv1) RemoveTPActionPlan(attrs AttrGetTPActionPlan, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) RemoveTPActionPlan(attrs *AttrGetTPActionPlan, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := apiv1.StorDb.RemTpData(utils.TBLTPActionPlans, diff --git a/apier/v1/tpactions.go b/apier/v1/tpactions.go index e8fec8311..a18c97e09 100644 --- a/apier/v1/tpactions.go +++ b/apier/v1/tpactions.go @@ -23,11 +23,11 @@ import ( ) // SetTPActions creates a new Actions profile within a tariff plan -func (apiv1 *APIerSv1) SetTPActions(attrs utils.TPActions, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "Actions"}); len(missing) != 0 { +func (apiv1 *APIerSv1) SetTPActions(attrs *utils.TPActions, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "Actions"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := apiv1.StorDb.SetTPActions([]*utils.TPActions{&attrs}); err != nil { + if err := apiv1.StorDb.SetTPActions([]*utils.TPActions{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -40,8 +40,8 @@ type AttrGetTPActions struct { } // GetTPActions queries specific Actions profile on tariff plan -func (apiv1 *APIerSv1) GetTPActions(attrs AttrGetTPActions, reply *utils.TPActions) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) GetTPActions(attrs *AttrGetTPActions, reply *utils.TPActions) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } as, err := apiv1.StorDb.GetTPActions(attrs.TPid, attrs.ID) @@ -61,8 +61,8 @@ type AttrGetTPActionIds struct { } // GetTPActionIds queries Actions identities on specific tariff plan. -func (apiv1 *APIerSv1) GetTPActionIds(attrs AttrGetTPActionIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) GetTPActionIds(attrs *AttrGetTPActionIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apiv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActions, @@ -78,8 +78,8 @@ func (apiv1 *APIerSv1) GetTPActionIds(attrs AttrGetTPActionIds, reply *[]string) } // RemoveTPActions removes specific Actions on Tariff plan -func (apiv1 *APIerSv1) RemoveTPActions(attrs AttrGetTPActions, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (apiv1 *APIerSv1) RemoveTPActions(attrs *AttrGetTPActions, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := apiv1.StorDb.RemTpData(utils.TBLTPActions, diff --git a/apier/v1/tpactiontriggers.go b/apier/v1/tpactiontriggers.go index e649ad47c..1e958ab59 100644 --- a/apier/v1/tpactiontriggers.go +++ b/apier/v1/tpactiontriggers.go @@ -23,11 +23,11 @@ import ( ) // SetTPActionTriggers creates a new ActionTriggers profile within a tariff plan -func (api *APIerSv1) SetTPActionTriggers(attrs utils.TPActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { +func (api *APIerSv1) SetTPActionTriggers(attrs *utils.TPActionTriggers, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPActionTriggers([]*utils.TPActionTriggers{&attrs}); err != nil { + if err := api.StorDb.SetTPActionTriggers([]*utils.TPActionTriggers{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -41,8 +41,8 @@ type AttrGetTPActionTriggers struct { } // GetTPActionTriggers queries specific ActionTriggers profile on tariff plan -func (api *APIerSv1) GetTPActionTriggers(attrs AttrGetTPActionTriggers, reply *utils.TPActionTriggers) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPActionTriggers(attrs *AttrGetTPActionTriggers, reply *utils.TPActionTriggers) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ats, err := api.StorDb.GetTPActionTriggers(attrs.TPid, attrs.ID) @@ -63,8 +63,8 @@ type AttrGetTPActionTriggerIds struct { } // GetTPActionTriggerIds queries ActionTriggers identities on specific tariff plan. -func (api *APIerSv1) GetTPActionTriggerIds(attrs AttrGetTPActionTriggerIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPActionTriggerIds(attrs *AttrGetTPActionTriggerIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActionTriggers, @@ -80,8 +80,8 @@ func (api *APIerSv1) GetTPActionTriggerIds(attrs AttrGetTPActionTriggerIds, repl } // RemoveTPActionTriggers removes specific ActionTriggers on Tariff plan -func (api *APIerSv1) RemoveTPActionTriggers(attrs AttrGetTPActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPActionTriggers(attrs *AttrGetTPActionTriggers, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } err := api.StorDb.RemTpData(utils.TBLTPActionTriggers, diff --git a/apier/v1/tpdestinationrates.go b/apier/v1/tpdestinationrates.go index d7b77cf79..1df019d53 100644 --- a/apier/v1/tpdestinationrates.go +++ b/apier/v1/tpdestinationrates.go @@ -25,11 +25,11 @@ import ( ) // SetTPDestinationRate creates a new DestinationRate profile within a tariff plan -func (api *APIerSv1) SetTPDestinationRate(attrs utils.TPDestinationRate, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "DestinationRates"}); len(missing) != 0 { +func (api *APIerSv1) SetTPDestinationRate(attrs *utils.TPDestinationRate, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "DestinationRates"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPDestinationRates([]*utils.TPDestinationRate{&attrs}); err != nil { + if err := api.StorDb.SetTPDestinationRates([]*utils.TPDestinationRate{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -43,8 +43,8 @@ type AttrGetTPDestinationRate struct { } // GetTPDestinationRate queries specific DestinationRate profile on tariff plan -func (api *APIerSv1) GetTPDestinationRate(attrs AttrGetTPDestinationRate, reply *utils.TPDestinationRate) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPDestinationRate(attrs *AttrGetTPDestinationRate, reply *utils.TPDestinationRate) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } drs, err := api.StorDb.GetTPDestinationRates(attrs.TPid, attrs.ID, &attrs.Paginator) @@ -64,8 +64,8 @@ type AttrTPDestinationRateIds struct { } // GetTPDestinationRateIds queries DestinationRate identities on specific tariff plan. -func (api *APIerSv1) GetTPDestinationRateIds(attrs AttrGetTPRateIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPDestinationRateIds(attrs *AttrGetTPRateIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPDestinationRates, @@ -81,8 +81,8 @@ func (api *APIerSv1) GetTPDestinationRateIds(attrs AttrGetTPRateIds, reply *[]st } // RemoveTPDestinationRate removes specific DestinationRate on Tariff plan -func (api *APIerSv1) RemoveTPDestinationRate(attrs AttrGetTPDestinationRate, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPDestinationRate(attrs *AttrGetTPDestinationRate, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := api.StorDb.RemTpData(utils.TBLTPDestinationRates, attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { diff --git a/apier/v1/tpdestinations.go b/apier/v1/tpdestinations.go index ce13b6b1a..68ca3f5ff 100644 --- a/apier/v1/tpdestinations.go +++ b/apier/v1/tpdestinations.go @@ -23,11 +23,11 @@ import ( ) // SetTPDestination creates a new destination within a tariff plan -func (api *APIerSv1) SetTPDestination(attrs utils.TPDestination, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "Prefixes"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) SetTPDestination(attrs *utils.TPDestination, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "Prefixes"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPDestinations([]*utils.TPDestination{&attrs}); err != nil { + if err := api.StorDb.SetTPDestinations([]*utils.TPDestination{attrs}); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK @@ -40,8 +40,8 @@ type AttrGetTPDestination struct { } // GetTPDestination queries a specific destination -func (api *APIerSv1) GetTPDestination(attrs AttrGetTPDestination, reply *utils.TPDestination) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPDestination(attrs *AttrGetTPDestination, reply *utils.TPDestination) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } tpDsts, err := api.StorDb.GetTPDestinations(attrs.TPid, attrs.ID) @@ -63,8 +63,8 @@ type AttrGetTPDestinationIds struct { } // GetTPDestinationIDs queries destination identities on specific tariff plan. -func (api *APIerSv1) GetTPDestinationIDs(attrs AttrGetTPDestinationIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPDestinationIDs(attrs *AttrGetTPDestinationIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPDestinations, @@ -80,8 +80,8 @@ func (api *APIerSv1) GetTPDestinationIDs(attrs AttrGetTPDestinationIds, reply *[ } // RemoveTPDestination removes specific Destination on Tariff plan -func (api *APIerSv1) RemoveTPDestination(attrs AttrGetTPDestination, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPDestination(attrs *AttrGetTPDestination, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := api.StorDb.RemTpData(utils.TBLTPDestinations, attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { diff --git a/apier/v1/tprates.go b/apier/v1/tprates.go index 806cd1299..50b8f137b 100644 --- a/apier/v1/tprates.go +++ b/apier/v1/tprates.go @@ -25,11 +25,11 @@ import ( ) // SetTPRate creates a new rate within a tariff plan -func (api *APIerSv1) SetTPRate(attrs utils.TPRate, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "RateSlots"}); len(missing) != 0 { +func (api *APIerSv1) SetTPRate(attrs *utils.TPRate, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "RateSlots"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPRates([]*utils.TPRate{&attrs}); err != nil { + if err := api.StorDb.SetTPRates([]*utils.TPRate{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -42,8 +42,8 @@ type AttrGetTPRate struct { } // GetTPRate queries specific Rate on tariff plan -func (api *APIerSv1) GetTPRate(attrs AttrGetTPRate, reply *utils.TPRate) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRate(attrs *AttrGetTPRate, reply *utils.TPRate) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } rs, err := api.StorDb.GetTPRates(attrs.TPid, attrs.ID) @@ -63,8 +63,8 @@ type AttrGetTPRateIds struct { } // GetTPRateIds queries rate identities on specific tariff plan. -func (api *APIerSv1) GetTPRateIds(attrs AttrGetTPRateIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRateIds(attrs *AttrGetTPRateIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPRates, @@ -80,8 +80,8 @@ func (api *APIerSv1) GetTPRateIds(attrs AttrGetTPRateIds, reply *[]string) error } // RemoveTPRate removes specific Rate on Tariff plan -func (api *APIerSv1) RemoveTPRate(attrs AttrGetTPRate, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPRate(attrs *AttrGetTPRate, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := api.StorDb.RemTpData(utils.TBLTPRates, attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { diff --git a/apier/v1/tpratingplans.go b/apier/v1/tpratingplans.go index 65f43c5b6..a8c89f377 100644 --- a/apier/v1/tpratingplans.go +++ b/apier/v1/tpratingplans.go @@ -25,11 +25,11 @@ import ( ) // SetTPRatingPlan creates a new DestinationRateTiming profile within a tariff plan -func (api *APIerSv1) SetTPRatingPlan(attrs utils.TPRatingPlan, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "RatingPlanBindings"}); len(missing) != 0 { +func (api *APIerSv1) SetTPRatingPlan(attrs *utils.TPRatingPlan, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "RatingPlanBindings"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPRatingPlans([]*utils.TPRatingPlan{&attrs}); err != nil { + if err := api.StorDb.SetTPRatingPlans([]*utils.TPRatingPlan{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -43,8 +43,8 @@ type AttrGetTPRatingPlan struct { } // GetTPRatingPlan queries specific RatingPlan profile on tariff plan -func (api *APIerSv1) GetTPRatingPlan(attrs AttrGetTPRatingPlan, reply *utils.TPRatingPlan) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRatingPlan(attrs *AttrGetTPRatingPlan, reply *utils.TPRatingPlan) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } rps, err := api.StorDb.GetTPRatingPlans(attrs.TPid, attrs.ID, &attrs.Paginator) @@ -64,8 +64,8 @@ type AttrGetTPRatingPlanIds struct { } // GetTPRatingPlanIds queries RatingPlan identities on specific tariff plan. -func (api *APIerSv1) GetTPRatingPlanIds(attrs AttrGetTPRatingPlanIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRatingPlanIds(attrs *AttrGetTPRatingPlanIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPRatingPlans, @@ -81,8 +81,8 @@ func (api *APIerSv1) GetTPRatingPlanIds(attrs AttrGetTPRatingPlanIds, reply *[]s } // RemoveTPRatingPlan removes specific RatingPlan on Tariff plan -func (api *APIerSv1) RemoveTPRatingPlan(attrs AttrGetTPRatingPlan, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPRatingPlan(attrs *AttrGetTPRatingPlan, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := api.StorDb.RemTpData(utils.TBLTPRatingPlans, attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { diff --git a/apier/v1/tpratingprofiles.go b/apier/v1/tpratingprofiles.go index 1d4a0ad7f..47258fb63 100644 --- a/apier/v1/tpratingprofiles.go +++ b/apier/v1/tpratingprofiles.go @@ -25,12 +25,12 @@ import ( ) // SetTPRatingProfile creates a new RatingProfile within a tariff plan -func (api *APIerSv1) SetTPRatingProfile(attrs utils.TPRatingProfile, reply *string) error { - if missing := utils.MissingStructFields(&attrs, +func (api *APIerSv1) SetTPRatingProfile(attrs *utils.TPRatingProfile, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "LoadId", "Tenant", "Category", "Subject", "RatingPlanActivations"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPRatingProfiles([]*utils.TPRatingProfile{&attrs}); err != nil { + if err := api.StorDb.SetTPRatingProfiles([]*utils.TPRatingProfile{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -38,15 +38,15 @@ func (api *APIerSv1) SetTPRatingProfile(attrs utils.TPRatingProfile, reply *stri } // GetTPRatingProfilesByLoadID queries specific RatingProfile on tariff plan -func (api *APIerSv1) GetTPRatingProfilesByLoadID(attrs utils.TPRatingProfile, reply *[]*utils.TPRatingProfile) error { +func (api *APIerSv1) GetTPRatingProfilesByLoadID(attrs *utils.TPRatingProfile, reply *[]*utils.TPRatingProfile) error { mndtryFlds := []string{"TPid", "LoadId"} if len(attrs.Subject) != 0 { // If Subject provided as filter, make all related fields mandatory mndtryFlds = append(mndtryFlds, "Tenant", "Category", "Subject") } - if missing := utils.MissingStructFields(&attrs, mndtryFlds); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, mndtryFlds); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } - rps, err := api.StorDb.GetTPRatingProfiles(&attrs) + rps, err := api.StorDb.GetTPRatingProfiles(attrs) if err != nil { if err.Error() != utils.ErrNotFound.Error() { err = utils.NewErrServerError(err) @@ -58,8 +58,8 @@ func (api *APIerSv1) GetTPRatingProfilesByLoadID(attrs utils.TPRatingProfile, re } // GetTPRatingProfileLoadIds queries RatingProfile identities on specific tariff plan. -func (api *APIerSv1) GetTPRatingProfileLoadIds(attrs utils.AttrTPRatingProfileIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRatingProfileLoadIds(attrs *utils.AttrTPRatingProfileIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPRateProfiles, @@ -85,8 +85,8 @@ type AttrGetTPRatingProfile struct { } // GetTPRatingProfile queries specific RatingProfile on tariff plan -func (api *APIerSv1) GetTPRatingProfile(attrs AttrGetTPRatingProfile, reply *utils.TPRatingProfile) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "RatingProfileID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRatingProfile(attrs *AttrGetTPRatingProfile, reply *utils.TPRatingProfile) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "RatingProfileID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } tmpRpf := &utils.TPRatingProfile{TPid: attrs.TPid} @@ -111,8 +111,8 @@ type AttrGetTPRatingProfileIds struct { } // GetTPRatingProfileIds queries RatingProfiles identities on specific tariff plan. -func (api *APIerSv1) GetTPRatingProfileIds(attrs AttrGetTPRatingProfileIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPRatingProfileIds(attrs *AttrGetTPRatingProfileIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPRateProfiles, @@ -129,8 +129,8 @@ func (api *APIerSv1) GetTPRatingProfileIds(attrs AttrGetTPRatingProfileIds, repl } // RemoveTPRatingProfile removes specific RatingProfiles on Tariff plan -func (api *APIerSv1) RemoveTPRatingProfile(attrs AttrGetTPRatingProfile, reply *string) (err error) { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "RatingProfileID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPRatingProfile(attrs *AttrGetTPRatingProfile, reply *string) (err error) { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "RatingProfileID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } tmpRpf := new(utils.TPRatingProfile) diff --git a/apier/v1/tpsharedgroups.go b/apier/v1/tpsharedgroups.go index c421289d9..143be45f2 100644 --- a/apier/v1/tpsharedgroups.go +++ b/apier/v1/tpsharedgroups.go @@ -23,11 +23,11 @@ import ( ) // SetTPSharedGroups creates a new SharedGroups profile within a tariff plan -func (api *APIerSv1) SetTPSharedGroups(attrs utils.TPSharedGroups, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID", "SharedGroups"}); len(missing) != 0 { +func (api *APIerSv1) SetTPSharedGroups(attrs *utils.TPSharedGroups, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "SharedGroups"}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } - if err := api.StorDb.SetTPSharedGroups([]*utils.TPSharedGroups{&attrs}); err != nil { + if err := api.StorDb.SetTPSharedGroups([]*utils.TPSharedGroups{attrs}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK @@ -40,8 +40,8 @@ type AttrGetTPSharedGroups struct { } // GetTPSharedGroups queries specific SharedGroup on tariff plan -func (api *APIerSv1) GetTPSharedGroups(attrs AttrGetTPSharedGroups, reply *utils.TPSharedGroups) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPSharedGroups(attrs *AttrGetTPSharedGroups, reply *utils.TPSharedGroups) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } sgs, err := api.StorDb.GetTPSharedGroups(attrs.TPid, attrs.ID) @@ -61,8 +61,8 @@ type AttrGetTPSharedGroupIds struct { } // GetTPSharedGroupIds queries SharedGroups identities on specific tariff plan. -func (api *APIerSv1) GetTPSharedGroupIds(attrs AttrGetTPSharedGroupIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPSharedGroupIds(attrs *AttrGetTPSharedGroupIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPSharedGroups, @@ -78,8 +78,8 @@ func (api *APIerSv1) GetTPSharedGroupIds(attrs AttrGetTPSharedGroupIds, reply *[ } // RemoveTPSharedGroups removes specific SharedGroups on Tariff plan -func (api *APIerSv1) RemoveTPSharedGroups(attrs AttrGetTPSharedGroups, reply *string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) RemoveTPSharedGroups(attrs *AttrGetTPSharedGroups, reply *string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := api.StorDb.RemTpData(utils.TBLTPSharedGroups, attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { diff --git a/apier/v1/tpsharedgroups_it_test.go b/apier/v1/tpsharedgroups_it_test.go index b4b792dc3..f84947198 100644 --- a/apier/v1/tpsharedgroups_it_test.go +++ b/apier/v1/tpsharedgroups_it_test.go @@ -119,7 +119,7 @@ func testTPSharedGroupsRpcConn(t *testing.T) { func testTPSharedGroupsBeforeSet(t *testing.T) { var reply *utils.TPSharedGroups - if err := tpSharedGroupRPC.Call(utils.APIerSv1GetTPSharedGroups, AttrGetTPSharedGroups{TPid: "TPS1", ID: "Group1"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + if err := tpSharedGroupRPC.Call(utils.APIerSv1GetTPSharedGroups, &AttrGetTPSharedGroups{TPid: "TPS1", ID: "Group1"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } @@ -142,7 +142,7 @@ func testTPSharedGroupsSetSharedGroups(t *testing.T) { }, } var result string - if err := tpSharedGroupRPC.Call(utils.APIerSv1SetTPSharedGroups, tpSharedGroups, &result); err != nil { + if err := tpSharedGroupRPC.Call(utils.APIerSv1SetTPSharedGroups, &tpSharedGroups, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Error("Unexpected reply returned", result) @@ -166,7 +166,7 @@ func testTPSharedGroupsGetTPSharedGroupIds(t *testing.T) { var result []string expectedTPID := []string{"Group1"} if err := tpSharedGroupRPC.Call(utils.APIerSv1GetTPSharedGroupIds, - AttrGetTPSharedGroupIds{tpSharedGroups.TPid, utils.PaginatorWithSearch{}}, &result); err != nil { + &AttrGetTPSharedGroupIds{tpSharedGroups.TPid, utils.PaginatorWithSearch{}}, &result); err != nil { t.Error(err) } else if !reflect.DeepEqual(result, expectedTPID) { t.Errorf("Expecting: %+v, received: %+v", result, expectedTPID) @@ -223,7 +223,7 @@ func testTPSharedGroupsRemoveTPSharedGroups(t *testing.T) { func testTPSharedGroupsGetTPSharedGroupsAfterRemove(t *testing.T) { var reply *utils.TPSharedGroups - if err := tpSharedGroupRPC.Call(utils.APIerSv1GetTPSharedGroups, AttrGetTPSharedGroups{TPid: "TPS1", ID: "Group1"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + if err := tpSharedGroupRPC.Call(utils.APIerSv1GetTPSharedGroups, &AttrGetTPSharedGroups{TPid: "TPS1", ID: "Group1"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } diff --git a/apier/v1/tptimings.go b/apier/v1/tptimings.go index 9792456ac..0c5ce627e 100644 --- a/apier/v1/tptimings.go +++ b/apier/v1/tptimings.go @@ -40,8 +40,8 @@ type AttrGetTPTiming struct { } // GetTPTiming queries specific Timing on Tariff plan -func (api *APIerSv1) GetTPTiming(attrs AttrGetTPTiming, reply *utils.ApierTPTiming) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPTiming(attrs *AttrGetTPTiming, reply *utils.ApierTPTiming) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } tms, err := api.StorDb.GetTPTimings(attrs.TPid, attrs.ID) @@ -61,8 +61,8 @@ type AttrGetTPTimingIds struct { } // GetTPTimingIds queries timing identities on specific tariff plan. -func (api *APIerSv1) GetTPTimingIds(attrs AttrGetTPTimingIds, reply *[]string) error { - if missing := utils.MissingStructFields(&attrs, []string{"TPid"}); len(missing) != 0 { //Params missing +func (api *APIerSv1) GetTPTimingIds(attrs *AttrGetTPTimingIds, reply *[]string) error { + if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := api.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPTimings, diff --git a/apier/v1/tptimings_it_test.go b/apier/v1/tptimings_it_test.go index 195d63d2e..980afe9d8 100644 --- a/apier/v1/tptimings_it_test.go +++ b/apier/v1/tptimings_it_test.go @@ -119,7 +119,7 @@ func testTPTimingsRpcConn(t *testing.T) { func testTPTimingsGetTPTimingBeforeSet(t *testing.T) { var reply *utils.ApierTPTiming - if err := tpTimingRPC.Call(utils.APIerSv1GetTPTiming, AttrGetTPTiming{TPid: "TPT1", ID: "Timining"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + if err := tpTimingRPC.Call(utils.APIerSv1GetTPTiming, &AttrGetTPTiming{TPid: "TPT1", ID: "Timining"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } @@ -191,7 +191,7 @@ func testTPTimingsRemoveTPTiming(t *testing.T) { func testTPTimingsGetTPTimingAfterRemove(t *testing.T) { var reply *utils.ApierTPTiming - if err := tpTimingRPC.Call(utils.APIerSv1GetTPTiming, AttrGetTPTiming{TPid: "TPT1", ID: "Timining"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { + if err := tpTimingRPC.Call(utils.APIerSv1GetTPTiming, &AttrGetTPTiming{TPid: "TPT1", ID: "Timining"}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { t.Error(err) } } diff --git a/apier/v2/tp_it_test.go b/apier/v2/tp_it_test.go index 115bcbb2f..4538fccff 100644 --- a/apier/v2/tp_it_test.go +++ b/apier/v2/tp_it_test.go @@ -188,7 +188,7 @@ func testTPitTimings(t *testing.T) { } var rplyTmIDs []string expectedTmIDs := []string{"OFFPEAK_EVENING", "OFFPEAK_MORNING", "OFFPEAK_WEEKEND", "PEAK", tmDummyRemove.ID} - if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil { + if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, &v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil { t.Error("Calling APIerSv1.GetTPTimingIds, got error: ", err.Error()) } else if len(expectedTmIDs) != len(rplyTmIDs) { t.Errorf("Calling APIerSv1.GetTPTimingIds expected: %v, received: %v", expectedTmIDs, rplyTmIDs) @@ -202,7 +202,7 @@ func testTPitTimings(t *testing.T) { // Test getIds rplyTmIDs = []string{} expectedTmIDs = []string{"OFFPEAK_EVENING", "OFFPEAK_MORNING", "OFFPEAK_WEEKEND", "PEAK"} - if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil { + if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, &v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil { t.Error("Calling APIerSv1.GetTPTimingIds, got error: ", err.Error()) } else if len(expectedTmIDs) != len(rplyTmIDs) { t.Errorf("Calling APIerSv1.GetTPTimingIds expected: %v, received: %v", expectedTmIDs, rplyTmIDs) diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index e807d36d4..9cfc7c10a 100755 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -201,7 +201,7 @@ func testDspResTestAuthKey3(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) } - if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, argsRU, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { t.Error(err) } else if reply != eAllocationMsg { // already 3 usages active before allow call, we should have now more than allowed t.Errorf("Expecting: %+v, received: %+v", eAllocationMsg, reply) @@ -222,7 +222,7 @@ func testDspResTestAuthKey3(t *testing.T) { }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &reply); err == nil || err.Error() != utils.ErrResourceUnauthorized.Error() { + &argsRU, &reply); err == nil || err.Error() != utils.ErrResourceUnauthorized.Error() { t.Error(err) } @@ -262,7 +262,7 @@ func testDspResTestAuthKey3(t *testing.T) { APIKey: utils.StringPointer("res12345"), }, } - if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, argsRU, &reply); err != nil { + if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { t.Error(err) } else if reply != "ResGroup1" { t.Error("Unexpected reply returned", reply) diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index b154aebd3..e241e4c38 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -217,7 +217,7 @@ func testV1RsAuthorize(t *testing.T) { Units: 1, } if err := rlsV1Rpc.Call(utils.ResourceSv1AuthorizeResources, - argsRU, &reply2); err.Error() != "RESOURCE_UNAUTHORIZED" { + &argsRU, &reply2); err.Error() != "RESOURCE_UNAUTHORIZED" { t.Error(err) } } diff --git a/sessions/sessions.go b/sessions/sessions.go index fa448ed03..646a7bd52 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -367,7 +367,7 @@ func (sS *SessionS) forceSTerminate(s *Session, extraDebit time.Duration, lastUs // release the resources for the session if len(sS.cgrCfg.SessionSCfg().ResSConns) != 0 && s.ResourceID != "" { var reply string - argsRU := utils.ArgRSv1ResourceUsage{ + argsRU := &utils.ArgRSv1ResourceUsage{ CGREvent: &utils.CGREvent{ Tenant: s.Tenant, ID: utils.GenUUID(), @@ -1918,7 +1918,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(clnt rpcclient.ClientConnector, originID = utils.UUIDSha1Prefix() } var allocMsg string - attrRU := utils.ArgRSv1ResourceUsage{ + attrRU := &utils.ArgRSv1ResourceUsage{ CGREvent: args.CGREvent, UsageID: originID, Units: 1, @@ -2187,7 +2187,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector, if originID == "" { return utils.NewErrMandatoryIeMissing(utils.OriginID) } - attrRU := utils.ArgRSv1ResourceUsage{ + attrRU := &utils.ArgRSv1ResourceUsage{ CGREvent: args.CGREvent, UsageID: originID, Units: 1, @@ -2606,7 +2606,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(clnt rpcclient.ClientConnector, return utils.NewErrMandatoryIeMissing(utils.OriginID) } var reply string - argsRU := utils.ArgRSv1ResourceUsage{ + argsRU := &utils.ArgRSv1ResourceUsage{ CGREvent: args.CGREvent, UsageID: originID, // same ID should be accepted by first group since the previous resource should be expired Units: 1, @@ -2929,7 +2929,7 @@ func (sS *SessionS) BiRPCv1ProcessMessage(clnt rpcclient.ClientConnector, if originID == "" { return utils.NewErrMandatoryIeMissing(utils.OriginID) } - attrRU := utils.ArgRSv1ResourceUsage{ + attrRU := &utils.ArgRSv1ResourceUsage{ CGREvent: args.CGREvent, UsageID: originID, Units: 1, @@ -3270,7 +3270,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, for _, chrs := range chrgrs { runID := chrs.ChargerSProfile - attrRU := utils.ArgRSv1ResourceUsage{ + attrRU := &utils.ArgRSv1ResourceUsage{ CGREvent: chrs.CGREvent, UsageID: originID, Units: 1,