From 0d36b0cecfcf885a8d077edf59751557afbce8e7 Mon Sep 17 00:00:00 2001 From: andronache Date: Tue, 23 Mar 2021 10:15:43 +0200 Subject: [PATCH] Changed Opts in structs in apier to APIOpts --- agents/diam_it_test.go | 4 ++-- apier/v1/accountsv1_it_test.go | 6 ++--- apier/v1/apier.go | 10 ++++----- apier/v1/apier_it_test.go | 2 +- apier/v1/auth.go | 4 ++-- apier/v1/chargers.go | 10 ++++----- apier/v1/chargers_it_test.go | 16 +++++++------- apier/v1/cost_bench_it_test.go | 4 ++-- apier/v1/costs.go | 4 ++-- apier/v1/debit.go | 6 ++--- apier/v1/debit_test.go | 2 +- apier/v1/ees_it_test.go | 2 +- apier/v1/filter_indexes_it_test.go | 12 +++++----- apier/v1/full_remote_it_test.go | 2 +- apier/v1/rateprofiles.go | 22 +++++++++---------- apier/v1/rateprofiles_it_test.go | 22 +++++++++---------- apier/v1/remote_it_test.go | 2 +- apier/v1/replicate_it_test.go | 2 +- apier/v2/apier.go | 2 +- apier/v2/attributes.go | 10 ++++----- apier/v2/attributes_it_test.go | 6 ++--- apier/v2/cdrs_it_test.go | 12 +++++----- console/attributes_profile_set.go | 6 ++--- console/chargers_profile_set.go | 6 ++--- console/cost.go | 2 +- console/maxusage.go | 4 ++-- console/rates_profile_set.go | 8 +++---- dispatchers/cdrs.go | 4 ++-- dispatchers/cdrs_it_test.go | 2 +- engine/cdr.go | 4 ++-- engine/storage_utils.go | 2 +- ers/filefwv_it_test.go | 2 +- ers/filejson_it_test.go | 4 ++-- ers/flatstore_it_test.go | 2 +- ers/partial_csv_it_test.go | 2 +- general_tests/a1_it_test.go | 2 +- general_tests/cacherpl_it_test.go | 4 ++-- general_tests/cdrs_exp_it_test.go | 2 +- general_tests/data_it_test.go | 4 ++-- general_tests/filtered_replication_it_test.go | 4 ++-- general_tests/filters_it_test.go | 4 ++-- general_tests/gocs_it_test.go | 2 +- general_tests/sessions_concur_test.go | 2 +- utils/apitpdata.go | 4 ++-- utils/librates.go | 4 ++-- 45 files changed, 121 insertions(+), 121 deletions(-) diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index 32b5a3868..c69121a2a 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -1454,7 +1454,7 @@ func testDiamItEmulateTerminate(t *testing.T) { } var result string //add the second charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.com", ID: "CustomCharger", @@ -1470,7 +1470,7 @@ func testDiamItEmulateTerminate(t *testing.T) { t.Error("Unexpected reply returned", result) } //add the second charger - chargerProfile2 := &v1.ChargerWithOpts{ + chargerProfile2 := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.com", ID: "Default", diff --git a/apier/v1/accountsv1_it_test.go b/apier/v1/accountsv1_it_test.go index 6cbe91275..d0b09bf94 100644 --- a/apier/v1/accountsv1_it_test.go +++ b/apier/v1/accountsv1_it_test.go @@ -803,7 +803,7 @@ func testAccountSv1DebitWithAttributeSandRateS(t *testing.T) { } if err := acntSRPC.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err != nil { t.Fatal(err) @@ -900,7 +900,7 @@ func testAccountSv1DebitWithRateS(t *testing.T) { } if err := acntSRPC.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err != nil { t.Fatal(err) @@ -1004,7 +1004,7 @@ func testAccountSv1DebitWithRateS2(t *testing.T) { } if err := acntSRPC.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err != nil { t.Fatal(err) diff --git a/apier/v1/apier.go b/apier/v1/apier.go index ecab97640..1ed9e1f8f 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -363,7 +363,7 @@ type AttrLoadTpFromStorDb struct { TPid string DryRun bool // Only simulate, no write Validate bool // Run structural checks - Opts map[string]interface{} + APIOpts map[string]interface{} Caching *string // Caching strategy } @@ -402,7 +402,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromStorDb(attrs *AttrLoadTpFromStorDb, } // reload cache utils.Logger.Info("APIerSv1.LoadTariffPlanFromStorDb, reloading cache.") - if err := dbReader.ReloadCache(caching, true, attrs.Opts); err != nil { + if err := dbReader.ReloadCache(caching, true, attrs.APIOpts); err != nil { return utils.NewErrServerError(err) } if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -1084,7 +1084,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFo } // reload cache utils.Logger.Info("APIerSv1.LoadTariffPlanFromFolder, reloading cache.") - if err := loader.ReloadCache(caching, true, attrs.Opts); err != nil { + if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil { return utils.NewErrServerError(err) } if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -1150,7 +1150,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromFolder(attrs *utils.AttrLoadTpFromFolder, } // reload cache utils.Logger.Info("APIerSv1.RemoveTPFromFolder, reloading cache.") - if err := loader.ReloadCache(caching, true, attrs.Opts); err != nil { + if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil { return utils.NewErrServerError(err) } if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -1202,7 +1202,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromStorDB(attrs *AttrLoadTpFromStorDb, reply } // reload cache utils.Logger.Info("APIerSv1.RemoveTPFromStorDB, reloading cache.") - if err := dbReader.ReloadCache(caching, true, attrs.Opts); err != nil { + if err := dbReader.ReloadCache(caching, true, attrs.APIOpts); err != nil { return utils.NewErrServerError(err) } if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 { diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 492ae04f1..3867dee71 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1681,7 +1681,7 @@ func testApierResetDataAfterLoadFromFolder(t *testing.T) { func testApierSetChargerS(t *testing.T) { //add a default charger - chargerProfile := &ChargerWithOpts{ + chargerProfile := &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/apier/v1/auth.go b/apier/v1/auth.go index 52deb46ff..c2d4a86ee 100644 --- a/apier/v1/auth.go +++ b/apier/v1/auth.go @@ -27,7 +27,7 @@ import ( ) // Returns MaxUsage (for calls in seconds), -1 for no limit -func (apierSv1 *APIerSv1) GetMaxUsage(usageRecord *engine.UsageRecordWithOpts, maxUsage *int64) error { +func (apierSv1 *APIerSv1) GetMaxUsage(usageRecord *engine.UsageRecordWithAPIOpts, maxUsage *int64) error { if apierSv1.Responder == nil { return utils.NewErrNotConnected(utils.RALService) } @@ -60,7 +60,7 @@ func (apierSv1 *APIerSv1) GetMaxUsage(usageRecord *engine.UsageRecordWithOpts, m var maxDur time.Duration if err := apierSv1.Responder.GetMaxSessionTime(&engine.CallDescriptorWithAPIOpts{ CallDescriptor: cd, - APIOpts: usageRecord.Opts, + APIOpts: usageRecord.APIOpts, }, &maxDur); err != nil { return err } diff --git a/apier/v1/chargers.go b/apier/v1/chargers.go index 33578a409..5a1d1da32 100644 --- a/apier/v1/chargers.go +++ b/apier/v1/chargers.go @@ -64,13 +64,13 @@ func (apierSv1 *APIerSv1) GetChargerProfileIDs(args *utils.PaginatorWithTenant, return nil } -type ChargerWithOpts struct { +type ChargerWithAPIOpts struct { *engine.ChargerProfile - Opts map[string]interface{} + APIOpts map[string]interface{} } //SetChargerProfile add/update a new Charger Profile -func (apierSv1 *APIerSv1) SetChargerProfile(arg *ChargerWithOpts, reply *string) error { +func (apierSv1 *APIerSv1) SetChargerProfile(arg *ChargerWithAPIOpts, reply *string) error { if missing := utils.MissingStructFields(arg.ChargerProfile, []string{utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -85,8 +85,8 @@ func (apierSv1 *APIerSv1) SetChargerProfile(arg *ChargerWithOpts, reply *string) return utils.APIErrorHandler(err) } //handle caching for ChargerProfile - if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), arg.Tenant, utils.CacheChargerProfiles, - arg.TenantID(), &arg.FilterIDs, nil, arg.Opts); err != nil { + if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), arg.Tenant, utils.CacheChargerProfiles, + arg.TenantID(), &arg.FilterIDs, nil, arg.APIOpts); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index 8cb172491..09d081ef7 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -37,7 +37,7 @@ var ( chargerCfgPath string chargerCfg *config.CGRConfig chargerRPC *rpc.Client - chargerProfile *ChargerWithOpts + chargerProfile *ChargerWithAPIOpts chargerConfigDIR string //run tests for specific configuration chargerEvent = []*utils.CGREvent{ @@ -149,7 +149,7 @@ func testChargerSRPCConn(t *testing.T) { } func testChargerSLoadAddCharger(t *testing.T) { - chargerProfile := &ChargerWithOpts{ + chargerProfile := &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Charger1", @@ -169,7 +169,7 @@ func testChargerSLoadAddCharger(t *testing.T) { } else if result != utils.OK { t.Error("Unexpected reply returned", result) } - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Charger2", @@ -189,7 +189,7 @@ func testChargerSLoadAddCharger(t *testing.T) { t.Error("Unexpected reply returned", result) } - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "ChargerNotMatching", @@ -367,7 +367,7 @@ func testChargerSProcessEvent(t *testing.T) { } func testChargerSSetChargerProfile(t *testing.T) { - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "ApierTest", @@ -478,7 +478,7 @@ func testChargerSPing(t *testing.T) { func testChargerSProcessWithNotFoundAttribute(t *testing.T) { var result string - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "ChargerWithoutAttribute", @@ -540,7 +540,7 @@ func testChargerSKillEngine(t *testing.T) { } func testChargerSProccessEventWithProcceSRunS(t *testing.T) { - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "ApierTest", @@ -604,7 +604,7 @@ func testChargerSProccessEventWithProcceSRunS(t *testing.T) { } func testChargerSSetChargerProfileWithoutTenant(t *testing.T) { - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ ID: "randomID", FilterIDs: []string{"*string:~*req.Account:1010"}, diff --git a/apier/v1/cost_bench_it_test.go b/apier/v1/cost_bench_it_test.go index 3526136c3..167aacbc3 100644 --- a/apier/v1/cost_bench_it_test.go +++ b/apier/v1/cost_bench_it_test.go @@ -95,7 +95,7 @@ func testCostBenchLoadFromFolder2(b *testing.B) { } func testCostBenchSetRateProfile(b *testing.B) { - rPrf := &utils.APIRateProfileWithOpts{ + rPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ ID: "DefaultRate", FilterIDs: []string{"*string:~*req.Subject:1001"}, @@ -163,7 +163,7 @@ func testCostBenchSetRateProfile2(b *testing.B) { Increment: utils.Float64Pointer(1000000000), }}, } - rPrf := &utils.APIRateProfileWithOpts{ + rPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ ID: "RateChristmas", FilterIDs: []string{"*string:~*req.Subject:1010"}, diff --git a/apier/v1/costs.go b/apier/v1/costs.go index 421fe81e0..426e6b980 100644 --- a/apier/v1/costs.go +++ b/apier/v1/costs.go @@ -32,7 +32,7 @@ type AttrGetCost struct { AnswerTime string Destination string Usage string - Opts map[string]interface{} + APIOpts map[string]interface{} } func (apierSv1 *APIerSv1) GetCost(attrs *AttrGetCost, ec *engine.EventCost) error { @@ -62,7 +62,7 @@ func (apierSv1 *APIerSv1) GetCost(attrs *AttrGetCost, ec *engine.EventCost) erro if err := apierSv1.Responder.GetCost( &engine.CallDescriptorWithAPIOpts{ CallDescriptor: cd, - APIOpts: attrs.Opts, + APIOpts: attrs.APIOpts, }, &cc); err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v1/debit.go b/apier/v1/debit.go index a69431372..651294bc4 100644 --- a/apier/v1/debit.go +++ b/apier/v1/debit.go @@ -25,7 +25,7 @@ import ( // DebitUsage will debit the balance for the usage cost, allowing the // account to go negative if the cost calculated is greater than the balance -func (apierSv1 *APIerSv1) DebitUsage(usageRecord *engine.UsageRecordWithOpts, reply *string) error { +func (apierSv1 *APIerSv1) DebitUsage(usageRecord *engine.UsageRecordWithAPIOpts, reply *string) error { return apierSv1.DebitUsageWithOptions(&AttrDebitUsageWithOptions{ UsageRecord: usageRecord, AllowNegativeAccount: true, @@ -34,7 +34,7 @@ func (apierSv1 *APIerSv1) DebitUsage(usageRecord *engine.UsageRecordWithOpts, re // AttrDebitUsageWithOptions represents the DebitUsage request type AttrDebitUsageWithOptions struct { - UsageRecord *engine.UsageRecordWithOpts + UsageRecord *engine.UsageRecordWithAPIOpts AllowNegativeAccount bool // allow account to go negative during debit } @@ -80,7 +80,7 @@ func (apierSv1 *APIerSv1) DebitUsageWithOptions(args *AttrDebitUsageWithOptions, var cc engine.CallCost if err := apierSv1.Responder.Debit(&engine.CallDescriptorWithAPIOpts{ CallDescriptor: cd, - APIOpts: args.UsageRecord.Opts, + APIOpts: args.UsageRecord.APIOpts, }, &cc); err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v1/debit_test.go b/apier/v1/debit_test.go index fb1f81207..aadcdd38b 100644 --- a/apier/v1/debit_test.go +++ b/apier/v1/debit_test.go @@ -147,7 +147,7 @@ func TestDebitUsageWithOptions(t *testing.T) { var reply string if err := apierDebit.DebitUsageWithOptions(&AttrDebitUsageWithOptions{ - UsageRecord: &engine.UsageRecordWithOpts{UsageRecord: usageRecord}, + UsageRecord: &engine.UsageRecordWithAPIOpts{UsageRecord: usageRecord}, AllowNegativeAccount: false}, &reply); err != nil { t.Error(err) } diff --git a/apier/v1/ees_it_test.go b/apier/v1/ees_it_test.go index 94f57bcc2..84fc95737 100644 --- a/apier/v1/ees_it_test.go +++ b/apier/v1/ees_it_test.go @@ -124,7 +124,7 @@ func testEEsRPCConn(t *testing.T) { func testEEsAddCDRs(t *testing.T) { //add a default charger - chargerProfile := &ChargerWithOpts{ + chargerProfile := &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go index 732094878..085073ea8 100644 --- a/apier/v1/filter_indexes_it_test.go +++ b/apier/v1/filter_indexes_it_test.go @@ -1818,7 +1818,7 @@ func testV1FISetRateProfileRatesIndexes(t *testing.T) { } //set in db a ratePrf with double populated rates with our filter - ratePrfRates := &utils.APIRateProfileWithOpts{ + ratePrfRates := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP1", @@ -1996,7 +1996,7 @@ func testV1FISetSecondRateProfileRate(t *testing.T) { } //append a new rate in the same rate profile - ratePrfRates := &utils.APIRateProfileWithOpts{ + ratePrfRates := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP1", @@ -2126,7 +2126,7 @@ func testVF1RemoveRateProfileRates(t *testing.T) { //removing rates from db will delete the indexes from db var result string if err := tFIdxRpc.Call(utils.APIerSv1RemoveRateProfileRates, - &RemoveRPrfRatesWithOpts{ID: "RP1", + &RemoveRPrfRatesWithAPIOpts{ID: "RP1", Tenant: tenant, RateIDs: []string{"RT_WEEK", "RT_YEAR"}}, &result); err != nil { t.Error(err) @@ -2190,7 +2190,7 @@ func testVF1RemoveRateProfileRates(t *testing.T) { //no we will remove the left rate and the profile if err := tFIdxRpc.Call(utils.APIerSv1RemoveRateProfileRates, - &RemoveRPrfRatesWithOpts{ID: "RP1", + &RemoveRPrfRatesWithAPIOpts{ID: "RP1", Tenant: tenant, RateIDs: []string{"RT_MONTH"}}, &result); err != nil { t.Error(err) @@ -2244,7 +2244,7 @@ func testV1FISetRateProfileIndexes(t *testing.T) { t.Error(err) } //set in db a ratePrf with with our filterS - ratePrfRates := &utils.APIRateProfileWithOpts{ + ratePrfRates := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP2", @@ -2419,7 +2419,7 @@ func testV1FISetSecondRateProfile(t *testing.T) { } //another rate profile - ratePrfRates := &utils.APIRateProfileWithOpts{ + ratePrfRates := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP3", diff --git a/apier/v1/full_remote_it_test.go b/apier/v1/full_remote_it_test.go index 914948742..a61f5c688 100644 --- a/apier/v1/full_remote_it_test.go +++ b/apier/v1/full_remote_it_test.go @@ -596,7 +596,7 @@ func testFullRemoteITRate(t *testing.T) { } var replySet string - apiRPrf := &utils.APIRateProfileWithOpts{ + apiRPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP1", diff --git a/apier/v1/rateprofiles.go b/apier/v1/rateprofiles.go index 8269040c1..ed4dea0d2 100644 --- a/apier/v1/rateprofiles.go +++ b/apier/v1/rateprofiles.go @@ -88,7 +88,7 @@ func (apierSv1 *APIerSv1) GetRateProfileIDsCount(args *utils.TenantWithAPIOpts, } //SetRateProfile add/update a new Rate Profile -func (apierSv1 *APIerSv1) SetRateProfile(ext *utils.APIRateProfileWithOpts, reply *string) error { +func (apierSv1 *APIerSv1) SetRateProfile(ext *utils.APIRateProfileWithAPIOpts, reply *string) error { if missing := utils.MissingStructFields(ext.APIRateProfile, []string{utils.ID, utils.Rates}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -106,8 +106,8 @@ func (apierSv1 *APIerSv1) SetRateProfile(ext *utils.APIRateProfileWithOpts, repl if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheRateProfiles: time.Now().UnixNano()}); err != nil { return utils.APIErrorHandler(err) } - if err := apierSv1.CallCache(utils.IfaceAsString(ext.Opts[utils.CacheOpt]), rPrf.Tenant, utils.CacheRateProfiles, - rPrf.TenantID(), &rPrf.FilterIDs, nil, ext.Opts); err != nil { + if err := apierSv1.CallCache(utils.IfaceAsString(ext.APIOpts[utils.CacheOpt]), rPrf.Tenant, utils.CacheRateProfiles, + rPrf.TenantID(), &rPrf.FilterIDs, nil, ext.APIOpts); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK @@ -115,7 +115,7 @@ func (apierSv1 *APIerSv1) SetRateProfile(ext *utils.APIRateProfileWithOpts, repl } //SetRateProfileRates add/update Rates from existing RateProfiles -func (apierSv1 *APIerSv1) SetRateProfileRates(ext *utils.APIRateProfileWithOpts, reply *string) (err error) { +func (apierSv1 *APIerSv1) SetRateProfileRates(ext *utils.APIRateProfileWithAPIOpts, reply *string) (err error) { if missing := utils.MissingStructFields(ext.APIRateProfile, []string{utils.ID, utils.Rates}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -133,22 +133,22 @@ func (apierSv1 *APIerSv1) SetRateProfileRates(ext *utils.APIRateProfileWithOpts, if err = apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheRateProfiles: time.Now().UnixNano()}); err != nil { return utils.APIErrorHandler(err) } - if err = apierSv1.CallCache(utils.IfaceAsString(ext.Opts[utils.CacheOpt]), rPrf.Tenant, utils.CacheRateProfiles, - rPrf.TenantID(), &rPrf.FilterIDs, nil, ext.Opts); err != nil { + if err = apierSv1.CallCache(utils.IfaceAsString(ext.APIOpts[utils.CacheOpt]), rPrf.Tenant, utils.CacheRateProfiles, + rPrf.TenantID(), &rPrf.FilterIDs, nil, ext.APIOpts); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK return nil } -type RemoveRPrfRatesWithOpts struct { +type RemoveRPrfRatesWithAPIOpts struct { Tenant string ID string RateIDs []string - Opts map[string]interface{} + APIOpts map[string]interface{} } -func (apierSv1 *APIerSv1) RemoveRateProfileRates(args *RemoveRPrfRatesWithOpts, reply *string) (err error) { +func (apierSv1 *APIerSv1) RemoveRateProfileRates(args *RemoveRPrfRatesWithAPIOpts, reply *string) (err error) { if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -163,8 +163,8 @@ func (apierSv1 *APIerSv1) RemoveRateProfileRates(args *RemoveRPrfRatesWithOpts, if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheRateProfiles: time.Now().UnixNano()}); err != nil { return utils.APIErrorHandler(err) } - if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheRateProfiles, - utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil { + if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheRateProfiles, + utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go index 34c11ed7b..99f0cb2ed 100644 --- a/apier/v1/rateprofiles_it_test.go +++ b/apier/v1/rateprofiles_it_test.go @@ -297,14 +297,14 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { var reply string expErr := "SERVER_ERROR: broken reference to filter: *wrong:inline for item with ID: cgrates.org:RP1" if err := ratePrfRpc.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err == nil || err.Error() != expErr { t.Fatalf("Expected error: %q, received: %v", expErr, err) } apiRPrf.FilterIDs = []string{"*string:~*req.Subject:1001"} if err := ratePrfRpc.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err != nil { t.Fatal(err) @@ -355,7 +355,7 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { apiRPrfRates.Rates["RT_WEEK"].FilterIDs = []string{"*wrong:inline"} expErr = "SERVER_ERROR: broken reference to filter: *wrong:inline for rate with ID: RT_WEEK" if err := ratePrfRpc.Call(utils.APIerSv1SetRateProfileRates, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrfRates, }, &reply); err == nil || err.Error() != expErr { t.Fatalf("Expected error: %q, received: %v", expErr, err) @@ -363,7 +363,7 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) { apiRPrfRates.Rates["RT_WEEK"].FilterIDs = nil if err := ratePrfRpc.Call(utils.APIerSv1SetRateProfileRates, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrfRates, }, &reply); err != nil { t.Fatal(err) @@ -484,7 +484,7 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { } var reply string if err := ratePrfRpc.Call(utils.APIerSv1SetRateProfile, - &utils.APIRateProfileWithOpts{ + &utils.APIRateProfileWithAPIOpts{ APIRateProfile: apiRPrf, }, &reply); err != nil { t.Fatal(err) @@ -493,7 +493,7 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { } if err := ratePrfRpc.Call(utils.APIerSv1RemoveRateProfileRates, - &RemoveRPrfRatesWithOpts{ + &RemoveRPrfRatesWithAPIOpts{ Tenant: "cgrates.org", ID: "SpecialRate", RateIDs: []string{"RT_WEEKEND"}, @@ -557,7 +557,7 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) { } if err := ratePrfRpc.Call(utils.APIerSv1RemoveRateProfileRates, - &RemoveRPrfRatesWithOpts{ + &RemoveRPrfRatesWithAPIOpts{ Tenant: "cgrates.org", ID: "SpecialRate", }, &reply); err != nil { @@ -633,7 +633,7 @@ func testV1RateGetRemoveRateProfileWithoutTenant(t *testing.T) { if *encoding == utils.MetaGOB { rateProfile.Rates["RT_WEEK"].FilterIDs = nil } - apiRPrf := &utils.APIRateProfileWithOpts{ + apiRPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ ID: "RPWithoutTenant", FilterIDs: []string{"*string:~*req.Subject:1001"}, @@ -764,7 +764,7 @@ func testV1RatePrfGetRateProfileRatesWithoutTenant(t *testing.T) { }, }, } - apiRPrf := &utils.APIRateProfileWithOpts{ + apiRPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ ID: "SpecialRate", FilterIDs: []string{"*string:~*req.Subject:1001"}, @@ -814,7 +814,7 @@ func testV1RatePrfGetRateProfileRatesWithoutTenant(t *testing.T) { func testV1RatePrfRemoveRateProfileRatesWithoutTenant(t *testing.T) { var reply string if err := ratePrfRpc.Call(utils.APIerSv1RemoveRateProfileRates, - &RemoveRPrfRatesWithOpts{ID: "SpecialRate"}, + &RemoveRPrfRatesWithAPIOpts{ID: "SpecialRate"}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { @@ -854,7 +854,7 @@ func testV1RateCostForEventWithDefault(t *testing.T) { }, }, } - rPrf := &utils.APIRateProfileWithOpts{ + rPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ ID: "DefaultRate", FilterIDs: []string{"*string:~*req.Subject:1001"}, diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go index 6bb37bd2b..d48cc1dd4 100644 --- a/apier/v1/remote_it_test.go +++ b/apier/v1/remote_it_test.go @@ -711,7 +711,7 @@ func testInternalRemoteITGetRateProfile(t *testing.T) { }, }, } - apiRPrf := &utils.APIRateProfileWithOpts{ + apiRPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: "RP1", diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index 2d53b458c..7bcc0cf09 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -568,7 +568,7 @@ func testInternalReplicateITChargerProfile(t *testing.T) { t.Error(err) } // set - chargerProfile = &ChargerWithOpts{ + chargerProfile = &ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "ApierTest", diff --git a/apier/v2/apier.go b/apier/v2/apier.go index 8a018117a..50bad02f1 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -149,7 +149,7 @@ func (apiv2 *APIerSv2) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFolde if attrs.Caching != nil { caching = *attrs.Caching } - if err := loader.ReloadCache(caching, true, attrs.Opts); err != nil { + if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil { return utils.NewErrServerError(err) } if len(apiv2.Config.ApierCfg().SchedulerConns) != 0 { diff --git a/apier/v2/attributes.go b/apier/v2/attributes.go index ea24af2ce..b19ebe44f 100644 --- a/apier/v2/attributes.go +++ b/apier/v2/attributes.go @@ -25,13 +25,13 @@ import ( "github.com/cgrates/cgrates/utils" ) -type AttributeWithOpts struct { +type AttributeWithAPIOpts struct { *engine.APIAttributeProfile - Opts map[string]interface{} + APIOpts map[string]interface{} } //SetAttributeProfile add/update a new Attribute Profile -func (APIerSv2 *APIerSv2) SetAttributeProfile(arg *AttributeWithOpts, reply *string) error { +func (APIerSv2 *APIerSv2) SetAttributeProfile(arg *AttributeWithAPIOpts, reply *string) error { if missing := utils.MissingStructFields(arg.APIAttributeProfile, []string{utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } @@ -50,8 +50,8 @@ func (APIerSv2 *APIerSv2) SetAttributeProfile(arg *AttributeWithOpts, reply *str map[string]int64{utils.CacheAttributeProfiles: time.Now().UnixNano()}); err != nil { return utils.APIErrorHandler(err) } - if err := APIerSv2.APIerSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), alsPrf.Tenant, utils.CacheAttributeProfiles, - alsPrf.TenantID(), &alsPrf.FilterIDs, alsPrf.Contexts, arg.Opts); err != nil { + if err := APIerSv2.APIerSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), alsPrf.Tenant, utils.CacheAttributeProfiles, + alsPrf.TenantID(), &alsPrf.FilterIDs, alsPrf.Contexts, arg.APIOpts); err != nil { return utils.APIErrorHandler(err) } *reply = utils.OK diff --git a/apier/v2/attributes_it_test.go b/apier/v2/attributes_it_test.go index cb6f30e20..bc4ff99f8 100644 --- a/apier/v2/attributes_it_test.go +++ b/apier/v2/attributes_it_test.go @@ -112,7 +112,7 @@ func testAttributeSRPCConn(t *testing.T) { } func testAttributeSSetAlsPrf(t *testing.T) { - extAlsPrf := &AttributeWithOpts{ + extAlsPrf := &AttributeWithAPIOpts{ APIAttributeProfile: &engine.APIAttributeProfile{ Tenant: "cgrates.org", ID: "ExternalAttribute", @@ -170,7 +170,7 @@ func testAttributeSSetAlsPrf(t *testing.T) { } func testAttributeSUpdateAlsPrf(t *testing.T) { - extAlsPrf := &AttributeWithOpts{ + extAlsPrf := &AttributeWithAPIOpts{ APIAttributeProfile: &engine.APIAttributeProfile{ Tenant: "cgrates.org", ID: "ExternalAttribute", @@ -244,7 +244,7 @@ func testAttributeSKillEngine(t *testing.T) { } func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) { - extAlsPrf := &AttributeWithOpts{ + extAlsPrf := &AttributeWithAPIOpts{ APIAttributeProfile: &engine.APIAttributeProfile{ ID: "ExternalAttribute", Contexts: []string{utils.MetaSessionS, utils.MetaCDRs}, diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go index e39402c97..2318cf0c6 100644 --- a/apier/v2/cdrs_it_test.go +++ b/apier/v2/cdrs_it_test.go @@ -463,7 +463,7 @@ func testV2CDRsDifferentTenants(t *testing.T) { t.Errorf("Expecting : %+v, received: %+v", alsPrf.AttributeProfile, reply) } //add a charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "CustomTenant", ID: "CustomCharger", @@ -475,7 +475,7 @@ func testV2CDRsDifferentTenants(t *testing.T) { AttributeIDs: []string{"*none"}, Weight: 20, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.CacheOpt: utils.MetaReload, }, } @@ -860,7 +860,7 @@ func testV2CDRsRerate(t *testing.T) { t.Error("Reply: ", reply) } //add a charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", @@ -871,7 +871,7 @@ func testV2CDRsRerate(t *testing.T) { AttributeIDs: []string{"*none"}, Weight: 20, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.CacheOpt: utils.MetaReload, }, } @@ -1026,7 +1026,7 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { t.Error("Reply: ", reply) } //add a charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", @@ -1037,7 +1037,7 @@ func testV2CDRsDuplicateCDRs(t *testing.T) { AttributeIDs: []string{"*none"}, Weight: 20, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.CacheOpt: utils.MetaReload, }, } diff --git a/console/attributes_profile_set.go b/console/attributes_profile_set.go index f72349cc2..33759b7e9 100644 --- a/console/attributes_profile_set.go +++ b/console/attributes_profile_set.go @@ -28,7 +28,7 @@ func init() { c := &CmdSetAttributes{ name: "attributes_profile_set", rpcMethod: utils.APIerSv2SetAttributeProfile, - rpcParams: &v2.AttributeWithOpts{}, + rpcParams: &v2.AttributeWithAPIOpts{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -37,7 +37,7 @@ func init() { type CmdSetAttributes struct { name string rpcMethod string - rpcParams *v2.AttributeWithOpts + rpcParams *v2.AttributeWithAPIOpts *CommandExecuter } @@ -51,7 +51,7 @@ func (self *CmdSetAttributes) RpcMethod() string { func (self *CmdSetAttributes) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v2.AttributeWithOpts{APIAttributeProfile: new(engine.APIAttributeProfile)} + self.rpcParams = &v2.AttributeWithAPIOpts{APIAttributeProfile: new(engine.APIAttributeProfile)} } return self.rpcParams } diff --git a/console/chargers_profile_set.go b/console/chargers_profile_set.go index b348ed5dc..c43950dee 100644 --- a/console/chargers_profile_set.go +++ b/console/chargers_profile_set.go @@ -28,7 +28,7 @@ func init() { c := &CmdSetChargers{ name: "chargers_profile_set", rpcMethod: utils.APIerSv1SetChargerProfile, - rpcParams: &v1.ChargerWithOpts{}, + rpcParams: &v1.ChargerWithAPIOpts{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -37,7 +37,7 @@ func init() { type CmdSetChargers struct { name string rpcMethod string - rpcParams *v1.ChargerWithOpts + rpcParams *v1.ChargerWithAPIOpts *CommandExecuter } @@ -51,7 +51,7 @@ func (self *CmdSetChargers) RpcMethod() string { func (self *CmdSetChargers) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.ChargerWithOpts{ChargerProfile: new(engine.ChargerProfile)} + self.rpcParams = &v1.ChargerWithAPIOpts{ChargerProfile: new(engine.ChargerProfile)} } return self.rpcParams } diff --git a/console/cost.go b/console/cost.go index 0a25918ac..95ed83f10 100644 --- a/console/cost.go +++ b/console/cost.go @@ -54,7 +54,7 @@ func (self *CmdGetCost) RpcMethod() string { func (self *CmdGetCost) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &v1.AttrGetCost{Opts: make(map[string]interface{})} + self.rpcParams = &v1.AttrGetCost{APIOpts: make(map[string]interface{})} } return self.rpcParams } diff --git a/console/maxusage.go b/console/maxusage.go index 90414ec4b..f40c35317 100644 --- a/console/maxusage.go +++ b/console/maxusage.go @@ -39,7 +39,7 @@ func init() { type CmdGetMaxUsage struct { name string rpcMethod string - rpcParams *engine.UsageRecordWithOpts + rpcParams *engine.UsageRecordWithAPIOpts clientArgs []string *CommandExecuter } @@ -54,7 +54,7 @@ func (self *CmdGetMaxUsage) RpcMethod() string { func (self *CmdGetMaxUsage) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = new(engine.UsageRecordWithOpts) + self.rpcParams = new(engine.UsageRecordWithAPIOpts) } return self.rpcParams } diff --git a/console/rates_profile_set.go b/console/rates_profile_set.go index b566ba37f..de43c1cd4 100644 --- a/console/rates_profile_set.go +++ b/console/rates_profile_set.go @@ -26,7 +26,7 @@ func init() { c := &CmdSetRateProfile{ name: "rates_profile_set", rpcMethod: utils.APIerSv1SetRateProfile, - rpcParams: &utils.APIRateProfileWithOpts{}, + rpcParams: &utils.APIRateProfileWithAPIOpts{}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} @@ -35,7 +35,7 @@ func init() { type CmdSetRateProfile struct { name string rpcMethod string - rpcParams *utils.APIRateProfileWithOpts + rpcParams *utils.APIRateProfileWithAPIOpts *CommandExecuter } @@ -49,9 +49,9 @@ func (self *CmdSetRateProfile) RpcMethod() string { func (self *CmdSetRateProfile) RpcParams(reset bool) interface{} { if reset || self.rpcParams == nil { - self.rpcParams = &utils.APIRateProfileWithOpts{ + self.rpcParams = &utils.APIRateProfileWithAPIOpts{ APIRateProfile: new(utils.APIRateProfile), - Opts: make(map[string]interface{}), + APIOpts: make(map[string]interface{}), } } return self.rpcParams diff --git a/dispatchers/cdrs.go b/dispatchers/cdrs.go index 2f643c5bf..861986bc9 100644 --- a/dispatchers/cdrs.go +++ b/dispatchers/cdrs.go @@ -186,12 +186,12 @@ func (dS *DispatcherService) CDRsV2StoreSessionCost(args *engine.ArgsV2CDRSStore } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV2StoreSessionCost, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil { return } } return dS.Dispatch(&utils.CGREvent{ Tenant: tnt, - APIOpts: args.Opts, + APIOpts: args.APIOpts, }, utils.MetaCDRs, utils.CDRsV2StoreSessionCost, args, reply) } diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index 03db5b5d9..60dda9706 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -368,7 +368,7 @@ func testDspCDRsV2StoreSessionCost(t *testing.T) { Usage: 1536, CostDetails: engine.NewEventCostFromCallCost(cc, "testDspCDRsV2StoreSessionCost", utils.MetaDefault), }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "cdrsv212345", }, } diff --git a/engine/cdr.go b/engine/cdr.go index 9afa7b128..d62339ff1 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -567,9 +567,9 @@ type ExternalCDRWithAPIOpts struct { APIOpts map[string]interface{} } -type UsageRecordWithOpts struct { +type UsageRecordWithAPIOpts struct { *UsageRecord - Opts map[string]interface{} + APIOpts map[string]interface{} } type CDRWithAPIOpts struct { diff --git a/engine/storage_utils.go b/engine/storage_utils.go index 3b73f1df5..c32790cd3 100644 --- a/engine/storage_utils.go +++ b/engine/storage_utils.go @@ -145,7 +145,7 @@ type AttrCDRSStoreSMCost struct { type ArgsV2CDRSStoreSMCost struct { Cost *V2SMCost CheckDuplicate bool - Opts map[string]interface{} + APIOpts map[string]interface{} Tenant string } diff --git a/ers/filefwv_it_test.go b/ers/filefwv_it_test.go index f4ac94263..b68dfd6fd 100644 --- a/ers/filefwv_it_test.go +++ b/ers/filefwv_it_test.go @@ -113,7 +113,7 @@ func testFWVITRpcConn(t *testing.T) { func testFWVITLoadTPFromFolder(t *testing.T) { //add a default charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/ers/filejson_it_test.go b/ers/filejson_it_test.go index bf3a4dba2..049918550 100644 --- a/ers/filejson_it_test.go +++ b/ers/filejson_it_test.go @@ -129,7 +129,7 @@ func testJSONRpcConn(t *testing.T) { func testJSONAddData(t *testing.T) { var reply string //add a charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", @@ -140,7 +140,7 @@ func testJSONAddData(t *testing.T) { AttributeIDs: []string{"*none"}, Weight: 20, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.CacheOpt: utils.MetaReload, }, } diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go index 40e6d7545..d1524b9d8 100644 --- a/ers/flatstore_it_test.go +++ b/ers/flatstore_it_test.go @@ -131,7 +131,7 @@ func testFlatstoreITRpcConn(t *testing.T) { func testFlatstoreITLoadTPFromFolder(t *testing.T) { //add a default charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/ers/partial_csv_it_test.go b/ers/partial_csv_it_test.go index b0f2f81bd..5daf22f5c 100644 --- a/ers/partial_csv_it_test.go +++ b/ers/partial_csv_it_test.go @@ -128,7 +128,7 @@ func testPartITRpcConn(t *testing.T) { func testPartITLoadTPFromFolder(t *testing.T) { //add a default charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 1f9d1ebff..939c14f0b 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -137,7 +137,7 @@ func testA1itLoadTPFromFolder(t *testing.T) { } //add a default charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "Default", diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index 27d246b67..5be8aad9e 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -229,7 +229,7 @@ func testCacheRplAddData(t *testing.T) { t.Errorf("cgr-loader failed: ") } - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "DefaultCharger", @@ -288,7 +288,7 @@ func testCacheRplAAAddData(t *testing.T) { t.Errorf("cgr-loader failed: ") } - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "DefaultCharger", diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index 8086fdf05..b48e07094 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -221,7 +221,7 @@ func testCDRsExpInitRPC(t *testing.T) { func testCDRsExpLoadAddCharger(t *testing.T) { // //add a default charger - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "*raw", diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index ca53bf2eb..9441df14d 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -177,7 +177,7 @@ func testV1DataDataDebitUsageWith10Kilo(t *testing.T) { } tStart := time.Now() if err := dataRpc.Call(utils.APIerSv1DebitUsage, - &engine.UsageRecordWithOpts{UsageRecord: usageRecord}, &reply); err != nil { + &engine.UsageRecordWithAPIOpts{UsageRecord: usageRecord}, &reply); err != nil { t.Error(err) } if time.Now().Sub(tStart) > 50*time.Millisecond { @@ -315,7 +315,7 @@ func testV1DataDataDebitUsage1G0(t *testing.T) { } tStart := time.Now() if err := dataRpc.Call(utils.APIerSv1DebitUsage, - &engine.UsageRecordWithOpts{UsageRecord: usageRecord}, &reply); err != nil { + &engine.UsageRecordWithAPIOpts{UsageRecord: usageRecord}, &reply); err != nil { t.Error(err) } if time.Now().Sub(tStart) > 100*time.Millisecond { diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index b8958d261..9581e4cd8 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -1041,7 +1041,7 @@ func testFltrRplRouteProfile(t *testing.T) { func testFltrRplChargerProfile(t *testing.T) { chID := "CH1" - chPrf := &v1.ChargerWithOpts{ + chPrf := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: chID, @@ -1342,7 +1342,7 @@ func testFltrRplDispatcherHost(t *testing.T) { func testFltrRplRateProfile(t *testing.T) { rpID := "RP1" - rpPrf := &utils.APIRateProfileWithOpts{ + rpPrf := &utils.APIRateProfileWithAPIOpts{ APIRateProfile: &utils.APIRateProfile{ Tenant: "cgrates.org", ID: rpID, diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index b7ae38469..0f0879ef4 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -893,7 +893,7 @@ func testV1FltrChargerSuffix(t *testing.T) { } else if reply != utils.OK { t.Error("Reply: ", reply) } - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "IntraCharger", @@ -910,7 +910,7 @@ func testV1FltrChargerSuffix(t *testing.T) { t.Error("Unexpected reply returned", result) } - chargerProfile2 := &v1.ChargerWithOpts{ + chargerProfile2 := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "InterCharger", diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index 792bb683d..94aa667e8 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -135,7 +135,7 @@ func testGOCSApierRpcConn(t *testing.T) { } func testGOCSLoadData(t *testing.T) { - chargerProfile := &v1.ChargerWithOpts{ + chargerProfile := &v1.ChargerWithAPIOpts{ ChargerProfile: &engine.ChargerProfile{ Tenant: "cgrates.org", ID: "DEFAULT", diff --git a/general_tests/sessions_concur_test.go b/general_tests/sessions_concur_test.go index 79a22e165..fa4a3ab08 100644 --- a/general_tests/sessions_concur_test.go +++ b/general_tests/sessions_concur_test.go @@ -125,7 +125,7 @@ func testSCncrLoadTP(t *testing.T) { *dataDir, "tariffplans", "tp1cnt")}, &loadInst); err != nil { t.Error(err) } - attrPrfl := &v2.AttributeWithOpts{ + attrPrfl := &v2.AttributeWithAPIOpts{ ExternalAttributeProfile: &engine.ExternalAttributeProfile{ Tenant: "cgrates.org", ID: "AttrConcurrentSessions", diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 2deae03c8..cdc05e0c6 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -532,7 +532,7 @@ type AttrLoadTpFromFolder struct { FolderPath string // Take files from folder absolute path DryRun bool // Do not write to database but parse only Validate bool // Run structural checks on data - Opts map[string]interface{} + APIOpts map[string]interface{} Caching *string } @@ -541,7 +541,7 @@ type AttrImportTPFromFolder struct { FolderPath string RunId string CsvSeparator string - Opts map[string]interface{} + APIOpts map[string]interface{} } func NewTAFromAccountKey(accountKey string) (*TenantAccount, error) { diff --git a/utils/librates.go b/utils/librates.go index 346382214..653a62ae9 100644 --- a/utils/librates.go +++ b/utils/librates.go @@ -288,9 +288,9 @@ type APIRateProfile struct { Rates map[string]*APIRate } -type APIRateProfileWithOpts struct { +type APIRateProfileWithAPIOpts struct { *APIRateProfile - Opts map[string]interface{} + APIOpts map[string]interface{} } func (ext *APIRate) AsRate() (rate *Rate, err error) {