From 71fe3a2813df80a386051e56aa50fb7429f4a6e5 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 18 Nov 2019 09:06:54 +0200 Subject: [PATCH] Replaced methods names with constants in accountd_it_test --- agents/diam_it_test.go | 2 +- agents/httpagent_it_test.go | 2 +- apier/v1/accounts_it_test.go | 34 +++++++++---------- apier/v1/apier_it_test.go | 25 +++++++------- apier/v1/sessionsv1_it_test.go | 2 +- apier/v2/apierv2_it_test.go | 6 ++-- apier/v2/cdrs_offline_it_test.go | 6 ++-- console/balance_add.go | 2 +- console/balance_debit.go | 2 +- console/balance_set.go | 2 +- dispatchers/sessions_it_test.go | 4 +-- engine/actions2_it_test.go | 2 +- engine/actions_it_test.go | 8 ++--- general_tests/a1_it_test.go | 2 +- general_tests/cdrs_it_test.go | 2 +- general_tests/data_it_test.go | 14 ++++---- general_tests/multiplecdrc_it_test.go | 7 ++-- general_tests/session2_it_test.go | 2 +- general_tests/session3_it_test.go | 2 +- general_tests/session_it_test.go | 2 +- ...ion_replications_automaticdebit_it_test.go | 2 +- general_tests/sessionrefund_it_test.go | 4 +-- sessions/sessions_bench_test.go | 2 +- sessions/sessions_birpc_it_test.go | 4 +-- sessions/sessions_data_it_test.go | 10 +++--- sessions/sessions_it_test.go | 2 +- sessions/sessions_voice_it_test.go | 4 +-- utils/consts.go | 4 +++ 28 files changed, 81 insertions(+), 79 deletions(-) diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index c5c8268d9..bdbf4169f 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -865,7 +865,7 @@ func testDiamInitWithSessionDisconnect(t *testing.T) { Value: utils.Float64Pointer(1 * float64(time.Second)), RatingSubject: utils.StringPointer("*zero1ms")} var reply string - if err := apierRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := apierRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index a0eebdf19..d0d6b9510 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -193,7 +193,7 @@ func testHAitAuth1001(t *testing.T) { RatingSubject: utils.StringPointer("*zero5ms"), } var reply string - if err := haRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := haRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index a4aea0bcd..69ea57270 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -114,7 +114,7 @@ func testAccountBalance(t *testing.T, sracc, srten, balType string, expected flo Tenant: srten, Account: sracc, } - if err := accRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { + if err := accRPC.Call(utils.ApierV2GetAccount, attrs, &acnt); err != nil { t.Error(err) } else if rply := acnt.BalanceMap[balType].GetTotalValue(); rply != expected { t.Errorf("Expecting: %v, received: %v", @@ -128,7 +128,7 @@ func testBalanceIfExists(t *testing.T, acc, ten, balType, balID string) (has boo Tenant: ten, Account: acc, } - if err := accRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { + if err := accRPC.Call(utils.ApierV2GetAccount, attrs, &acnt); err != nil { t.Error(err) return false } @@ -151,7 +151,7 @@ func testAccITAddVoiceBalance(t *testing.T) { ExpiryTime: utils.StringPointer(time.Now().Add(5 * time.Second).Format("2006-01-02 15:04:05")), } var reply string - if err := accRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := accRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -230,7 +230,7 @@ func testAccITSetBalanceTimingIds(t *testing.T) { func testAccITDebitBalance(t *testing.T) { time.Sleep(5 * time.Second) var reply string - if err := accRPC.Call("ApierV1.DebitBalance", &AttrAddBalance{ + if err := accRPC.Call(utils.ApierV1DebitBalance, &AttrAddBalance{ Tenant: accTenant, Account: accAcount, BalanceType: utils.VOICE, @@ -260,7 +260,7 @@ func testAccITAddBalance(t *testing.T) { Value: 1.5, Cdrlog: utils.BoolPointer(true), } - if err := accRPC.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) @@ -281,7 +281,7 @@ func testAccITSetBalance(t *testing.T) { attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "testAccSetBalance", BalanceId: utils.StringPointer("testAccSetBalance"), BalanceType: "*monetary", Value: 1.5, Cdrlog: utils.BoolPointer(true)} - if err := accRPC.Call("ApierV1.SetBalance", attrs, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1SetBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.SetBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.SetBalance received: %s", reply) @@ -307,7 +307,7 @@ func testAccITSetBalanceWithExtraData(t *testing.T) { BalanceId: utils.StringPointer("testAccITSetBalanceWithExtraData"), BalanceType: "*monetary", Value: 1.5, Cdrlog: utils.BoolPointer(true), ExtraData: &extraDataMap} - if err := accRPC.Call("ApierV1.SetBalance", attrs, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1SetBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.SetBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.SetBalance received: %s", reply) @@ -335,7 +335,7 @@ func testAccITSetBalanceWithExtraData2(t *testing.T) { BalanceId: utils.StringPointer("testAccITSetBalanceWithExtraData2"), BalanceType: "*monetary", Value: 1.5, Cdrlog: utils.BoolPointer(true), ExtraData: &extraDataMap} - if err := accRPC.Call("ApierV1.SetBalance", attrs, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1SetBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.SetBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.SetBalance received: %s", reply) @@ -362,7 +362,7 @@ func testAccITAddBalanceWithNegative(t *testing.T) { Account: "AddBalanceWithNegative", } - if err := accRPC.Call("ApierV2.GetAccount", attrAcc, &acnt); err.Error() != utils.ErrNotFound.Error() { + if err := accRPC.Call(utils.ApierV2GetAccount, attrAcc, &acnt); err.Error() != utils.ErrNotFound.Error() { t.Error(err) } @@ -374,7 +374,7 @@ func testAccITAddBalanceWithNegative(t *testing.T) { BalanceType: "*monetary", Value: -3.5, } - if err := accRPC.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) @@ -386,13 +386,13 @@ func testAccITAddBalanceWithNegative(t *testing.T) { Tenant: "cgrates.org", Account: "AddBalanceWithNegative", } - if err := accRPC.Call("ApierV2.GetAccount", attrAcc, &acnt); err != nil { + if err := accRPC.Call(utils.ApierV2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 3.5 { t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) } - if err := accRPC.Call("ApierV1.DebitBalance", &AttrAddBalance{ + if err := accRPC.Call(utils.ApierV1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "AddBalanceWithNegative", BalanceType: utils.MONETARY, @@ -403,13 +403,13 @@ func testAccITAddBalanceWithNegative(t *testing.T) { t.Errorf("Received: %s", reply) } - if err := accRPC.Call("ApierV2.GetAccount", attrAcc, &acnt); err != nil { + if err := accRPC.Call(utils.ApierV2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 1.5 { t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) } - if err := accRPC.Call("ApierV1.DebitBalance", &AttrAddBalance{ + if err := accRPC.Call(utils.ApierV1DebitBalance, &AttrAddBalance{ Tenant: "cgrates.org", Account: "AddBalanceWithNegative", BalanceType: utils.MONETARY, @@ -420,7 +420,7 @@ func testAccITAddBalanceWithNegative(t *testing.T) { t.Errorf("Received: %s", reply) } - if err := accRPC.Call("ApierV2.GetAccount", attrAcc, &acnt); err != nil { + if err := accRPC.Call(utils.ApierV2GetAccount, attrAcc, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.MONETARY].GetTotalValue() != 0.5 { t.Errorf("Unexpected balance received : %+v", acnt.BalanceMap[utils.MONETARY].GetTotalValue()) @@ -435,7 +435,7 @@ func testAccITGetDisabledAccounts(t *testing.T) { acnt4 := utils.AttrSetAccount{Tenant: "cgrates.org", Account: "account4", Disabled: utils.BoolPointer(true)} for _, account := range []utils.AttrSetAccount{acnt1, acnt2, acnt3, acnt4} { - if err := accRPC.Call("ApierV1.SetAccount", account, &reply); err != nil { + if err := accRPC.Call(utils.ApierV1SetAccount, account, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) @@ -443,7 +443,7 @@ func testAccITGetDisabledAccounts(t *testing.T) { } var acnts []*engine.Account - if err := accRPC.Call("ApierV2.GetAccounts", utils.AttrGetAccounts{Tenant: "cgrates.org", Disabled: utils.BoolPointer(true)}, + if err := accRPC.Call(utils.ApierV2GetAccount, utils.AttrGetAccounts{Tenant: "cgrates.org", Disabled: utils.BoolPointer(true)}, &acnts); err != nil { t.Error(err) } else if len(acnts) != 3 { diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index f7b091f14..22a2576fb 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -66,7 +66,6 @@ var cfg *config.CGRConfig var rater *rpc.Client var dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here") -var storDbType = flag.String("stordb_type", "mysql", "The type of the storDb database ") var waitRater = flag.Int("wait_rater", 500, "Number of miliseconds to wait for rater to start and cache") func TestApierLoadConfig(t *testing.T) { @@ -917,43 +916,43 @@ func TestApierRemoveRatingPlan(t *testing.T) { func TestApierAddBalance(t *testing.T) { reply := "" attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Value: 1.5} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan", BalanceType: "*monetary", Value: 1.5} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan2", BalanceType: "*monetary", Value: 1.5} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: "*monetary", Value: 1.5} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan3", BalanceType: "*monetary", Value: 2.1} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: "*monetary", Value: 2.1} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) } attrs = &AttrAddBalance{Tenant: "cgrates.org", Account: "dan6", BalanceType: "*monetary", Value: 1, Overwrite: true} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) @@ -1027,7 +1026,7 @@ func TestApierSetActionPlan(t *testing.T) { func TestApierAddTriggeredAction(t *testing.T) { var reply string attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "dan32", BalanceType: "*monetary", Value: 1.5} - if err := rater.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) @@ -1159,7 +1158,7 @@ func TestApierRemAccountActionTriggers(t *testing.T) { func TestApierSetAccount(t *testing.T) { reply := "" attrs := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan7", ActionPlanId: "ATMS_1", ReloadScheduler: true} - if err := rater.Call("ApierV1.SetAccount", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1SetAccount, attrs, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) @@ -1169,7 +1168,7 @@ func TestApierSetAccount(t *testing.T) { *attrs2 = *attrs attrs2.ActionPlanId = "DUMMY_DATA" // Does not exist so it should error when adding triggers on it // Add account with actions timing which does not exist - if err := rater.Call("ApierV1.SetAccount", attrs2, &reply2); err == nil || reply2 == "OK" { // OK is not welcomed + if err := rater.Call(utils.ApierV1SetAccount, attrs2, &reply2); err == nil || reply2 == "OK" { // OK is not welcomed t.Error("Expecting error on ApierV1.SetAccount.", err, reply2) } } @@ -1260,13 +1259,13 @@ func TestApierGetAccount(t *testing.T) { func TestApierTriggersExecute(t *testing.T) { reply := "" attrs := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan8", ReloadScheduler: true} - if err := rater.Call("ApierV1.SetAccount", attrs, &reply); err != nil { + if err := rater.Call(utils.ApierV1SetAccount, attrs, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) } attrAddBlnc := &AttrAddBalance{Tenant: "cgrates.org", Account: "1008", BalanceType: "*monetary", Value: 2} - if err := rater.Call("ApierV1.AddBalance", attrAddBlnc, &reply); err != nil { + if err := rater.Call(utils.ApierV1AddBalance, attrAddBlnc, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index a4eaf5d50..fc66e0e1a 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -839,7 +839,7 @@ func testSSv1ItDynamicDebit(t *testing.T) { Value: utils.Float64Pointer(2 * float64(time.Second)), RatingSubject: utils.StringPointer("*zero5ms")} var reply string - if err := sSApierRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sSApierRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index eec7d4a0f..d3111768b 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -104,7 +104,7 @@ func TestApierV2itAddBalance(t *testing.T) { Weight: utils.Float64Pointer(10.0), } var reply string - if err := apierRPC.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := apierRPC.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Fatal(err) } var acnt engine.Account @@ -172,7 +172,7 @@ func TestApierV2itFraudMitigation(t *testing.T) { Weight: utils.Float64Pointer(10.0), } var reply string - if err := apierRPC.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := apierRPC.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Fatal(err) } var acnt engine.Account @@ -315,7 +315,7 @@ func TestApierV2itSetAccountWithAP(t *testing.T) { func TestApierV2itSetActionWithCategory(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "TestApierV2itSetActionWithCategory"} - if err := apierRPC.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil { + if err := apierRPC.Call(utils.ApierV1SetAccount, attrsSetAccount, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) diff --git a/apier/v2/cdrs_offline_it_test.go b/apier/v2/cdrs_offline_it_test.go index bbb16b04d..88e082b40 100644 --- a/apier/v2/cdrs_offline_it_test.go +++ b/apier/v2/cdrs_offline_it_test.go @@ -131,7 +131,7 @@ func testV2CDRsOfflineBalanceUpdate(t *testing.T) { Weight: utils.Float64Pointer(10.0), } var reply string - if err := cdrsOfflineRpc.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := cdrsOfflineRpc.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Fatal(err) } var acnt *engine.Account @@ -338,11 +338,11 @@ func testV2CDRsBalancesWithSameWeight(t *testing.T) { Weight: utils.Float64Pointer(10.0), } var reply string - if err := cdrsOfflineRpc.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := cdrsOfflineRpc.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Fatal(err) } attrs.BalanceID = utils.StringPointer("SpecialBalance2") - if err := cdrsOfflineRpc.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := cdrsOfflineRpc.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Fatal(err) } var acnt *engine.Account diff --git a/console/balance_add.go b/console/balance_add.go index 3c03e2ef0..8fc6c4260 100644 --- a/console/balance_add.go +++ b/console/balance_add.go @@ -26,7 +26,7 @@ import ( func init() { c := &CmdAddBalance{ name: "balance_add", - rpcMethod: "ApierV1.AddBalance", + rpcMethod: utils.ApierV1AddBalance, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/balance_debit.go b/console/balance_debit.go index 651e6c813..7c1dde92d 100644 --- a/console/balance_debit.go +++ b/console/balance_debit.go @@ -23,7 +23,7 @@ import "github.com/cgrates/cgrates/apier/v1" func init() { c := &CmdBalanceDebit{ name: "balance_debit", - rpcMethod: "ApierV1.DebitBalance", + rpcMethod: utils.ApierV1DebitBalance, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/console/balance_set.go b/console/balance_set.go index b9662c52d..b2ba51a3d 100644 --- a/console/balance_set.go +++ b/console/balance_set.go @@ -25,7 +25,7 @@ import ( func init() { c := &CmdSetBalance{ name: "balance_set", - rpcMethod: "ApierV1.SetBalance", + rpcMethod: utils.ApierV1SetBalance, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 4f031dea4..1d50b0014 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -77,7 +77,7 @@ func testDspSessionAddBalacne(t *testing.T) { RatingSubject: utils.StringPointer("*zero5ms"), } var reply string - if err := allEngine.RCP.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := allEngine.RCP.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -94,7 +94,7 @@ func testDspSessionAddBalacne(t *testing.T) { t.Errorf("Expecting: %v, received: %v", time.Duration(eAcntVal), time.Duration(acnt.BalanceMap[utils.VOICE].GetTotalValue())) } - if err := allEngine2.RCP.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := allEngine2.RCP.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/engine/actions2_it_test.go b/engine/actions2_it_test.go index a897d74d4..08896a430 100644 --- a/engine/actions2_it_test.go +++ b/engine/actions2_it_test.go @@ -227,7 +227,7 @@ func testActionsExecuteRemoveSMCos2(t *testing.T) { func testActionsUpdateBalance(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "testAcc"} - if err := actsRPC.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil { + if err := actsRPC.Call(utils.ApierV1SetAccount, attrsSetAccount, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) diff --git a/engine/actions_it_test.go b/engine/actions_it_test.go index 558919a58..4653abd35 100644 --- a/engine/actions_it_test.go +++ b/engine/actions_it_test.go @@ -79,7 +79,7 @@ func TestActionsitRpcConn(t *testing.T) { func TestActionsitSetCdrlogDebit(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2904"} - if err := actsLclRpc.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil { + if err := actsLclRpc.Call(utils.ApierV1SetAccount, attrsSetAccount, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) @@ -122,7 +122,7 @@ func TestActionsitSetCdrlogDebit(t *testing.T) { func TestActionsitSetCdrlogTopup(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "dan2905"} - if err := actsLclRpc.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil { + if err := actsLclRpc.Call(utils.ApierV1SetAccount, attrsSetAccount, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) @@ -241,7 +241,7 @@ func TestActionsitThresholdCDrLog(t *testing.T) { var reply string attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "th_acc"} - if err := actsLclRpc.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil { + if err := actsLclRpc.Call(utils.ApierV1SetAccount, attrsSetAccount, &reply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if reply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", reply) @@ -366,7 +366,7 @@ func TestActionsitCDRAccount(t *testing.T) { Value: float64(30 * time.Second), Overwrite: true, } - if err := actsLclRpc.Call("ApierV1.AddBalance", attrs, &reply); err != nil { + if err := actsLclRpc.Call(utils.ApierV1AddBalance, attrs, &reply); err != nil { t.Error("Got error on ApierV1.AddBalance: ", err.Error()) } else if reply != "OK" { t.Errorf("Calling ApierV1.AddBalance received: %s", reply) diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index c43887366..52db4c7b1 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -158,7 +158,7 @@ func testA1itAddBalance1(t *testing.T) { argAdd := &v1.AttrAddBalance{Tenant: "cgrates.org", Account: "rpdata1", BalanceType: utils.DATA, BalanceId: utils.StringPointer("rpdata1_test"), Value: 10000000000} - if err := a1rpc.Call("ApierV1.AddBalance", argAdd, &reply); err != nil { + if err := a1rpc.Call(utils.ApierV1AddBalance, argAdd, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf(reply) diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index 888d7772c..083210963 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -511,7 +511,7 @@ func testV2CDRsSetThresholdProfile(t *testing.T) { // Set Account attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "testV2CDRsProcessCDR5"} - if err := cdrsRpc.Call("ApierV1.SetAccount", attrsSetAccount, &actreply); err != nil { + if err := cdrsRpc.Call(utils.ApierV1SetAccount, attrsSetAccount, &actreply); err != nil { t.Error("Got error on ApierV1.SetAccount: ", err.Error()) } else if actreply != utils.OK { t.Errorf("Calling ApierV1.SetAccount received: %s", actreply) diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index e16cab22f..96db33383 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -134,7 +134,7 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { RatingSubject: utils.StringPointer("*zero10000ns"), } var reply string - if err := dataRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := dataRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -211,7 +211,7 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { RatingSubject: utils.StringPointer("*zero10000ns"), } var reply string - if err := dataRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := dataRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -230,7 +230,7 @@ func testV1DataDebitBalanceWith10Kilo(t *testing.T) { expected, rply) } tStart := time.Now() - if err := dataRpc.Call("ApierV1.DebitBalance", &v1.AttrAddBalance{ + if err := dataRpc.Call(utils.ApierV1DebitBalance, &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance", BalanceType: utils.DATA, @@ -268,7 +268,7 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { RatingSubject: utils.StringPointer("*zero10000ns"), } var reply string - if err := dataRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := dataRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -345,7 +345,7 @@ func testV1DataDebitBalance1G0(t *testing.T) { RatingSubject: utils.StringPointer("*zero10000ns"), } var reply string - if err := dataRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := dataRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -364,7 +364,7 @@ func testV1DataDebitBalance1G0(t *testing.T) { expected, rply) } tStart := time.Now() - if err := dataRpc.Call("ApierV1.DebitBalance", &v1.AttrAddBalance{ + if err := dataRpc.Call(utils.ApierV1DebitBalance, &v1.AttrAddBalance{ Tenant: "cgrates.org", Account: "testV1DataDebitBalance1G0", BalanceType: utils.DATA, @@ -402,7 +402,7 @@ func testV1DataInitSession(t *testing.T) { RatingSubject: utils.StringPointer("*zero10000ns"), } var reply string - if err := dataRpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := dataRpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/general_tests/multiplecdrc_it_test.go b/general_tests/multiplecdrc_it_test.go index 0ea8bb82c..bafe4d8ed 100644 --- a/general_tests/multiplecdrc_it_test.go +++ b/general_tests/multiplecdrc_it_test.go @@ -40,10 +40,9 @@ var ( cfg *config.CGRConfig rater *rpc.Client - testCalls = flag.Bool("calls", false, "Run test calls simulation, not by default.") - dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here") - storDbType = flag.String("stordb_type", "mysql", "The type of the storDb database ") - waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache") + testCalls = flag.Bool("calls", false, "Run test calls simulation, not by default.") + dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here") + waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache") sTestMCDRC = []func(t *testing.T){ testMCDRCLoadConfig, diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index 579e9c7da..8a6e74aa5 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -118,7 +118,7 @@ func testSes2ItInitSession(t *testing.T) { Value: utils.Float64Pointer(float64(time.Hour)), } var reply string - if err := ses2RPC.Call("ApierV2.SetBalance", + if err := ses2RPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Fatal(err) } diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 039e11736..184dea769 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -255,7 +255,7 @@ func testSes3ItAddVoiceBalance(t *testing.T) { RatingSubject: utils.StringPointer("*zero5ms"), } var reply string - if err := ses3RPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := ses3RPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index d2bd31f32..8ddab23dc 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -126,7 +126,7 @@ func testSesItAddVoiceBalance(t *testing.T) { RatingSubject: utils.StringPointer("*zero1s"), } var reply string - if err := sesRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sesRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 787751926..726f27920 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -71,7 +71,7 @@ func testSessionSRplAddVoiceBalance(t *testing.T) { RatingSubject: utils.StringPointer("*zero5ms"), } var reply string - if err := smgRplcMstrRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := smgRplcMstrRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 55364fed9..8909b873b 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -128,7 +128,7 @@ func testSrItAddVoiceBalance(t *testing.T) { RatingSubject: utils.StringPointer("*zero5ms"), } var reply string - if err := srrpc.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := srrpc.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -215,7 +215,7 @@ func testSrItAddMonetaryBalance(t *testing.T) { Value: utils.Float64Pointer(10.65), } var reply string - if err := srrpc.Call("ApierV2.SetBalance", attrs, &reply); err != nil { + if err := srrpc.Call(utils.ApierV2SetBalance, attrs, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/sessions/sessions_bench_test.go b/sessions/sessions_bench_test.go index 895363044..fb419462f 100644 --- a/sessions/sessions_bench_test.go +++ b/sessions/sessions_bench_test.go @@ -82,7 +82,7 @@ func addBalance(sBenchRPC *rpc.Client, sraccount string) { Value: utils.Float64Pointer(5 * float64(time.Hour)), } var reply string - if err := sBenchRPC.Call("ApierV2.SetBalance", + if err := sBenchRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { log.Fatal(err) } diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 39f60ca26..992b050d0 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -116,7 +116,7 @@ func TestSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { Value: utils.Float64Pointer(0.01 * float64(time.Second)), RatingSubject: utils.StringPointer("*zero1ms")} var reply string - if err := sessionsRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sessionsRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -237,7 +237,7 @@ func TestSessionsBiRPCSessionOriginatorTerminate(t *testing.T) { Value: utils.Float64Pointer(1 * float64(time.Second)), RatingSubject: utils.StringPointer("*zero1ms")} var reply string - if err := sessionsRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sessionsRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index b3ccfae84..a395b598e 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -239,7 +239,7 @@ func TestSessionsDataLastUsedMultipleUpdates(t *testing.T) { BalanceID: utils.StringPointer("TestSessionsDataLastUsedMultipleData"), Value: utils.Float64Pointer(eAcntVal)} var reply string - if err := sDataRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sDataRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -498,7 +498,7 @@ func TestSessionsDataTTLExpired(t *testing.T) { BalanceID: utils.StringPointer("TestSessionsDataTTLExpired"), Value: utils.Float64Pointer(eAcntVal)} var reply string - if err := sDataRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sDataRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -572,7 +572,7 @@ func TestSessionsDataTTLExpMultiUpdates(t *testing.T) { BalanceID: utils.StringPointer("TestSessionsDataTTLExpMultiUpdates"), Value: utils.Float64Pointer(eAcntVal)} var reply string - if err := sDataRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sDataRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -695,7 +695,7 @@ func TestSessionsDataMultipleDataNoUsage(t *testing.T) { BalanceID: utils.StringPointer("TestSessionsDataTTLExpMultiUpdates"), Value: utils.Float64Pointer(eAcntVal)} var reply string - if err := sDataRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sDataRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -900,7 +900,7 @@ func TestSessionsDataTTLUsageProtection(t *testing.T) { Value: utils.Float64Pointer(eAcntVal), } var reply string - if err := sDataRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sDataRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 8be8d6227..484e0e63b 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -343,7 +343,7 @@ func TestSessionsItEventCostCompressing(t *testing.T) { RatingSubject: utils.StringPointer("*zero50ms"), } var reply string - if err := sItRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sItRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 17e39a808..098c0364e 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -900,7 +900,7 @@ func TestSessionsVoiceSessionTTLWithRelocate(t *testing.T) { RatingSubject: utils.StringPointer("*zero50ms"), } var reply string - if err := sessionsRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sessionsRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) @@ -1069,7 +1069,7 @@ func TestSessionsVoiceRelocateWithOriginIDPrefix(t *testing.T) { RatingSubject: utils.StringPointer("*zero1s"), } var reply string - if err := sessionsRPC.Call("ApierV2.SetBalance", attrSetBalance, &reply); err != nil { + if err := sessionsRPC.Call(utils.ApierV2SetBalance, attrSetBalance, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Received: %s", reply) diff --git a/utils/consts.go b/utils/consts.go index 673ab75b5..07ed4630a 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -863,6 +863,9 @@ const ( ApierV1RemoveRatingPlan = "ApierV1.RemoveRatingPlan" ApierV1GetDestination = "ApierV1.GetDestination" ApierV1GetReverseDestination = "ApierV1.GetReverseDestination" + ApierV1AddBalance = "ApierV1.AddBalance" + ApierV1DebitBalance = "ApierV1.DebitBalance" + ApierV1SetAccount = "ApierV1.SetAccount" ) const ( @@ -872,6 +875,7 @@ const ( ApierV2GetAccount = "ApierV2.GetAccount" ApierV2SetAccount = "ApierV2.SetAccount" ApierV2CountCDRs = "ApierV2.CountCDRs" + ApierV2SetBalance = "ApierV2.SetBalance" ) const (