From 32c234a6c7b48dc67020a2cdac23873282b30eca Mon Sep 17 00:00:00 2001 From: andronache Date: Mon, 22 Mar 2021 09:52:09 +0200 Subject: [PATCH] In CGREvent changed Opts in APIOpts --- accounts/abstractbalance.go | 2 +- accounts/accounts.go | 2 +- accounts/accounts_test.go | 4 +- accounts/libaccounts.go | 4 +- accounts/libaccounts_test.go | 2 +- actions/actions.go | 4 +- actions/actions_test.go | 6 +- actions/export.go | 10 +- agents/asterisk_event.go | 10 +- agents/diamagent.go | 2 +- agents/diamagent_test.go | 12 +- agents/dnsagent.go | 2 +- agents/fsevent.go | 10 +- agents/httpagent.go | 2 +- agents/kamevent.go | 8 +- agents/radagent.go | 2 +- agents/sipagent.go | 2 +- analyzers/analyzers_it_test.go | 4 +- analyzers/analyzers_test.go | 8 +- apier/v1/api_interfaces.go | 2 +- apier/v1/apier.go | 2 +- apier/v1/attributes_it_test.go | 18 +- apier/v1/cache_replication_it_test.go | 2 +- apier/v1/chargers_it_test.go | 14 +- apier/v1/cost_bench_it_test.go | 4 +- apier/v1/dispatcher.go | 2 +- apier/v1/dispatchersv1_it_test.go | 6 +- apier/v1/filterindexecache_it_test.go | 34 +- apier/v1/rateprofiles_it_test.go | 16 +- apier/v1/replicate_it_test.go | 2 +- apier/v1/replicator.go | 6 +- apier/v1/resourcesv1_it_test.go | 2 +- apier/v1/routes_it_test.go | 24 +- apier/v1/sessions_process_event_it_test.go | 6 +- apier/v1/sessionsv1_it_test.go | 14 +- apier/v1/stats_it_test.go | 4 +- apier/v1/thresholds_it_test.go | 20 +- cmd/cgr-tester/proc_event/proc_ev.go | 2 +- config/navigablemap.go | 10 +- dispatchers/accounts.go | 20 +- dispatchers/accounts_it_test.go | 2 +- dispatchers/actions.go | 6 +- dispatchers/actions_it_test.go | 2 +- dispatchers/attributes.go | 6 +- dispatchers/attributes_it_test.go | 30 +- dispatchers/caches.go | 62 ++-- dispatchers/caches_it_test.go | 2 +- dispatchers/cdrs.go | 34 +- dispatchers/cdrs_it_test.go | 6 +- dispatchers/chargers.go | 6 +- dispatchers/chargers_it_test.go | 12 +- dispatchers/config.go | 20 +- dispatchers/core.go | 10 +- dispatchers/dispatchers.go | 8 +- dispatchers/guardian.go | 10 +- dispatchers/guardian_it_test.go | 2 +- dispatchers/rals.go | 6 +- dispatchers/rals_it_test.go | 2 +- dispatchers/rates.go | 4 +- dispatchers/rates_it_test.go | 6 +- dispatchers/replicator.go | 370 ++++++++++----------- dispatchers/replicator_it_test.go | 2 +- dispatchers/resources.go | 22 +- dispatchers/resources_it_test.go | 18 +- dispatchers/responder.go | 6 +- dispatchers/responder_it_test.go | 6 +- dispatchers/routes.go | 8 +- dispatchers/routes_it_test.go | 14 +- dispatchers/scheduler.go | 12 +- dispatchers/scheduler_it_test.go | 2 +- dispatchers/servicemanager.go | 14 +- dispatchers/sessions.go | 70 ++-- dispatchers/sessions_it_test.go | 34 +- dispatchers/stats.go | 22 +- dispatchers/stats_it_test.go | 14 +- dispatchers/thresholds.go | 16 +- dispatchers/thresholds_it_test.go | 10 +- ees/ees.go | 14 +- ees/ees_test.go | 12 +- ees/elastic.go | 2 +- ees/elastic_it_test.go | 2 +- ees/filecsv.go | 2 +- ees/filefwv.go | 2 +- ees/httpjsonmap.go | 2 +- ees/httppost.go | 2 +- ees/posterjsonmap.go | 2 +- ees/posterjsonmap_it_test.go | 6 +- ees/sql.go | 2 +- ees/virtualee.go | 2 +- engine/account.go | 4 +- engine/action.go | 2 +- engine/actions_test.go | 2 +- engine/attributes.go | 4 +- engine/balances.go | 2 +- engine/calldesc.go | 8 +- engine/cdr.go | 8 +- engine/cdrs.go | 24 +- engine/chargers.go | 8 +- engine/chargers_test.go | 4 +- engine/datamanager.go | 16 +- engine/resources.go | 8 +- engine/routes.go | 14 +- engine/routes_test.go | 8 +- engine/stats.go | 12 +- engine/stats_test.go | 12 +- engine/thresholds.go | 4 +- engine/z_actions_it_test.go | 4 +- engine/z_attributes_test.go | 58 ++-- ers/amqp_it_test.go | 2 +- ers/ers.go | 2 +- ers/ers_it_test.go | 48 +-- ers/partial_csv.go | 18 +- ers/sql_it_test.go | 8 +- general_tests/a1_it_test.go | 4 +- general_tests/accountactions_it_test.go | 4 +- general_tests/attributes_it_test.go | 40 +-- general_tests/cacherpl_it_test.go | 14 +- general_tests/cdrs_exp_it_test.go | 2 +- general_tests/cdrs_onlexp_it_test.go | 2 +- general_tests/data_it_test.go | 6 +- general_tests/filters_it_test.go | 8 +- general_tests/session2_it_test.go | 8 +- general_tests/session3_it_test.go | 4 +- general_tests/sessionpause_it_test.go | 6 +- general_tests/sessionroutes_it_test.go | 6 +- rates/rates.go | 4 +- rates/rates_test.go | 12 +- registrarc/registrarcrpc_it_test.go | 10 +- sessions/session.go | 8 +- sessions/sessions.go | 48 +-- sessions/sessions_data_it_test.go | 10 +- sessions/sessions_it_test.go | 4 +- sessions/sessions_test.go | 12 +- sessions/sessionscover_test.go | 50 +-- utils/apitpdata.go | 4 +- utils/apitpdata_test.go | 58 ++-- utils/cgrevent.go | 30 +- utils/cgrevent_test.go | 8 +- 138 files changed, 937 insertions(+), 937 deletions(-) diff --git a/accounts/abstractbalance.go b/accounts/abstractbalance.go index 1dbf40204..803d5b025 100644 --- a/accounts/abstractbalance.go +++ b/accounts/abstractbalance.go @@ -48,7 +48,7 @@ func (aB *abstractBalance) debitAbstracts(usage *decimal.Big, cgrEv *utils.CGREvent) (ec *utils.EventCharges, err error) { evNm := utils.MapStorage{ - utils.MetaOpts: cgrEv.Opts, + utils.MetaOpts: cgrEv.APIOpts, utils.MetaReq: cgrEv.Event, } diff --git a/accounts/accounts.go b/accounts/accounts.go index 7720746f2..c37844e01 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -71,7 +71,7 @@ func (aS *AccountS) matchingAccountsForEvent(tnt string, cgrEv *utils.CGREvent, acntIDs []string, lked bool) (acnts utils.AccountProfilesWithWeight, err error) { evNm := utils.MapStorage{ utils.MetaReq: cgrEv.Event, - utils.MetaOpts: cgrEv.Opts, + utils.MetaOpts: cgrEv.APIOpts, } if len(acntIDs) == 0 { var actIDsMp utils.StringSet diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 07934a797..7f2280c5e 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -203,7 +203,7 @@ func TestMatchingAccountsForEvent(t *testing.T) { t.Error(err) } - cgrEvent.Opts = make(map[string]interface{}) + cgrEvent.APIOpts = make(map[string]interface{}) cgrEvent.Time = utils.TimePointer(time.Date(2020, 8, 21, 0, 0, 0, 0, time.UTC)) if _, err := accnts.matchingAccountsForEvent("cgrates.org", cgrEvent, []string{}, true); err == nil || err != utils.ErrNotFound { @@ -394,7 +394,7 @@ func TestAccountsDebit(t *testing.T) { utils.AccountField: "1004", utils.Usage: "not_time_format", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } expected := "time: invalid duration \"not_time_format\"" diff --git a/accounts/libaccounts.go b/accounts/libaccounts.go index 0d983cb6d..dad004a58 100644 --- a/accounts/libaccounts.go +++ b/accounts/libaccounts.go @@ -96,14 +96,14 @@ func processAttributeS(connMgr *engine.ConnManager, cgrEv *utils.CGREvent, return nil, utils.NewErrNotConnected(utils.AttributeS) } var procRuns *int - if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { procRuns = utils.IntPointer(int(v)) } } attrArgs := &engine.AttrArgsProcessEvent{ Context: utils.StringPointer(utils.FirstNonEmpty( - engine.MapEvent(cgrEv.Opts).GetStringIgnoreErrors(utils.OptsContext), + engine.MapEvent(cgrEv.APIOpts).GetStringIgnoreErrors(utils.OptsContext), utils.MetaAccounts)), CGREvent: cgrEv, AttributeIDs: attrIDs, diff --git a/accounts/libaccounts_test.go b/accounts/libaccounts_test.go index 4976996c4..ddc50ca23 100644 --- a/accounts/libaccounts_test.go +++ b/accounts/libaccounts_test.go @@ -128,7 +128,7 @@ func TestProcessAttributeS(t *testing.T) { cgrEvent := &utils.CGREvent{ Tenant: "cgrates.org", ID: "TEST_ID1", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAttributesProcessRuns: "20", }, } diff --git a/actions/actions.go b/actions/actions.go index 89327811b..2eb7e18fc 100644 --- a/actions/actions.go +++ b/actions/actions.go @@ -93,7 +93,7 @@ func (aS *ActionS) schedInit() { cgrEvs[i] = &utils.CGREvent{ Tenant: tnt, Time: utils.TimePointer(time.Now()), - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.EventType: utils.SchedulerInit, utils.NodeID: aS.cfg.GeneralCfg().NodeID, }, @@ -204,7 +204,7 @@ func (aS *ActionS) scheduledActions(tnt string, cgrEv *utils.CGREvent, aPrflIDs var aPfs engine.ActionProfiles evNm := utils.MapStorage{ utils.MetaReq: cgrEv.Event, - utils.MetaOpts: cgrEv.Opts, + utils.MetaOpts: cgrEv.APIOpts, } if aPfs, err = aS.matchingActionProfilesForEvent(tnt, evNm, cgrEv.Time, aPrflIDs); err != nil { return diff --git a/actions/actions_test.go b/actions/actions_test.go index 790a5cb5f..cbbddf7fa 100644 --- a/actions/actions_test.go +++ b/actions/actions_test.go @@ -658,17 +658,17 @@ func TestCDRLogActionWithOpts(t *testing.T) { } else if strVal := utils.IfaceAsString(val); strVal != "cgrates.org" { return fmt.Errorf("Expected %+v, received %+v", "cgrates.org", strVal) } - if val, has := argConv.CGREvent.Opts["EventFieldOpt"]; !has { + if val, has := argConv.CGREvent.APIOpts["EventFieldOpt"]; !has { return fmt.Errorf("missing EventFieldOpt from Opts") } else if strVal := utils.IfaceAsString(val); strVal != "eventValue" { return fmt.Errorf("Expected %+v, received %+v", "eventValue", strVal) } - if val, has := argConv.CGREvent.Opts["Option1"]; !has { + if val, has := argConv.CGREvent.APIOpts["Option1"]; !has { return fmt.Errorf("missing Option1 from Opts") } else if strVal := utils.IfaceAsString(val); strVal != "Value1" { return fmt.Errorf("Expected %+v, received %+v", "Value1", strVal) } - if val, has := argConv.CGREvent.Opts["Option3"]; !has { + if val, has := argConv.CGREvent.APIOpts["Option3"]; !has { return fmt.Errorf("missing Option3 from Opts") } else if strVal := utils.IfaceAsString(val); strVal != "eventValue" { return fmt.Errorf("Expected %+v, received %+v", "eventValue", strVal) diff --git a/actions/export.go b/actions/export.go index 9a2083028..c8c17b881 100644 --- a/actions/export.go +++ b/actions/export.go @@ -106,11 +106,11 @@ func (aL *actExport) execute(_ context.Context, data utils.MapStorage, _ string) utils.EeSv1ProcessEvent, &utils.CGREventWithEeIDs{ EeIDs: exporterIDs, CGREvent: &utils.CGREvent{ - Tenant: aL.tnt, - Time: utils.TimePointer(time.Now()), - ID: utils.GenUUID(), - Event: data[utils.MetaReq].(map[string]interface{}), - Opts: data[utils.MetaOpts].(map[string]interface{}), + Tenant: aL.tnt, + Time: utils.TimePointer(time.Now()), + ID: utils.GenUUID(), + Event: data[utils.MetaReq].(map[string]interface{}), + APIOpts: data[utils.MetaOpts].(map[string]interface{}), }, }, &rply) } diff --git a/agents/asterisk_event.go b/agents/asterisk_event.go index 6ae89e9bd..db305170c 100644 --- a/agents/asterisk_event.go +++ b/agents/asterisk_event.go @@ -226,7 +226,7 @@ func (smaEv *SMAsteriskEvent) UpdateCGREvent(cgrEv *utils.CGREvent) error { } } for k, v := range smaEv.opts { - resCGREv.Opts[k] = v + resCGREv.APIOpts[k] = v } *cgrEv = resCGREv return nil @@ -279,10 +279,10 @@ func (smaEv *SMAsteriskEvent) AsCGREvent(timezone string) (cgrEv *utils.CGREvent cgrEv = &utils.CGREvent{ Tenant: utils.FirstNonEmpty(smaEv.Tenant(), config.CgrConfig().GeneralCfg().DefaultTenant), - ID: utils.UUIDSha1Prefix(), - Time: &setupTime, - Event: smaEv.AsMapStringInterface(), - Opts: smaEv.opts, + ID: utils.UUIDSha1Prefix(), + Time: &setupTime, + Event: smaEv.AsMapStringInterface(), + APIOpts: smaEv.opts, } return } diff --git a/agents/diamagent.go b/agents/diamagent.go index 9ec8adb7b..adc537662 100644 --- a/agents/diamagent.go +++ b/agents/diamagent.go @@ -329,7 +329,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor, } var cgrArgs utils.Paginator if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>", utils.DiameterAgent, err.Error())) err = nil // reset the error and continue the processing diff --git a/agents/diamagent_test.go b/agents/diamagent_test.go index 7d42ecbe9..338a4c8f4 100644 --- a/agents/diamagent_test.go +++ b/agents/diamagent_test.go @@ -151,7 +151,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if !reflect.DeepEqual(expargs, arg) { @@ -194,7 +194,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if !reflect.DeepEqual(expargs, arg) { @@ -259,7 +259,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if !reflect.DeepEqual(expargs, arg) { @@ -321,7 +321,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: make(map[string]interface{}), + APIOpts: make(map[string]interface{}), } if !reflect.DeepEqual(expargs, arg) { t.Errorf("Expected:%s ,received: %s", utils.ToJSON(expargs), utils.ToJSON(arg)) @@ -361,7 +361,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if !reflect.DeepEqual(expargs, arg) { @@ -402,7 +402,7 @@ func TestProcessRequest(t *testing.T) { "ToR": "*voice", "Usage": "10s", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if !reflect.DeepEqual(expargs, arg) { diff --git a/agents/dnsagent.go b/agents/dnsagent.go index a97c7fb4a..0f1836f9e 100644 --- a/agents/dnsagent.go +++ b/agents/dnsagent.go @@ -191,7 +191,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor, if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>", utils.DNSAgent, err.Error())) err = nil // reset the error and continue the processing diff --git a/agents/fsevent.go b/agents/fsevent.go index c78baefe4..3813bff41 100644 --- a/agents/fsevent.go +++ b/agents/fsevent.go @@ -361,11 +361,11 @@ func (fsev FSEvent) AsCGREvent(timezone string) (cgrEv *utils.CGREvent, err erro return nil, err } cgrEv = &utils.CGREvent{ - Tenant: fsev.GetTenant(utils.MetaDefault), - ID: utils.UUIDSha1Prefix(), - Time: &sTime, - Event: fsev.AsMapStringInterface(timezone), - Opts: fsev.GetOptions(), + Tenant: fsev.GetTenant(utils.MetaDefault), + ID: utils.UUIDSha1Prefix(), + Time: &sTime, + Event: fsev.AsMapStringInterface(timezone), + APIOpts: fsev.GetOptions(), } return cgrEv, nil } diff --git a/agents/httpagent.go b/agents/httpagent.go index be5eb56d5..8b072b1d7 100644 --- a/agents/httpagent.go +++ b/agents/httpagent.go @@ -128,7 +128,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor, if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>", utils.HTTPAgent, err.Error())) err = nil // reset the error and continue the processing diff --git a/agents/kamevent.go b/agents/kamevent.go index 21f88dcb6..1869cf914 100644 --- a/agents/kamevent.go +++ b/agents/kamevent.go @@ -186,10 +186,10 @@ func (kev KamEvent) AsCGREvent(timezone string) (cgrEv *utils.CGREvent, err erro cgrEv = &utils.CGREvent{ Tenant: utils.FirstNonEmpty(kev[utils.Tenant], config.CgrConfig().GeneralCfg().DefaultTenant), - ID: utils.UUIDSha1Prefix(), - Time: &sTime, - Event: kev.AsMapStringInterface(), - Opts: kev.GetOptions(), + ID: utils.UUIDSha1Prefix(), + Time: &sTime, + Event: kev.AsMapStringInterface(), + APIOpts: kev.GetOptions(), } return cgrEv, nil } diff --git a/agents/radagent.go b/agents/radagent.go index 5b2181941..ba34d28ea 100644 --- a/agents/radagent.go +++ b/agents/radagent.go @@ -186,7 +186,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>", utils.RadiusAgent, err.Error())) err = nil // reset the error and continue the processing diff --git a/agents/sipagent.go b/agents/sipagent.go index 9027351ed..2c8ca01a3 100644 --- a/agents/sipagent.go +++ b/agents/sipagent.go @@ -396,7 +396,7 @@ func (sa *SIPAgent) processRequest(reqProcessor *config.RequestProcessor, if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction failed because <%s>", utils.SIPAgent, err.Error())) err = nil // reset the error and continue the processing diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index bfa8bbd80..763d8ec53 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -161,7 +161,7 @@ func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) { "RunID": "*default", "Subject": "Something_inter", }, - Opts: map[string]interface{}{"*subsys": "*chargers"}, + APIOpts: map[string]interface{}{"*subsys": "*chargers"}, }, }, { @@ -178,7 +178,7 @@ func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) { "RunID": "*raw", "Subject": "Something_inter", }, - Opts: map[string]interface{}{"*subsys": "*chargers"}, + APIOpts: map[string]interface{}{"*subsys": "*chargers"}, }, }, } diff --git a/analyzers/analyzers_test.go b/analyzers/analyzers_test.go index 2f3cd1a98..1526b1b27 100644 --- a/analyzers/analyzers_test.go +++ b/analyzers/analyzers_test.go @@ -199,7 +199,7 @@ func TestAnalyzersV1Search(t *testing.T) { t1 := time.Now() if err = anz.logTrafic(0, utils.CoreSv1Ping, &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.EventSource: utils.MetaCDRs, }, }, utils.Pong, nil, utils.MetaJSON, "127.0.0.1:5565", @@ -209,7 +209,7 @@ func TestAnalyzersV1Search(t *testing.T) { if err = anz.logTrafic(1, utils.CoreSv1Ping, &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.EventSource: utils.MetaAttributes, }, }, utils.Pong, nil, @@ -221,7 +221,7 @@ func TestAnalyzersV1Search(t *testing.T) { if err = anz.logTrafic(2, utils.CoreSv1Ping, &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.EventSource: utils.MetaAttributes, }, }, utils.Pong, nil, @@ -233,7 +233,7 @@ func TestAnalyzersV1Search(t *testing.T) { if err = anz.logTrafic(3, utils.CoreSv1Ping, &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.EventSource: utils.MetaAttributes, }, }, utils.Pong, nil, diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go index 72584a678..0ef46233b 100644 --- a/apier/v1/api_interfaces.go +++ b/apier/v1/api_interfaces.go @@ -258,7 +258,7 @@ type ReplicatorSv1Interface interface { RemoveSharedGroup(id *utils.StringWithAPIOpts, reply *string) error RemoveActions(id *utils.StringWithAPIOpts, reply *string) error RemoveActionPlan(id *utils.StringWithAPIOpts, reply *string) error - RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) error + RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithAPIOpts, reply *string) error RemoveRatingPlan(id *utils.StringWithAPIOpts, reply *string) error RemoveRatingProfile(id *utils.StringWithAPIOpts, reply *string) error RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, reply *string) error diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 6a2956441..ecab97640 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -2023,7 +2023,7 @@ func (apierSv1 *APIerSv1) ExportCDRs(args *utils.ArgExportCDRs, reply *map[strin CGREvent: cdr.AsCGREvent(), } if args.Verbose { - argCdr.CGREvent.Opts[utils.OptsEEsVerbose] = struct{}{} + argCdr.CGREvent.APIOpts[utils.OptsEEsVerbose] = struct{}{} } if err := apierSv1.ConnMgr.Call(apierSv1.Config.ApierCfg().EEsConns, nil, utils.EeSv1ProcessEvent, argCdr, &rplyCdr); err != nil { diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go index c3aa3aedd..f6d720f76 100644 --- a/apier/v1/attributes_it_test.go +++ b/apier/v1/attributes_it_test.go @@ -365,7 +365,7 @@ func testAttributeSProcessEvent(t *testing.T) { utils.Subject: "1001", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -407,7 +407,7 @@ func testAttributeSProcessEventNotFound(t *testing.T) { utils.AccountField: "Inexistent", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -429,7 +429,7 @@ func testAttributeSProcessEventMissing(t *testing.T) { utils.Category: "*attributes", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -494,7 +494,7 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) { utils.AccountField: "1001", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -563,7 +563,7 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { utils.AccountField: "1001", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eRply2 := &engine.AttrSProcessEventReply{ @@ -577,7 +577,7 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) { utils.AccountField: "1001", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -646,7 +646,7 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) { utils.Subject: "1001", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -706,7 +706,7 @@ func testAttributeSProcessEventWithHeader(t *testing.T) { "Field1": "Value1", "Field2": "Value1", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply @@ -1029,7 +1029,7 @@ func testAttributeSProcessEventWithSearchAndReplace(t *testing.T) { Event: map[string]interface{}{ "Category": "call_suffix", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply diff --git a/apier/v1/cache_replication_it_test.go b/apier/v1/cache_replication_it_test.go index 9b1a77b09..4ccd6d2e2 100644 --- a/apier/v1/cache_replication_it_test.go +++ b/apier/v1/cache_replication_it_test.go @@ -144,7 +144,7 @@ func testCacheSReplicateProcessAttributes(t *testing.T) { utils.AccountField: "1001", "OfficeGroup": "Marketing", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } var rplyEv engine.AttrSProcessEventReply diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go index 0f1eb073e..0d5be4854 100755 --- a/apier/v1/chargers_it_test.go +++ b/apier/v1/chargers_it_test.go @@ -47,7 +47,7 @@ var ( Event: map[string]interface{}{ utils.AccountField: "1001", }, - Opts: map[string]interface{}{utils.OptsContext: "simpleauth"}, + APIOpts: map[string]interface{}{utils.OptsContext: "simpleauth"}, }, { @@ -64,7 +64,7 @@ var ( Event: map[string]interface{}{ utils.AccountField: "1007", }, - Opts: map[string]interface{}{utils.OptsContext: "simpleauth"}, + APIOpts: map[string]interface{}{utils.OptsContext: "simpleauth"}, }, } @@ -315,7 +315,7 @@ func testChargerSProcessEvent(t *testing.T) { "Password": "CGRateS.org", "RunID": utils.MetaDefault, }, - Opts: map[string]interface{}{utils.OptsContext: "simpleauth", utils.Subsys: utils.MetaChargers}, + APIOpts: map[string]interface{}{utils.OptsContext: "simpleauth", utils.Subsys: utils.MetaChargers}, }, }, } @@ -344,7 +344,7 @@ func testChargerSProcessEvent(t *testing.T) { utils.Category: "call", utils.RunID: utils.MetaDefault, }, - Opts: map[string]interface{}{utils.OptsContext: "simpleauth", utils.Subsys: utils.MetaChargers}, + APIOpts: map[string]interface{}{utils.OptsContext: "simpleauth", utils.Subsys: utils.MetaChargers}, }, }, } @@ -518,7 +518,7 @@ func testChargerSProcessWithNotFoundAttribute(t *testing.T) { "CustomField": "WithoutAttributes", "RunID": "CustomRun", }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaChargers}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaChargers}, }, }, } @@ -580,7 +580,7 @@ func testChargerSProccessEventWithProcceSRunS(t *testing.T) { utils.AccountField: "1002", utils.RunID: "*default", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaChargers, utils.OptsAttributesProcessRuns: 1., }, @@ -593,7 +593,7 @@ func testChargerSProccessEventWithProcceSRunS(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1010", }, - Opts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, + APIOpts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, } var result2 []*engine.ChrgSProcessEventReply if err := chargerRPC.Call(utils.ChargerSv1ProcessEvent, cgrEv, &result2); err != nil { diff --git a/apier/v1/cost_bench_it_test.go b/apier/v1/cost_bench_it_test.go index 1b3635804..3526136c3 100644 --- a/apier/v1/cost_bench_it_test.go +++ b/apier/v1/cost_bench_it_test.go @@ -267,7 +267,7 @@ func BenchmarkCostWithRateS(b *testing.B) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "2m", }, }, @@ -299,7 +299,7 @@ func BenchmarkCostDiffPeriodWithRateS(b *testing.B) { Event: map[string]interface{}{ utils.Subject: "1010", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2020, 12, 23, 59, 0, 0, 0, time.UTC), utils.OptsRatesUsage: "2h", }, diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go index d50801116..385ced975 100755 --- a/apier/v1/dispatcher.go +++ b/apier/v1/dispatcher.go @@ -1232,7 +1232,7 @@ func (dS *DispatcherReplicatorSv1) RemoveActionPlan(args *utils.StringWithAPIOpt } // RemAccountActionPlans -func (dS *DispatcherReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) error { +func (dS *DispatcherReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithAPIOpts, reply *string) error { return dS.dS.ReplicatorSv1RemAccountActionPlans(args, reply) } diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go index 68ccf6557..b87b6eb22 100644 --- a/apier/v1/dispatchersv1_it_test.go +++ b/apier/v1/dispatchersv1_it_test.go @@ -138,7 +138,7 @@ func testDspDspv1GetProfileForEvent(t *testing.T) { Event: map[string]interface{}{ utils.EventName: "Event1", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaAny, }, } @@ -184,7 +184,7 @@ func testDspDspv1GetProfileForEvent(t *testing.T) { Event: map[string]interface{}{ utils.EventName: "Event1", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaAny, }, } @@ -203,7 +203,7 @@ func testDspDspv1GetProfileForEventWithMethod(t *testing.T) { Tenant: "cgrates.org", ID: "testDspv2", Event: map[string]interface{}{}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaAny, utils.OptsDispatcherMethod: utils.DispatcherSv1GetProfileForEvent, }, diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 82c32e582..6ec87aaf0 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -151,7 +151,7 @@ func testV1FIdxCaProcessEventWithNotFound(t *testing.T) { utils.EventType: utils.BalanceUpdate, utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -222,7 +222,7 @@ func testV1FIdxCaSetThresholdProfile(t *testing.T) { utils.EventType: utils.BalanceUpdate, utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -251,7 +251,7 @@ func testV1FIdxCaGetThresholdFromTP(t *testing.T) { utils.BalanceID: utils.MetaDefault, utils.Units: 12.3, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -324,7 +324,7 @@ func testV1FIdxCaUpdateThresholdProfile(t *testing.T) { utils.EventType: utils.AccountUpdate, utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -345,7 +345,7 @@ func testV1FIdxCaUpdateThresholdProfile(t *testing.T) { utils.EventType: utils.AccountUpdate, utils.AccountField: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -415,7 +415,7 @@ func testV1FIdxCaUpdateThresholdProfileFromTP(t *testing.T) { utils.AccountField: "1002", utils.EventType: utils.BalanceUpdate, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -434,7 +434,7 @@ func testV1FIdxCaUpdateThresholdProfileFromTP(t *testing.T) { utils.AccountField: "1003", utils.EventType: utils.BalanceUpdate, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -458,7 +458,7 @@ func testV1FIdxCaRemoveThresholdProfile(t *testing.T) { utils.AccountField: "1002", utils.EventType: utils.AccountUpdate, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -479,7 +479,7 @@ func testV1FIdxCaRemoveThresholdProfile(t *testing.T) { utils.AccountField: "1003", utils.EventType: utils.BalanceUpdate, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -538,7 +538,7 @@ func testV1FIdxCaGetStatQueuesWithNotFound(t *testing.T) { utils.EventType: utils.AccountUpdate, utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -622,7 +622,7 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { utils.AccountField: "1001", "Val": 10, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -686,7 +686,7 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { utils.Usage: 45 * time.Second, utils.Cost: 12.1, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -707,7 +707,7 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { utils.Usage: 45 * time.Second, utils.Cost: 12.1, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -785,7 +785,7 @@ func testV1FIdxCaUpdateStatQueueProfile(t *testing.T) { utils.AccountField: "1003", "Val": 10, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -849,7 +849,7 @@ func testV1FIdxCaUpdateStatQueueProfileFromTP(t *testing.T) { utils.Usage: 45 * time.Second, utils.Cost: 12.1, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -876,7 +876,7 @@ func testV1FIdxCaRemoveStatQueueProfile(t *testing.T) { utils.AccountField: "1003", "Val": 10, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -898,7 +898,7 @@ func testV1FIdxCaRemoveStatQueueProfile(t *testing.T) { utils.Usage: 45 * time.Second, utils.Cost: 12.1, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go index 1befe1e34..34c11ed7b 100644 --- a/apier/v1/rateprofiles_it_test.go +++ b/apier/v1/rateprofiles_it_test.go @@ -938,7 +938,7 @@ func testV1RateCostForEventWithUsage(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "2m10s", }, }, @@ -1006,7 +1006,7 @@ func testV1RateCostForEventWithUsage(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "4h10m15s", }, }, @@ -1053,7 +1053,7 @@ func testV1RateCostForEventWithWrongUsage(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "wrongUsage", }, }, @@ -1105,7 +1105,7 @@ func testV1RateCostForEventWithStartTime(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), }, }, @@ -1142,7 +1142,7 @@ func testV1RateCostForEventWithStartTime(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC).String(), }, }, @@ -1163,7 +1163,7 @@ func testV1RateCostForEventWithWrongStartTime(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: "wrongTime", }, }, @@ -1191,7 +1191,7 @@ func testV1RateCostForEventWithOpts(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), utils.OptsRatesUsage: "2m10s", }, @@ -1260,7 +1260,7 @@ func testV1RateCostForEventWithOpts(t *testing.T) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), utils.OptsRatesUsage: "4h10m15s", }, diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go index a93b03cf0..f9332ab9d 100644 --- a/apier/v1/replicate_it_test.go +++ b/apier/v1/replicate_it_test.go @@ -1216,7 +1216,7 @@ func testInternalReplicateITThreshold(t *testing.T) { utils.AllowNegative: true, utils.Disabled: false, utils.Units: 12.3}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, diff --git a/apier/v1/replicator.go b/apier/v1/replicator.go index 38a43c4e7..e6bbdbd15 100644 --- a/apier/v1/replicator.go +++ b/apier/v1/replicator.go @@ -914,12 +914,12 @@ func (rplSv1 *ReplicatorSv1) RemoveActionPlan(id *utils.StringWithAPIOpts, reply } // RemAccountActionPlans is the replication method coresponding to the dataDb driver method -func (rplSv1 *ReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) (err error) { +func (rplSv1 *ReplicatorSv1) RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithAPIOpts, reply *string) (err error) { if err = rplSv1.dm.DataDB().RemAccountActionPlansDrv(args.AcntID, args.ApIDs); err != nil { return } - if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), - args.Tenant, utils.CacheAccountActionPlans, args.AcntID, nil, nil, args.Opts); err != nil { + if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), + args.Tenant, utils.CacheAccountActionPlans, args.AcntID, nil, nil, args.APIOpts); err != nil { return } *reply = utils.OK diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index 31f37351d..58c524df9 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -982,7 +982,7 @@ func testV1RsAuthorizeResourcesWithOpts(t *testing.T) { "Subject": "1001", "Destination": "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "CustomField": "1007", }, }, diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go index 108bcef82..84e03de8c 100644 --- a/apier/v1/routes_it_test.go +++ b/apier/v1/routes_it_test.go @@ -171,7 +171,7 @@ func testV1RouteGetWeightRoutes(t *testing.T) { utils.AccountField: "1007", utils.Destination: "+491511231234", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -223,7 +223,7 @@ func testV1RouteGetLeastCostRoutes(t *testing.T) { utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), utils.Usage: "1m20s", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -277,7 +277,7 @@ func testV1RouteGetLeastCostRoutesWithoutUsage(t *testing.T) { utils.Destination: "1002", utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -333,7 +333,7 @@ func testV1RouteGetLeastCostRoutesWithMaxCost(t *testing.T) { utils.SetupTime: time.Date(2017, 12, 1, 14, 25, 0, 0, time.UTC), utils.Usage: "1m20s", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -404,7 +404,7 @@ func testV1RouteGetLeastCostRoutesWithMaxCost2(t *testing.T) { utils.Usage: "10m20s", utils.Category: "call", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -451,7 +451,7 @@ func testV1RouteGetHighestCostRoutes(t *testing.T) { utils.Usage: "1m20s", "DistinctMatch": "*highest_cost", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -1148,7 +1148,7 @@ func testV1RoutesOneRouteWithoutDestination(t *testing.T) { utils.SetupTime: utils.MetaNow, utils.Usage: "2m", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -1225,7 +1225,7 @@ func testV1RouteMultipleRouteSameID(t *testing.T) { utils.Usage: "2m", "Month": "April", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := engine.SortedRoutesList{{ @@ -1263,7 +1263,7 @@ func testV1RouteMultipleRouteSameID(t *testing.T) { utils.Usage: "2m", "Month": "May", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls = engine.SortedRoutesList{{ @@ -1361,7 +1361,7 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { utils.Usage: "30s", "EventType": "testV1RouteAccountWithRatingPlan", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls := &engine.SortedRoutesList{{ @@ -1431,7 +1431,7 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { utils.Usage: "60s", "EventType": "testV1RouteAccountWithRatingPlan", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls = &engine.SortedRoutesList{{ @@ -1503,7 +1503,7 @@ func testV1RouteAccountWithRatingPlan(t *testing.T) { utils.Usage: "1m1s", "EventType": "testV1RouteAccountWithRatingPlan", }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } eSpls = &engine.SortedRoutesList{{ diff --git a/apier/v1/sessions_process_event_it_test.go b/apier/v1/sessions_process_event_it_test.go index 77b57911d..5f77abace 100644 --- a/apier/v1/sessions_process_event_it_test.go +++ b/apier/v1/sessions_process_event_it_test.go @@ -245,7 +245,7 @@ func testSSv1ItProcessEventAuth(t *testing.T) { utils.SetupTime: "2018-01-07T17:00:00Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes[utils.MetaRaw]) { @@ -319,7 +319,7 @@ func testSSv1ItProcessEventInitiateSession(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes[utils.MetaRaw]) { @@ -382,7 +382,7 @@ func testSSv1ItProcessEventUpdateSession(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes[utils.MetaRaw]) { diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index d21f0fe42..8f0770f8f 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -281,7 +281,7 @@ func testSSv1ItAuth(t *testing.T) { utils.SetupTime: "2018-01-07T17:00:00Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes) { @@ -311,7 +311,7 @@ func testSSv1ItAuthWithDigest(t *testing.T) { utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.Usage: authUsage, }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, }, } var rply sessions.V1AuthorizeReplyWithDigest @@ -393,7 +393,7 @@ func testSSv1ItInitiateSession(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes) { @@ -505,7 +505,7 @@ func testSSv1ItUpdateSession(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes) { @@ -649,7 +649,7 @@ func testSSv1ItProcessEvent(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes) { @@ -828,7 +828,7 @@ func testSSv1ItForceUpdateSession(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaSessionS}, }, } if !reflect.DeepEqual(eAttrs, rply.Attributes) { @@ -954,7 +954,7 @@ func testSSv1ItDynamicDebit(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: 0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: 30 * time.Millisecond, }, }, diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 1c4b5a845..0125c869f 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -1353,7 +1353,7 @@ func testV1STSV1GetStatQueuesForEventWithoutTenant(t *testing.T) { utils.Cost: 10.0, utils.Destination: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, @@ -1443,7 +1443,7 @@ func testV1STSSimulateAccountUpdate(t *testing.T) { Tenant: "cgrates.org", ID: "SIMULATE_ACNT_UPDATE_EV", Event: acnt.AsAccountSummary().AsMapInterface(), - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go index b95e4163e..93147bc27 100644 --- a/apier/v1/thresholds_it_test.go +++ b/apier/v1/thresholds_it_test.go @@ -50,7 +50,7 @@ var ( utils.AllowNegative: true, utils.Disabled: false, utils.Units: 12.3}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, @@ -66,7 +66,7 @@ var ( utils.Units: 12.3, utils.ExpiryTime: time.Date(2009, 11, 10, 23, 00, 0, 0, time.UTC), }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -86,7 +86,7 @@ var ( "ACC": 0.75, "PDD": "2s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.StatUpdate, }, }, @@ -103,7 +103,7 @@ var ( "ACD": "2m45s", "TCD": "1h", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.StatUpdate, }, }, @@ -119,7 +119,7 @@ var ( "ACD": "2m45s", "TCD": "3h1s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.StatUpdate, }, }, @@ -134,7 +134,7 @@ var ( utils.ResourceID: "RES_GRP_1", utils.Usage: 10.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.ResourceUpdate, }, }, @@ -149,7 +149,7 @@ var ( utils.ResourceID: "RES_GRP_1", utils.Usage: 10.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.ResourceUpdate, }, }, @@ -164,7 +164,7 @@ var ( utils.ResourceID: "RES_GRP_1", utils.Usage: 10.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.ResourceUpdate, }, }, @@ -196,7 +196,7 @@ var ( utils.Route: "SUPPL1", utils.Cost: -1.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, }, @@ -904,7 +904,7 @@ func testV1TSProcessAccountUpdateEvent(t *testing.T) { Tenant: "cgrates.org", ID: "SIMULATE_ACNT_UPDATE_EV", Event: acnt.AsAccountSummary().AsMapInterface(), - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, }, diff --git a/cmd/cgr-tester/proc_event/proc_ev.go b/cmd/cgr-tester/proc_event/proc_ev.go index 11b08509e..0d57511de 100644 --- a/cmd/cgr-tester/proc_event/proc_ev.go +++ b/cmd/cgr-tester/proc_event/proc_ev.go @@ -113,7 +113,7 @@ func main() { utils.Destination: destination, "PrefixDestination": destination[:3], }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: usage, }, }, diff --git a/config/navigablemap.go b/config/navigablemap.go index 713602d82..0219155c0 100644 --- a/config/navigablemap.go +++ b/config/navigablemap.go @@ -185,11 +185,11 @@ func NMAsCGREvent(nM *utils.OrderedNavigableMap, tnt string, pathSep string, opt return } cgrEv = &utils.CGREvent{ - Tenant: tnt, - ID: utils.UUIDSha1Prefix(), - Time: utils.TimePointer(time.Now()), - Event: make(map[string]interface{}), - Opts: NMAsMapInterface(opts, pathSep), + Tenant: tnt, + ID: utils.UUIDSha1Prefix(), + Time: utils.TimePointer(time.Now()), + Event: make(map[string]interface{}), + APIOpts: NMAsMapInterface(opts, pathSep), } for ; el != nil; el = el.Next() { branchPath := el.Value diff --git a/dispatchers/accounts.go b/dispatchers/accounts.go index adcb5a8ab..15526aa71 100644 --- a/dispatchers/accounts.go +++ b/dispatchers/accounts.go @@ -31,7 +31,7 @@ func (dS *DispatcherService) AccountSv1Ping(args *utils.CGREvent, rpl *string) ( args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -45,7 +45,7 @@ func (dS *DispatcherService) AccountProfilesForEvent(args *utils.ArgsAccountsFor } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1AccountProfilesForEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -59,7 +59,7 @@ func (dS *DispatcherService) MaxAbstracts(args *utils.ArgsAccountsForEvent, repl } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1MaxAbstracts, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -73,7 +73,7 @@ func (dS *DispatcherService) DebitAbstracts(args *utils.ArgsAccountsForEvent, re } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1DebitAbstracts, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -87,7 +87,7 @@ func (dS *DispatcherService) MaxConcretes(args *utils.ArgsAccountsForEvent, repl } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1MaxConcretes, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -101,7 +101,7 @@ func (dS *DispatcherService) DebitConcretes(args *utils.ArgsAccountsForEvent, re } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AccountSv1DebitConcretes, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -120,8 +120,8 @@ func (dS *DispatcherService) AccountSv1ActionSetBalance(args *utils.ArgsActSetBa } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaAccounts, utils.AccountSv1ActionSetBalance, args, reply) } @@ -137,7 +137,7 @@ func (dS *DispatcherService) AccountSv1ActionRemoveBalance(args *utils.ArgsActRe } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaAccounts, utils.AccountSv1ActionRemoveBalance, args, reply) } diff --git a/dispatchers/accounts_it_test.go b/dispatchers/accounts_it_test.go index a9e1cc3d8..1116fe3f4 100644 --- a/dispatchers/accounts_it_test.go +++ b/dispatchers/accounts_it_test.go @@ -66,7 +66,7 @@ func testDspAccPrfPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.AccountSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "accPrf12345", }, }, &reply); err != nil { diff --git a/dispatchers/actions.go b/dispatchers/actions.go index 1e13ea9dd..532d234c4 100644 --- a/dispatchers/actions.go +++ b/dispatchers/actions.go @@ -27,7 +27,7 @@ func (dS *DispatcherService) ActionSv1Ping(args *utils.CGREvent, rpl *string) (e args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ActionSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -44,7 +44,7 @@ func (dS *DispatcherService) ActionSv1ScheduleActions(args *utils.ArgActionSv1Sc } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ActionSv1ScheduleActions, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -61,7 +61,7 @@ func (dS *DispatcherService) ActionSv1ExecuteActions(args *utils.ArgActionSv1Sch } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ActionSv1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } diff --git a/dispatchers/actions_it_test.go b/dispatchers/actions_it_test.go index 5b0af194d..7504bf693 100644 --- a/dispatchers/actions_it_test.go +++ b/dispatchers/actions_it_test.go @@ -66,7 +66,7 @@ func testDspActPrfPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.ActionSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "actPrf12345", }, }, &reply); err != nil { diff --git a/dispatchers/attributes.go b/dispatchers/attributes.go index 676703c08..fae8fb5e7 100755 --- a/dispatchers/attributes.go +++ b/dispatchers/attributes.go @@ -35,7 +35,7 @@ func (dS *DispatcherService) AttributeSv1Ping(args *utils.CGREvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AttributeSv1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -51,7 +51,7 @@ func (dS *DispatcherService) AttributeSv1GetAttributeForEvent(args *engine.AttrA } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AttributeSv1GetAttributeForEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -67,7 +67,7 @@ func (dS *DispatcherService) AttributeSv1ProcessEvent(args *engine.AttrArgsProce } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.AttributeSv1ProcessEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index 3c4fe353c..865dcc6e0 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -101,7 +101,7 @@ func testDspAttrPingFailover(t *testing.T) { reply = "" ev := &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, } @@ -144,7 +144,7 @@ func testDspAttrPingFailoverNotFoundHost(t *testing.T) { Event: map[string]interface{}{ "EventName": "NonexistingHost", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, } @@ -183,7 +183,7 @@ func testDspAttrPingFailover2(t *testing.T) { reply = "" ev := &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, } @@ -218,7 +218,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { utils.AccountField: "1002", utils.EventName: "Event1", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -254,7 +254,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { utils.EventName: "Event1", "Password": "CGRateS.org", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -311,7 +311,7 @@ func testDspAttrPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, &reply); err != nil { @@ -365,7 +365,7 @@ func testDspAttrTestUnknownApiKey(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "1234", }, }, @@ -386,7 +386,7 @@ func testDspAttrTestAuthKey(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -407,7 +407,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -454,7 +454,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { utils.AccountField: "1001", "Password": "CGRateS.org", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -480,7 +480,7 @@ func testDspAttrTestAuthKey3(t *testing.T) { utils.AccountField: "1001", utils.EventName: "Event1", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -502,7 +502,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { utils.AccountField: "1002", utils.EventName: "RoundRobin", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -538,7 +538,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { utils.EventName: "RoundRobin", "Password": "CGRateS.org", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -593,7 +593,7 @@ func testDspAttrGetAttrInternal(t *testing.T) { utils.EventName: "Internal", utils.AccountField: "1003", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, @@ -610,7 +610,7 @@ func testDspAttrGetAttrInternal(t *testing.T) { utils.EventName: "Internal", "Password": "CGRateS.com", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "attr12345", }, }, diff --git a/dispatchers/caches.go b/dispatchers/caches.go index f95c4a19d..5dbcba507 100644 --- a/dispatchers/caches.go +++ b/dispatchers/caches.go @@ -37,7 +37,7 @@ func (dS *DispatcherService) CacheSv1Ping(args *utils.CGREvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CacheSv1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -58,8 +58,8 @@ func (dS *DispatcherService) CacheSv1GetItemIDs(args *utils.ArgsGetCacheItemIDsW } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1GetItemIDs, args, reply) } @@ -78,8 +78,8 @@ func (dS *DispatcherService) CacheSv1HasItem(args *utils.ArgsGetCacheItemWithAPI } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1HasItem, args, reply) } @@ -99,8 +99,8 @@ func (dS *DispatcherService) CacheSv1GetItemExpiryTime(args *utils.ArgsGetCacheI } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1GetItemExpiryTime, args, reply) } @@ -118,8 +118,8 @@ func (dS *DispatcherService) CacheSv1RemoveItem(args *utils.ArgsGetCacheItemWith } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1RemoveItem, args, reply) } @@ -137,8 +137,8 @@ func (dS *DispatcherService) CacheSv1RemoveItems(args utils.AttrReloadCacheWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1RemoveItems, args, reply) } @@ -156,8 +156,8 @@ func (dS *DispatcherService) CacheSv1Clear(args *utils.AttrCacheIDsWithOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1Clear, args, reply) } @@ -175,8 +175,8 @@ func (dS *DispatcherService) CacheSv1GetCacheStats(args *utils.AttrCacheIDsWithO } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1GetCacheStats, args, reply) } @@ -193,8 +193,8 @@ func (dS *DispatcherService) CacheSv1PrecacheStatus(args *utils.AttrCacheIDsWith } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1PrecacheStatus, args, reply) } @@ -212,8 +212,8 @@ func (dS *DispatcherService) CacheSv1HasGroup(args *utils.ArgsGetGroupWithOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCaches, utils.CacheSv1HasGroup, args, reply) } @@ -231,8 +231,8 @@ func (dS *DispatcherService) CacheSv1GetGroupItemIDs(args *utils.ArgsGetGroupWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCaches, utils.CacheSv1GetGroupItemIDs, args, reply) } @@ -249,8 +249,8 @@ func (dS *DispatcherService) CacheSv1RemoveGroup(args *utils.ArgsGetGroupWithOpt } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCaches, utils.CacheSv1RemoveGroup, args, reply) } @@ -267,8 +267,8 @@ func (dS *DispatcherService) CacheSv1ReloadCache(args utils.AttrReloadCacheWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1ReloadCache, args, reply) } @@ -285,8 +285,8 @@ func (dS *DispatcherService) CacheSv1LoadCache(args utils.AttrReloadCacheWithAPI } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCaches, utils.CacheSv1LoadCache, args, reply) } @@ -303,8 +303,8 @@ func (dS *DispatcherService) CacheSv1ReplicateRemove(args *utils.ArgCacheReplica } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCaches, utils.CacheSv1ReplicateRemove, args, reply) } @@ -321,7 +321,7 @@ func (dS *DispatcherService) CacheSv1ReplicateSet(args *utils.ArgCacheReplicateS } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCaches, utils.CacheSv1ReplicateSet, args, reply) } diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index 397b051a5..6600df28d 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -84,7 +84,7 @@ func testDspChcPing(t *testing.T) { Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chc12345", }, }, &reply); err != nil { diff --git a/dispatchers/cdrs.go b/dispatchers/cdrs.go index b01b53ae7..910dd59dd 100644 --- a/dispatchers/cdrs.go +++ b/dispatchers/cdrs.go @@ -37,7 +37,7 @@ func (dS *DispatcherService) CDRsV1Ping(args *utils.CGREvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -58,8 +58,8 @@ func (dS *DispatcherService) CDRsV1GetCDRs(args *utils.RPCCDRsFilterWithOpts, re } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1GetCDRs, args, reply) } @@ -76,8 +76,8 @@ func (dS *DispatcherService) CDRsV1GetCDRsCount(args *utils.RPCCDRsFilterWithOpt } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1GetCDRsCount, args, reply) } @@ -93,8 +93,8 @@ func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSM } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1StoreSessionCost, args, reply) } @@ -110,8 +110,8 @@ func (dS *DispatcherService) CDRsV1RateCDRs(args *engine.ArgRateCDRs, reply *str } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1RateCDRs, args, reply) } @@ -127,8 +127,8 @@ func (dS *DispatcherService) CDRsV1ProcessExternalCDR(args *engine.ExternalCDRWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1ProcessExternalCDR, args, reply) } @@ -139,7 +139,7 @@ func (dS *DispatcherService) CDRsV1ProcessEvent(args *engine.ArgV1ProcessEvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV1ProcessEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -159,8 +159,8 @@ func (dS *DispatcherService) CDRsV1ProcessCDR(args *engine.CDRWithOpts, reply *s } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV1ProcessCDR, args, reply) } @@ -171,7 +171,7 @@ func (dS *DispatcherService) CDRsV2ProcessEvent(args *engine.ArgV1ProcessEvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CDRsV2ProcessEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -191,7 +191,7 @@ func (dS *DispatcherService) CDRsV2StoreSessionCost(args *engine.ArgsV2CDRSStore } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCDRs, utils.CDRsV2StoreSessionCost, args, reply) } diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index b84176493..23ac96dcb 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -105,7 +105,7 @@ func testDspCDRsPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.CDRsV1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, }, &reply); err != nil { @@ -134,7 +134,7 @@ func testDspCDRsProcessEvent(t *testing.T) { "fieldextr2": "valextr2", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "cdrs12345", }, }, @@ -329,7 +329,7 @@ func testDspCDRsV2ProcessEvent(t *testing.T) { utils.AnswerTime: time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC), utils.Usage: time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "cdrsv212345", }, }, diff --git a/dispatchers/chargers.go b/dispatchers/chargers.go index 909c8b059..65832ecc8 100755 --- a/dispatchers/chargers.go +++ b/dispatchers/chargers.go @@ -33,7 +33,7 @@ func (dS *DispatcherService) ChargerSv1Ping(args *utils.CGREvent, reply *string) } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ChargerSv1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -48,7 +48,7 @@ func (dS *DispatcherService) ChargerSv1GetChargersForEvent(args *utils.CGREvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ChargerSv1GetChargersForEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -63,7 +63,7 @@ func (dS *DispatcherService) ChargerSv1ProcessEvent(args *utils.CGREvent, } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ChargerSv1ProcessEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index 573841a30..ce43d3be7 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -77,7 +77,7 @@ func testDspCppPingFailover(t *testing.T) { ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chrg12345", }, } @@ -109,7 +109,7 @@ func testDspCppGetChtgFailover(t *testing.T) { utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chrg12345", }, } @@ -171,7 +171,7 @@ func testDspCppPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chrg12345", }, }, &reply); err != nil { @@ -188,7 +188,7 @@ func testDspCppTestAuthKey(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, } @@ -207,7 +207,7 @@ func testDspCppTestAuthKey2(t *testing.T) { utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chrg12345", }, } @@ -254,7 +254,7 @@ func testDspCppGetChtgRoundRobin(t *testing.T) { utils.EventName: "RoundRobin", utils.AccountField: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "chrg12345", }, } diff --git a/dispatchers/config.go b/dispatchers/config.go index aabd2b290..a56396b30 100644 --- a/dispatchers/config.go +++ b/dispatchers/config.go @@ -37,8 +37,8 @@ func (dS *DispatcherService) ConfigSv1GetConfig(args *config.SectionWithOpts, re } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaConfig, utils.ConfigSv1GetConfig, args, reply) } @@ -54,8 +54,8 @@ func (dS *DispatcherService) ConfigSv1ReloadConfig(args *config.ReloadArgs, repl } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaConfig, utils.ConfigSv1ReloadConfig, args, reply) } @@ -71,8 +71,8 @@ func (dS *DispatcherService) ConfigSv1SetConfig(args *config.SetConfigArgs, repl } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaConfig, utils.ConfigSv1SetConfig, args, reply) } @@ -88,8 +88,8 @@ func (dS *DispatcherService) ConfigSv1SetConfigFromJSON(args *config.SetConfigFr } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaConfig, utils.ConfigSv1SetConfigFromJSON, args, reply) } @@ -105,7 +105,7 @@ func (dS *DispatcherService) ConfigSv1GetConfigAsJSON(args *config.SectionWithOp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaConfig, utils.ConfigSv1GetConfigAsJSON, args, reply) } diff --git a/dispatchers/core.go b/dispatchers/core.go index 9d3ea0db4..1928fd8aa 100644 --- a/dispatchers/core.go +++ b/dispatchers/core.go @@ -37,8 +37,8 @@ func (dS *DispatcherService) CoreSv1Status(args *utils.TenantWithAPIOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaCore, utils.CoreSv1Status, args, reply) } @@ -49,7 +49,7 @@ func (dS *DispatcherService) CoreSv1Ping(args *utils.CGREvent, reply *string) (e } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.CoreSv1Ping, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -69,7 +69,7 @@ func (dS *DispatcherService) CoreSv1Sleep(args *utils.DurationArgs, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaCore, utils.CoreSv1Sleep, args, reply) } diff --git a/dispatchers/dispatchers.go b/dispatchers/dispatchers.go index 3c025d1b1..68fff8f97 100755 --- a/dispatchers/dispatchers.go +++ b/dispatchers/dispatchers.go @@ -84,7 +84,7 @@ func (dS *DispatcherService) authorize(method, tenant string, apiKey string, evT Event: map[string]interface{}{ utils.APIKey: apiKey, }, - Opts: map[string]interface{}{utils.Subsys: utils.MetaDispatchers}, + APIOpts: map[string]interface{}{utils.Subsys: utils.MetaDispatchers}, } var rplyEv engine.AttrSProcessEventReply if err = dS.authorizeEvent(ev, &rplyEv); err != nil { @@ -112,7 +112,7 @@ func (dS *DispatcherService) dispatcherProfileForEvent(tnt string, ev *utils.CGR } evNm := utils.MapStorage{ utils.MetaReq: ev.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, } prflIDs, err := engine.MatchingItemIDsForEvent(evNm, dS.cfg.DispatcherSCfg().StringIndexedFields, @@ -194,7 +194,7 @@ func (dS *DispatcherService) Dispatch(ev *utils.CGREvent, subsys string, if errCh := engine.Cache.Set(utils.CacheDispatchers, tntID, d, nil, true, utils.EmptyString); errCh != nil { return utils.NewErrDispatcherS(errCh) } - return d.Dispatch(utils.IfaceAsString(ev.Opts[utils.OptsRouteID]), subsys, serviceMethod, args, reply) + return d.Dispatch(utils.IfaceAsString(ev.APIOpts[utils.OptsRouteID]), subsys, serviceMethod, args, reply) } func (dS *DispatcherService) V1GetProfileForEvent(ev *utils.CGREvent, @@ -203,7 +203,7 @@ func (dS *DispatcherService) V1GetProfileForEvent(ev *utils.CGREvent, if tnt == utils.EmptyString { tnt = dS.cfg.GeneralCfg().DefaultTenant } - retDPfl, errDpfl := dS.dispatcherProfileForEvent(tnt, ev, utils.IfaceAsString(ev.Opts[utils.Subsys])) + retDPfl, errDpfl := dS.dispatcherProfileForEvent(tnt, ev, utils.IfaceAsString(ev.APIOpts[utils.Subsys])) if errDpfl != nil { return utils.NewErrDispatcherS(errDpfl) } diff --git a/dispatchers/guardian.go b/dispatchers/guardian.go index 4d81abc97..0231d9dfa 100644 --- a/dispatchers/guardian.go +++ b/dispatchers/guardian.go @@ -33,7 +33,7 @@ func (dS *DispatcherService) GuardianSv1Ping(args *utils.CGREvent, args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.GuardianSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -54,8 +54,8 @@ func (dS *DispatcherService) GuardianSv1RemoteLock(args AttrRemoteLockWithOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaGuardian, utils.GuardianSv1RemoteLock, args, reply) } @@ -73,7 +73,7 @@ func (dS *DispatcherService) GuardianSv1RemoteUnlock(args AttrRemoteUnlockWithOp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaGuardian, utils.GuardianSv1RemoteUnlock, args, reply) } diff --git a/dispatchers/guardian_it_test.go b/dispatchers/guardian_it_test.go index 15e56ccc5..3b30252eb 100644 --- a/dispatchers/guardian_it_test.go +++ b/dispatchers/guardian_it_test.go @@ -70,7 +70,7 @@ func testDspGrdPing(t *testing.T) { if err := dispEngine.RPC.Call(utils.GuardianSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "grd12345", }, }, &reply); err != nil { diff --git a/dispatchers/rals.go b/dispatchers/rals.go index 66faaac74..5987498c0 100644 --- a/dispatchers/rals.go +++ b/dispatchers/rals.go @@ -31,7 +31,7 @@ func (dS *DispatcherService) RALsV1Ping(args *utils.CGREvent, rpl *string) (err args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RALsV1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -47,7 +47,7 @@ func (dS *DispatcherService) RALsV1GetRatingPlansCost(args *utils.RatingPlanCost } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tenant, - Opts: args.Opts, + Tenant: tenant, + APIOpts: args.Opts, }, utils.MetaRALs, utils.RALsV1GetRatingPlansCost, args, rpl) } diff --git a/dispatchers/rals_it_test.go b/dispatchers/rals_it_test.go index 1518408cc..cc9136feb 100644 --- a/dispatchers/rals_it_test.go +++ b/dispatchers/rals_it_test.go @@ -69,7 +69,7 @@ func testDspRALsPing(t *testing.T) { if err := dispEngine.RPC.Call(utils.RALsV1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rals12345", }, }, &reply); err != nil { diff --git a/dispatchers/rates.go b/dispatchers/rates.go index bf9b6438f..fedb79834 100644 --- a/dispatchers/rates.go +++ b/dispatchers/rates.go @@ -29,7 +29,7 @@ func (dS *DispatcherService) RateSv1Ping(args *utils.CGREvent, rpl *string) (err args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RateSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -43,7 +43,7 @@ func (dS *DispatcherService) RateSv1CostForEvent(args *utils.ArgsCostForEvent, r args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RateSv1CostForEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } diff --git a/dispatchers/rates_it_test.go b/dispatchers/rates_it_test.go index 120971ae5..3493975fb 100644 --- a/dispatchers/rates_it_test.go +++ b/dispatchers/rates_it_test.go @@ -70,7 +70,7 @@ func testDspRPrfPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.RateSv1Ping, utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rPrf12345", }, }, &reply); err != nil { @@ -144,7 +144,7 @@ func testDspRPrfCostForEvent(t *testing.T) { utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rPrf12345", }}}, &rpCost); err != nil { t.Error(err) @@ -217,7 +217,7 @@ func testDspRPrfCostForEventWithoutFilters(t *testing.T) { utils.Subject: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rPrf12345", }}}, &rpCost); err != nil { t.Error(err) diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go index 594035290..43f0c8bb7 100644 --- a/dispatchers/replicator.go +++ b/dispatchers/replicator.go @@ -32,7 +32,7 @@ func (dS *DispatcherService) ReplicatorSv1Ping(args *utils.CGREvent, rpl *string args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -51,8 +51,8 @@ func (dS *DispatcherService) ReplicatorSv1GetAccount(args *utils.StringWithAPIOp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAccount, args, rpl) } @@ -68,8 +68,8 @@ func (dS *DispatcherService) ReplicatorSv1GetDestination(args *utils.StringWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetDestination, args, rpl) } @@ -85,8 +85,8 @@ func (dS *DispatcherService) ReplicatorSv1GetReverseDestination(args *utils.Stri } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetReverseDestination, args, rpl) } @@ -102,9 +102,9 @@ func (dS *DispatcherService) ReplicatorSv1GetStatQueue(args *utils.TenantIDWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetStatQueue, args, reply) } @@ -120,9 +120,9 @@ func (dS *DispatcherService) ReplicatorSv1GetFilter(args *utils.TenantIDWithAPIO } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetFilter, args, reply) } @@ -138,9 +138,9 @@ func (dS *DispatcherService) ReplicatorSv1GetThreshold(args *utils.TenantIDWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetThreshold, args, reply) } @@ -156,9 +156,9 @@ func (dS *DispatcherService) ReplicatorSv1GetThresholdProfile(args *utils.Tenant } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetThresholdProfile, args, reply) } @@ -174,9 +174,9 @@ func (dS *DispatcherService) ReplicatorSv1GetStatQueueProfile(args *utils.Tenant } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetStatQueueProfile, args, reply) } @@ -192,8 +192,8 @@ func (dS *DispatcherService) ReplicatorSv1GetTiming(args *utils.StringWithAPIOpt } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetTiming, args, rpl) } @@ -209,9 +209,9 @@ func (dS *DispatcherService) ReplicatorSv1GetResource(args *utils.TenantIDWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetResource, args, reply) } @@ -227,9 +227,9 @@ func (dS *DispatcherService) ReplicatorSv1GetResourceProfile(args *utils.TenantI } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetResourceProfile, args, reply) } @@ -245,8 +245,8 @@ func (dS *DispatcherService) ReplicatorSv1GetActionTriggers(args *utils.StringWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActionTriggers, args, rpl) } @@ -262,8 +262,8 @@ func (dS *DispatcherService) ReplicatorSv1GetSharedGroup(args *utils.StringWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetSharedGroup, args, rpl) } @@ -279,8 +279,8 @@ func (dS *DispatcherService) ReplicatorSv1GetActions(args *utils.StringWithAPIOp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActions, args, rpl) } @@ -296,8 +296,8 @@ func (dS *DispatcherService) ReplicatorSv1GetActionPlan(args *utils.StringWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActionPlan, args, rpl) } @@ -313,8 +313,8 @@ func (dS *DispatcherService) ReplicatorSv1GetAllActionPlans(args *utils.StringWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAllActionPlans, args, rpl) } @@ -330,8 +330,8 @@ func (dS *DispatcherService) ReplicatorSv1GetAccountActionPlans(args *utils.Stri } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAccountActionPlans, args, rpl) } @@ -347,8 +347,8 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingPlan(args *utils.StringWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRatingPlan, args, rpl) } @@ -364,8 +364,8 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingProfile(args *utils.StringWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRatingProfile, args, rpl) } @@ -381,9 +381,9 @@ func (dS *DispatcherService) ReplicatorSv1GetRouteProfile(args *utils.TenantIDWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRouteProfile, args, reply) } @@ -399,9 +399,9 @@ func (dS *DispatcherService) ReplicatorSv1GetAttributeProfile(args *utils.Tenant } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAttributeProfile, args, reply) } @@ -417,9 +417,9 @@ func (dS *DispatcherService) ReplicatorSv1GetChargerProfile(args *utils.TenantID } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetChargerProfile, args, reply) } @@ -435,9 +435,9 @@ func (dS *DispatcherService) ReplicatorSv1GetDispatcherProfile(args *utils.Tenan } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetDispatcherProfile, args, reply) } @@ -453,9 +453,9 @@ func (dS *DispatcherService) ReplicatorSv1GetDispatcherHost(args *utils.TenantID } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetDispatcherHost, args, reply) } @@ -471,9 +471,9 @@ func (dS *DispatcherService) ReplicatorSv1GetRateProfile(args *utils.TenantIDWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetRateProfile, args, reply) } @@ -489,9 +489,9 @@ func (dS *DispatcherService) ReplicatorSv1GetActionProfile(args *utils.TenantIDW } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetActionProfile, args, reply) } @@ -507,8 +507,8 @@ func (dS *DispatcherService) ReplicatorSv1GetItemLoadIDs(args *utils.StringWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetItemLoadIDs, args, rpl) } @@ -524,8 +524,8 @@ func (dS *DispatcherService) ReplicatorSv1SetThresholdProfile(args *engine.Thres } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.ThresholdProfile.Tenant, - Opts: args.APIOpts, + Tenant: args.ThresholdProfile.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetThresholdProfile, args, rpl) } @@ -541,8 +541,8 @@ func (dS *DispatcherService) ReplicatorSv1SetThreshold(args *engine.ThresholdWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetThreshold, args, rpl) } @@ -558,8 +558,8 @@ func (dS *DispatcherService) ReplicatorSv1SetDestination(args *engine.Destinatio } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetDestination, args, rpl) } @@ -575,8 +575,8 @@ func (dS *DispatcherService) ReplicatorSv1SetAccount(args *engine.AccountWithAPI } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tenant, - Opts: args.APIOpts, + Tenant: tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetAccount, args, rpl) } @@ -592,8 +592,8 @@ func (dS *DispatcherService) ReplicatorSv1SetReverseDestination(args *engine.Des } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetReverseDestination, args, rpl) } @@ -609,8 +609,8 @@ func (dS *DispatcherService) ReplicatorSv1SetStatQueue(args *engine.StatQueueWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetStatQueue, args, rpl) } @@ -626,8 +626,8 @@ func (dS *DispatcherService) ReplicatorSv1SetFilter(args *engine.FilterWithAPIOp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetFilter, args, rpl) } @@ -643,8 +643,8 @@ func (dS *DispatcherService) ReplicatorSv1SetStatQueueProfile(args *engine.StatQ } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetStatQueueProfile, args, rpl) } @@ -660,8 +660,8 @@ func (dS *DispatcherService) ReplicatorSv1SetTiming(args *utils.TPTimingWithAPIO } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetTiming, args, rpl) } @@ -677,8 +677,8 @@ func (dS *DispatcherService) ReplicatorSv1SetResource(args *engine.ResourceWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetResource, args, rpl) } @@ -694,8 +694,8 @@ func (dS *DispatcherService) ReplicatorSv1SetResourceProfile(args *engine.Resour } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetResourceProfile, args, rpl) } @@ -711,8 +711,8 @@ func (dS *DispatcherService) ReplicatorSv1SetActionTriggers(args *engine.SetActi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetActionTriggers, args, rpl) } @@ -728,8 +728,8 @@ func (dS *DispatcherService) ReplicatorSv1SetSharedGroup(args *engine.SharedGrou } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetSharedGroup, args, rpl) } @@ -745,8 +745,8 @@ func (dS *DispatcherService) ReplicatorSv1SetActions(args *engine.SetActionsArgs } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetActions, args, rpl) } @@ -762,8 +762,8 @@ func (dS *DispatcherService) ReplicatorSv1SetRatingPlan(args *engine.RatingPlanW } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetRatingPlan, args, rpl) } @@ -779,8 +779,8 @@ func (dS *DispatcherService) ReplicatorSv1SetRatingProfile(args *engine.RatingPr } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetRatingProfile, args, rpl) } @@ -796,8 +796,8 @@ func (dS *DispatcherService) ReplicatorSv1SetRouteProfile(args *engine.RouteProf } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetRouteProfile, args, rpl) } @@ -813,8 +813,8 @@ func (dS *DispatcherService) ReplicatorSv1SetAttributeProfile(args *engine.Attri } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetAttributeProfile, args, rpl) } @@ -830,8 +830,8 @@ func (dS *DispatcherService) ReplicatorSv1SetChargerProfile(args *engine.Charger } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetChargerProfile, args, rpl) } @@ -847,8 +847,8 @@ func (dS *DispatcherService) ReplicatorSv1SetDispatcherProfile(args *engine.Disp } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetDispatcherProfile, args, rpl) } @@ -864,8 +864,8 @@ func (dS *DispatcherService) ReplicatorSv1SetRateProfile(args *utils.RateProfile } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetRateProfile, args, rpl) } @@ -881,8 +881,8 @@ func (dS *DispatcherService) ReplicatorSv1SetActionProfile(args *engine.ActionPr } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetActionProfile, args, rpl) } @@ -898,8 +898,8 @@ func (dS *DispatcherService) ReplicatorSv1SetActionPlan(args *engine.SetActionPl } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetActionPlan, args, rpl) } @@ -915,8 +915,8 @@ func (dS *DispatcherService) ReplicatorSv1SetAccountActionPlans(args *engine.Set } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetAccountActionPlans, args, rpl) } @@ -932,8 +932,8 @@ func (dS *DispatcherService) ReplicatorSv1SetDispatcherHost(args *engine.Dispatc } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetDispatcherHost, args, rpl) } @@ -949,8 +949,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveThreshold(args *utils.TenantIDWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveThreshold, args, rpl) } @@ -966,8 +966,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDestination(args *utils.StringWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveDestination, args, rpl) } @@ -983,8 +983,8 @@ func (dS *DispatcherService) ReplicatorSv1SetLoadIDs(args *utils.LoadIDsWithOpts } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaReplicator, utils.ReplicatorSv1SetLoadIDs, args, rpl) } @@ -1000,8 +1000,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAccount(args *utils.StringWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveAccount, args, rpl) } @@ -1017,8 +1017,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveStatQueue(args *utils.TenantIDWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveStatQueue, args, rpl) } @@ -1034,8 +1034,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveFilter(args *utils.TenantIDWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveFilter, args, rpl) } @@ -1051,8 +1051,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveThresholdProfile(args *utils.Ten } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveThresholdProfile, args, rpl) } @@ -1068,8 +1068,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveStatQueueProfile(args *utils.Ten } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveStatQueueProfile, args, rpl) } @@ -1085,8 +1085,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveTiming(args *utils.StringWithAPI } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveTiming, args, rpl) } @@ -1102,8 +1102,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveResource(args *utils.TenantIDWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveResource, args, rpl) } @@ -1119,8 +1119,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveResourceProfile(args *utils.Tena } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveResourceProfile, args, rpl) } @@ -1136,8 +1136,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionTriggers(args *utils.Strin } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionTriggers, args, rpl) } @@ -1153,8 +1153,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveSharedGroup(args *utils.StringWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveSharedGroup, args, rpl) } @@ -1170,8 +1170,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActions(args *utils.StringWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActions, args, rpl) } @@ -1187,25 +1187,25 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionPlan(args *utils.StringWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionPlan, args, rpl) } -func (dS *DispatcherService) ReplicatorSv1RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, rpl *string) (err error) { +func (dS *DispatcherService) ReplicatorSv1RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithAPIOpts, rpl *string) (err error) { if args == nil { - args = &engine.RemAccountActionPlansArgsWithOpts{} + args = &engine.RemAccountActionPlansArgsWithAPIOpts{} } args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1RemAccountActionPlans, args.Tenant, - 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: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemAccountActionPlans, args, rpl) } @@ -1221,8 +1221,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingPlan(args *utils.StringWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRatingPlan, args, rpl) } @@ -1238,8 +1238,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingProfile(args *utils.String } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRatingProfile, args, rpl) } @@ -1255,8 +1255,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRouteProfile(args *utils.TenantI } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRouteProfile, args, rpl) } @@ -1272,8 +1272,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAttributeProfile(args *utils.Ten } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveAttributeProfile, args, rpl) } @@ -1289,8 +1289,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveChargerProfile(args *utils.Tenan } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveChargerProfile, args, rpl) } @@ -1306,8 +1306,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherProfile(args *utils.Te } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveDispatcherProfile, args, rpl) } @@ -1323,8 +1323,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherHost(args *utils.Tenan } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveDispatcherHost, args, rpl) } @@ -1340,8 +1340,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRateProfile(args *utils.TenantID } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveRateProfile, args, rpl) } @@ -1357,8 +1357,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionProfile(args *utils.Tenant } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionProfile, args, rpl) } @@ -1375,8 +1375,8 @@ func (dS *DispatcherService) ReplicatorSv1GetIndexes(args *utils.GetIndexesArg, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetIndexes, args, reply) } @@ -1393,8 +1393,8 @@ func (dS *DispatcherService) ReplicatorSv1SetIndexes(args *utils.SetIndexesArg, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetIndexes, args, reply) } @@ -1411,8 +1411,8 @@ func (dS *DispatcherService) ReplicatorSv1RemoveIndexes(args *utils.GetIndexesAr } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveIndexes, args, reply) } @@ -1428,9 +1428,9 @@ func (dS *DispatcherService) ReplicatorSv1GetAccountProfile(args *utils.TenantID } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1GetAccountProfile, args, reply) } @@ -1446,8 +1446,8 @@ func (dS *DispatcherService) ReplicatorSv1SetAccountProfile(args *utils.AccountP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1SetAccountProfile, args, rpl) } @@ -1463,7 +1463,7 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAccountProfile(args *utils.Tenan } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.APIOpts, + Tenant: args.Tenant, + APIOpts: args.APIOpts, }, utils.MetaReplicator, utils.ReplicatorSv1RemoveAccountProfile, args, rpl) } diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index bcb95960b..1bb4b1fdc 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -102,7 +102,7 @@ func testDspRplPingFailover(t *testing.T) { ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "repl12345", }, } diff --git a/dispatchers/resources.go b/dispatchers/resources.go index 02bd42543..dcbbdacea 100755 --- a/dispatchers/resources.go +++ b/dispatchers/resources.go @@ -32,7 +32,7 @@ func (dS *DispatcherService) ResourceSv1Ping(args *utils.CGREvent, rpl *string) args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -47,7 +47,7 @@ func (dS *DispatcherService) ResourceSv1GetResourcesForEvent(args utils.ArgRSv1R } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1GetResourcesForEvent, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -62,7 +62,7 @@ func (dS *DispatcherService) ResourceSv1AuthorizeResources(args utils.ArgRSv1Res } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1AuthorizeResources, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -77,7 +77,7 @@ func (dS *DispatcherService) ResourceSv1AllocateResources(args utils.ArgRSv1Reso } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1AllocateResources, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -92,7 +92,7 @@ func (dS *DispatcherService) ResourceSv1ReleaseResources(args utils.ArgRSv1Resou } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1ReleaseResources, tnt, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -111,9 +111,9 @@ func (dS *DispatcherService) ResourceSv1GetResource(args *utils.TenantIDWithAPIO } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaResources, utils.ResourceSv1GetResource, args, reply) } @@ -129,8 +129,8 @@ func (dS *DispatcherService) ResourceSv1GetResourceWithConfig(args *utils.Tenant } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaResources, utils.ResourceSv1GetResourceWithConfig, args, reply) } diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index ecf906d52..e5fe1dbbe 100755 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -74,7 +74,7 @@ func testDspResPingFailover(t *testing.T) { ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, } @@ -106,7 +106,7 @@ func testDspResPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, &reply); err != nil { @@ -127,7 +127,7 @@ func testDspResTestAuthKey(t *testing.T) { utils.Destination: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -151,7 +151,7 @@ func testDspResTestAuthKey2(t *testing.T) { utils.Destination: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, @@ -185,7 +185,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Account": "1002", "Subject": "1001", "Destination": "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, @@ -214,7 +214,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Account": "1002", "Subject": "1001", "Destination": "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, @@ -235,7 +235,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Account": "1002", "Subject": "1001", "Destination": "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, @@ -255,7 +255,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Account": "1002", "Subject": "1001", "Destination": "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, @@ -275,7 +275,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Account": "1002", "Subject": "1001", "Destination": "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "res12345", }, }, diff --git a/dispatchers/responder.go b/dispatchers/responder.go index c9a1cf1fd..bbefd8284 100644 --- a/dispatchers/responder.go +++ b/dispatchers/responder.go @@ -34,7 +34,7 @@ func (dS *DispatcherService) ResponderPing(args *utils.CGREvent, args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResponderPing, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -117,7 +117,7 @@ func (dS *DispatcherService) ResponderShutdown(args *utils.TenantWithAPIOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaResponder, utils.ResponderShutdown, args, reply) } diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 7d8a180ff..7aa6d6948 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -101,7 +101,7 @@ func getNodeWithRoute(route string, t *testing.T) string { utils.EventName: "Random", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", utils.OptsRouteID: route, }, @@ -174,7 +174,7 @@ func testDspResponderBroadcast(t *testing.T) { utils.EventName: "Broadcast", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", }, } @@ -211,7 +211,7 @@ func testDspResponderInternal(t *testing.T) { utils.EventName: "Internal", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "rsp12345", utils.OptsRouteID: route, }, diff --git a/dispatchers/routes.go b/dispatchers/routes.go index 6173efd4b..f3caade9a 100755 --- a/dispatchers/routes.go +++ b/dispatchers/routes.go @@ -31,7 +31,7 @@ func (dS *DispatcherService) RouteSv1Ping(args *utils.CGREvent, reply *string) ( if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RouteSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -43,7 +43,7 @@ func (dS *DispatcherService) RouteSv1GetRoutes(args *engine.ArgsGetRoutes, reply if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RouteSv1GetRoutes, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -55,7 +55,7 @@ func (dS *DispatcherService) RouteSv1GetRoutesList(args *engine.ArgsGetRoutes, r if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RouteSv1GetRoutesList, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -67,7 +67,7 @@ func (dS *DispatcherService) RouteSv1GetRouteProfilesForEvent(args *utils.CGREve if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.RouteSv1GetRouteProfilesForEvent, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index 28cd619d1..06214dc6f 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -80,7 +80,7 @@ func testDspSupPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, }, &reply); err != nil { @@ -100,7 +100,7 @@ func testDspSupPingFailover(t *testing.T) { ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, } @@ -176,7 +176,7 @@ func testDspSupGetSupFailover(t *testing.T) { utils.Usage: "1m20s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, }, @@ -211,7 +211,7 @@ func testDspSupTestAuthKey(t *testing.T) { utils.Usage: "1m20s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -261,7 +261,7 @@ func testDspSupTestAuthKey2(t *testing.T) { utils.Usage: "1m20s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, }, @@ -327,7 +327,7 @@ func testDspSupGetSupRoundRobin(t *testing.T) { utils.Usage: "1m20s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, }, @@ -358,7 +358,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) { utils.Usage: "1m20s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sup12345", }, } diff --git a/dispatchers/scheduler.go b/dispatchers/scheduler.go index 9a49714f3..7bd0e231c 100644 --- a/dispatchers/scheduler.go +++ b/dispatchers/scheduler.go @@ -31,7 +31,7 @@ func (dS *DispatcherService) SchedulerSv1Ping(args *utils.CGREvent, reply *strin args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SchedulerSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -42,7 +42,7 @@ func (dS *DispatcherService) SchedulerSv1Reload(args *utils.CGREvent, reply *str args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SchedulerSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -58,8 +58,8 @@ func (dS *DispatcherService) SchedulerSv1ExecuteActions(args *utils.AttrsExecute } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaScheduler, utils.SchedulerSv1ExecuteActions, args, reply) } @@ -72,7 +72,7 @@ func (dS *DispatcherService) SchedulerSv1ExecuteActionPlans(args *utils.AttrsExe } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - Opts: args.Opts, + Tenant: args.Tenant, + APIOpts: args.Opts, }, utils.MetaScheduler, utils.SchedulerSv1ExecuteActionPlans, args, reply) } diff --git a/dispatchers/scheduler_it_test.go b/dispatchers/scheduler_it_test.go index ce9d7df45..85b6f47e5 100644 --- a/dispatchers/scheduler_it_test.go +++ b/dispatchers/scheduler_it_test.go @@ -68,7 +68,7 @@ func testDspSchedPing(t *testing.T) { if err := dispEngine.RPC.Call(utils.SchedulerSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "sched12345", }, }, &reply); err != nil { diff --git a/dispatchers/servicemanager.go b/dispatchers/servicemanager.go index a50d30aa4..f0a06e126 100644 --- a/dispatchers/servicemanager.go +++ b/dispatchers/servicemanager.go @@ -33,7 +33,7 @@ func (dS *DispatcherService) ServiceManagerV1Ping(args *utils.CGREvent, args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ServiceManagerV1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -53,8 +53,8 @@ func (dS *DispatcherService) ServiceManagerV1StartService(args ArgStartServiceWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaServiceManager, utils.ServiceManagerV1StartService, args, reply) } @@ -71,8 +71,8 @@ func (dS *DispatcherService) ServiceManagerV1StopService(args ArgStartServiceWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaServiceManager, utils.ServiceManagerV1StopService, args, reply) } @@ -89,7 +89,7 @@ func (dS *DispatcherService) ServiceManagerV1ServiceStatus(args ArgStartServiceW } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaServiceManager, utils.ServiceManagerV1ServiceStatus, args, reply) } diff --git a/dispatchers/sessions.go b/dispatchers/sessions.go index 92a5f3c70..30317250c 100755 --- a/dispatchers/sessions.go +++ b/dispatchers/sessions.go @@ -29,7 +29,7 @@ func (dS *DispatcherService) SessionSv1Ping(args *utils.CGREvent, reply *string) args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -41,7 +41,7 @@ func (dS *DispatcherService) SessionSv1AuthorizeEvent(args *sessions.V1Authorize args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1AuthorizeEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -53,7 +53,7 @@ func (dS *DispatcherService) SessionSv1AuthorizeEventWithDigest(args *sessions.V args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1AuthorizeEventWithDigest, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -65,7 +65,7 @@ func (dS *DispatcherService) SessionSv1InitiateSession(args *sessions.V1InitSess args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1InitiateSession, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -77,7 +77,7 @@ func (dS *DispatcherService) SessionSv1InitiateSessionWithDigest(args *sessions. args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1InitiateSessionWithDigest, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -89,7 +89,7 @@ func (dS *DispatcherService) SessionSv1UpdateSession(args *sessions.V1UpdateSess args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1UpdateSession, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -109,8 +109,8 @@ func (dS *DispatcherService) SessionSv1SyncSessions(args *utils.TenantWithAPIOpt } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaSessionS, utils.SessionSv1SyncSessions, args, reply) } @@ -119,7 +119,7 @@ func (dS *DispatcherService) SessionSv1TerminateSession(args *sessions.V1Termina args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1TerminateSession, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -131,7 +131,7 @@ func (dS *DispatcherService) SessionSv1ProcessCDR(args *utils.CGREvent, args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1ProcessCDR, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -143,7 +143,7 @@ func (dS *DispatcherService) SessionSv1ProcessMessage(args *sessions.V1ProcessMe args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1ProcessMessage, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -155,7 +155,7 @@ func (dS *DispatcherService) SessionSv1ProcessEvent(args *sessions.V1ProcessEven args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1ProcessEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -167,7 +167,7 @@ func (dS *DispatcherService) SessionSv1GetCost(args *sessions.V1ProcessEventArgs args.CGREvent.Tenant = utils.FirstNonEmpty(args.CGREvent.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.SessionSv1GetCost, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -187,8 +187,8 @@ func (dS *DispatcherService) SessionSv1GetActiveSessions(args *utils.SessionFilt } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1GetActiveSessions, args, reply) } @@ -205,8 +205,8 @@ func (dS *DispatcherService) SessionSv1GetActiveSessionsCount(args *utils.Sessio } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1GetActiveSessionsCount, args, reply) } @@ -223,8 +223,8 @@ func (dS *DispatcherService) SessionSv1ForceDisconnect(args *utils.SessionFilter } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1ForceDisconnect, args, reply) } @@ -241,8 +241,8 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessions(args *utils.SessionFil } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1GetPassiveSessions, args, reply) } @@ -259,8 +259,8 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessionsCount(args *utils.Sessi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1GetPassiveSessionsCount, args, reply) } @@ -277,8 +277,8 @@ func (dS *DispatcherService) SessionSv1ReplicateSessions(args ArgsReplicateSessi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaSessionS, utils.SessionSv1ReplicateSessions, args, reply) } @@ -295,8 +295,8 @@ func (dS *DispatcherService) SessionSv1SetPassiveSession(args *sessions.Session, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.OptsStart, + Tenant: tnt, + APIOpts: args.OptsStart, }, utils.MetaSessionS, utils.SessionSv1SetPassiveSession, args, reply) } @@ -312,8 +312,8 @@ func (dS *DispatcherService) SessionSv1ActivateSessions(args *utils.SessionIDsWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1ActivateSessions, args, reply) } @@ -329,8 +329,8 @@ func (dS *DispatcherService) SessionSv1DeactivateSessions(args *utils.SessionIDs } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1DeactivateSessions, args, reply) } @@ -343,8 +343,8 @@ func (dS *DispatcherService) SessionSv1STIRAuthenticate(args *sessions.V1STIRAut } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1STIRAuthenticate, args, reply) } @@ -357,7 +357,7 @@ func (dS *DispatcherService) SessionSv1STIRIdentity(args *sessions.V1STIRIdentit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.Opts, + Tenant: tnt, + APIOpts: args.Opts, }, utils.MetaSessionS, utils.SessionSv1STIRIdentity, args, reply) } diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 174814319..939bc9a91 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -141,7 +141,7 @@ func testDspSessionPing(t *testing.T) { if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, &reply); err != nil { @@ -161,7 +161,7 @@ func testDspSessionPingFailover(t *testing.T) { ev := &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, } @@ -206,7 +206,7 @@ func testDspSessionTestAuthKey(t *testing.T) { utils.Usage: authUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -241,7 +241,7 @@ func testDspSessionAuthorize(t *testing.T) { utils.Usage: authUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", utils.OptsRouteProfilesCount: 1., }, @@ -295,7 +295,7 @@ func testDspSessionInit(t *testing.T) { utils.Usage: initUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -371,7 +371,7 @@ func testDspSessionUpdate(t *testing.T) { utils.Usage: reqUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -401,7 +401,7 @@ func testDspSessionUpdate(t *testing.T) { utils.Usage: float64(reqUsage), utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", utils.Subsys: utils.MetaSessionS, }, @@ -442,7 +442,7 @@ func testDspSessionUpdate2(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: reqUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -475,7 +475,7 @@ func testDspSessionUpdate2(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: float64(reqUsage), }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", utils.Subsys: utils.MetaSessionS, }, @@ -521,7 +521,7 @@ func testDspSessionTerminate(t *testing.T) { utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -552,7 +552,7 @@ func testDspSessionProcessCDR(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, } @@ -591,7 +591,7 @@ func testDspSessionProcessEvent(t *testing.T) { utils.Usage: initUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -629,7 +629,7 @@ func testDspSessionProcessEvent(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", utils.Subsys: utils.MetaSessionS, }, @@ -670,7 +670,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.EventName: "Internal", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "pse12345", }, }, @@ -707,7 +707,7 @@ func testDspSessionProcessEvent2(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "pse12345", utils.Subsys: utils.MetaSessionS, }, @@ -943,7 +943,7 @@ func testDspSessionProcessEvent3(t *testing.T) { utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "pse12345", }, }, @@ -987,7 +987,7 @@ func testDspSessionGetCost(t *testing.T) { utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, diff --git a/dispatchers/stats.go b/dispatchers/stats.go index 5d2fb70b9..f5c1ebb05 100755 --- a/dispatchers/stats.go +++ b/dispatchers/stats.go @@ -33,7 +33,7 @@ func (dS *DispatcherService) StatSv1Ping(args *utils.CGREvent, reply *string) (e if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.StatSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -46,7 +46,7 @@ func (dS *DispatcherService) StatSv1GetStatQueuesForEvent(args *engine.StatsArgs if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.StatSv1GetStatQueuesForEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -64,9 +64,9 @@ func (dS *DispatcherService) StatSv1GetQueueStringMetrics(args *utils.TenantIDWi } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - ID: args.ID, - Opts: args.APIOpts, + Tenant: args.Tenant, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaStats, utils.StatSv1GetQueueStringMetrics, args, reply) } @@ -76,7 +76,7 @@ func (dS *DispatcherService) StatSv1ProcessEvent(args *engine.StatsArgsProcessEv if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.StatSv1ProcessEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -93,9 +93,9 @@ func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWit } } return dS.Dispatch(&utils.CGREvent{ - Tenant: args.Tenant, - ID: args.ID, - Opts: args.APIOpts, + Tenant: args.Tenant, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaStats, utils.StatSv1GetQueueFloatMetrics, args, reply) } @@ -112,7 +112,7 @@ func (dS *DispatcherService) StatSv1GetQueueIDs(args *utils.TenantWithAPIOpts, } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaStats, utils.StatSv1GetQueueIDs, args, reply) } diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index ab1a9ced6..233d0d46b 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -76,7 +76,7 @@ func testDspStsPingFailover(t *testing.T) { } ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, } @@ -117,7 +117,7 @@ func testDspStsGetStatFailover(t *testing.T) { utils.Destination: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, @@ -162,7 +162,7 @@ func testDspStsPing(t *testing.T) { } if err := dispEngine.RPC.Call(utils.StatSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, &reply); err != nil { @@ -184,7 +184,7 @@ func testDspStsTestAuthKey(t *testing.T) { utils.Usage: 135 * time.Second, utils.Cost: 123.0, utils.PDD: 12 * time.Second}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -226,7 +226,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.Cost: 123.0, utils.RunID: utils.MetaDefault, utils.Destination: "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, @@ -270,7 +270,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.Cost: 10.0, utils.Destination: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, @@ -350,7 +350,7 @@ func testDspStsTestAuthKey3(t *testing.T) { utils.Destination: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "stat12345", }, }, diff --git a/dispatchers/thresholds.go b/dispatchers/thresholds.go index f4f2ae818..8945dcb77 100755 --- a/dispatchers/thresholds.go +++ b/dispatchers/thresholds.go @@ -32,7 +32,7 @@ func (dS *DispatcherService) ThresholdSv1Ping(args *utils.CGREvent, reply *strin args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant) if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1Ping, args.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.Time); err != nil { return } } @@ -45,7 +45,7 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdsForEvent(args *engine.Thre if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1GetThresholdsForEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -58,7 +58,7 @@ func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ThresholdsArg if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1ProcessEvent, args.CGREvent.Tenant, - utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { + utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), args.CGREvent.Time); err != nil { return } } @@ -77,8 +77,8 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithA } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - Opts: args.APIOpts, + Tenant: tnt, + APIOpts: args.APIOpts, }, utils.MetaThresholds, utils.ThresholdSv1GetThresholdIDs, args, tIDs) } @@ -94,8 +94,8 @@ func (dS *DispatcherService) ThresholdSv1GetThreshold(args *utils.TenantIDWithAP } } return dS.Dispatch(&utils.CGREvent{ - Tenant: tnt, - ID: args.ID, - Opts: args.APIOpts, + Tenant: tnt, + ID: args.ID, + APIOpts: args.APIOpts, }, utils.MetaThresholds, utils.ThresholdSv1GetThreshold, args, th) } diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index 51755805d..f5839c816 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -77,7 +77,7 @@ func testDspThPingFailover(t *testing.T) { ev := utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", }, } @@ -113,7 +113,7 @@ func testDspThProcessEventFailover(t *testing.T) { utils.EventName: "Event1", utils.AccountField: "1001"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", }, }, @@ -142,7 +142,7 @@ func testDspThPing(t *testing.T) { if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", }, }, &reply); err != nil { @@ -163,7 +163,7 @@ func testDspThTestAuthKey(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "12345", }, }, @@ -192,7 +192,7 @@ func testDspThTestAuthKey2(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1002"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "thr12345", }, }, diff --git a/ees/ees.go b/ees/ees.go index 7d638d840..df1390bd0 100644 --- a/ees/ees.go +++ b/ees/ees.go @@ -105,12 +105,12 @@ func (eeS *EventExporterS) setupCache(chCfgs map[string]*config.CacheParamCfg) { func (eeS *EventExporterS) attrSProcessEvent(cgrEv *utils.CGREvent, attrIDs []string, ctx string) (err error) { var rplyEv engine.AttrSProcessEventReply - if cgrEv.Opts == nil { - cgrEv.Opts = make(map[string]interface{}) + if cgrEv.APIOpts == nil { + cgrEv.APIOpts = make(map[string]interface{}) } - cgrEv.Opts[utils.Subsys] = utils.MetaEEs + cgrEv.APIOpts[utils.Subsys] = utils.MetaEEs var processRuns *int - if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { processRuns = utils.IntPointer(int(v)) } @@ -143,14 +143,14 @@ func (eeS *EventExporterS) V1ProcessEvent(cgrEv *utils.CGREventWithEeIDs, rply * lenExpIDs := expIDs.Size() cgrDp := utils.MapStorage{ utils.MetaReq: cgrEv.Event, - utils.MetaOpts: cgrEv.Opts, + utils.MetaOpts: cgrEv.APIOpts, } var wg sync.WaitGroup var withErr bool var metricMapLock sync.RWMutex metricsMap := make(map[string]utils.MapStorage) - _, hasVerbose := cgrEv.Opts[utils.OptsEEsVerbose] + _, hasVerbose := cgrEv.APIOpts[utils.OptsEEsVerbose] for cfgIdx, eeCfg := range eeS.cfg.EEsNoLksCfg().Exporters { if eeCfg.Type == utils.MetaNone || // ignore *none type exporter (lenExpIDs != 0 && !expIDs.Has(eeCfg.ID)) { @@ -176,7 +176,7 @@ func (eeS *EventExporterS) V1ProcessEvent(cgrEv *utils.CGREventWithEeIDs, rply * eeCfg.AttributeSIDs, utils.FirstNonEmpty( eeCfg.AttributeSCtx, - utils.IfaceAsString(cgrEv.Opts[utils.OptsContext]), + utils.IfaceAsString(cgrEv.APIOpts[utils.OptsContext]), utils.MetaEEs)); err != nil { return } diff --git a/ees/ees_test.go b/ees/ees_test.go index 1d701be20..0bfb94ef4 100644 --- a/ees/ees_test.go +++ b/ees/ees_test.go @@ -109,7 +109,7 @@ func TestAttrSProcessEvent(t *testing.T) { }, } cgrEv := &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAttributesProcessRuns: "10", }, } @@ -231,7 +231,7 @@ func TestV1ProcessEvent2(t *testing.T) { "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAttributesProcessRuns: "10", }, }, @@ -301,7 +301,7 @@ func TestV1ProcessEvent4(t *testing.T) { ID: "voiceEvent", Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsEEsVerbose: struct{}{}, }, }, @@ -352,7 +352,7 @@ func TestV1ProcessEventMockMetrics(t *testing.T) { ID: "voiceEvent", Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsEEsVerbose: struct{}{}, }, }, @@ -381,7 +381,7 @@ func TestV1ProcessEvent5(t *testing.T) { ID: "voiceEvent", Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsEEsVerbose: struct{}{}, }, }, @@ -412,7 +412,7 @@ func TestV1ProcessEvent6(t *testing.T) { ID: "voiceEvent", Time: utils.TimePointer(time.Now()), Event: map[string]interface{}{}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsEEsVerbose: struct{}{}, }, }, diff --git a/ees/elastic.go b/ees/elastic.go index cec1b5263..ab88671f3 100644 --- a/ees/elastic.go +++ b/ees/elastic.go @@ -143,7 +143,7 @@ func (eEe *ElasticEe) ExportEvent(cgrEv *utils.CGREvent) (err error) { utils.MetaExp: utils.NewOrderedNavigableMap(), } req := utils.MapStorage(cgrEv.Event) - eeReq := engine.NewEventRequest(req, eEe.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, eEe.dc, cgrEv.APIOpts, eEe.cgrCfg.EEsCfg().Exporters[eEe.cfgIdx].Tenant, eEe.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(eEe.cgrCfg.EEsCfg().Exporters[eEe.cfgIdx].Timezone, diff --git a/ees/elastic_it_test.go b/ees/elastic_it_test.go index 7da80f688..b029ced34 100644 --- a/ees/elastic_it_test.go +++ b/ees/elastic_it_test.go @@ -218,7 +218,7 @@ func testElasticExportEvents(t *testing.T) { utils.Destination: "1002", utils.RunID: utils.MetaDefault, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "ExporterUsed": "ElasticExporterWithNoFields", }, }, diff --git a/ees/filecsv.go b/ees/filecsv.go index 4410d8229..d4fff06a4 100644 --- a/ees/filecsv.go +++ b/ees/filecsv.go @@ -115,7 +115,7 @@ func (fCsv *FileCSVee) ExportEvent(cgrEv *utils.CGREvent) (err error) { utils.MetaExp: utils.NewOrderedNavigableMap(), } req := utils.MapStorage(cgrEv.Event) - eeReq := engine.NewEventRequest(req, fCsv.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, fCsv.dc, cgrEv.APIOpts, fCsv.cgrCfg.EEsCfg().Exporters[fCsv.cfgIdx].Tenant, fCsv.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(fCsv.cgrCfg.EEsCfg().Exporters[fCsv.cfgIdx].Timezone, diff --git a/ees/filefwv.go b/ees/filefwv.go index 28aabb5d0..ffc5945f1 100644 --- a/ees/filefwv.go +++ b/ees/filefwv.go @@ -104,7 +104,7 @@ func (fFwv *FileFWVee) ExportEvent(cgrEv *utils.CGREvent) (err error) { utils.MetaExp: utils.NewOrderedNavigableMap(), } req := utils.MapStorage(cgrEv.Event) - eeReq := engine.NewEventRequest(req, fFwv.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, fFwv.dc, cgrEv.APIOpts, fFwv.cgrCfg.EEsCfg().Exporters[fFwv.cfgIdx].Tenant, fFwv.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(fFwv.cgrCfg.EEsCfg().Exporters[fFwv.cfgIdx].Timezone, diff --git a/ees/httpjsonmap.go b/ees/httpjsonmap.go index 9c5f353a0..c537e92b5 100644 --- a/ees/httpjsonmap.go +++ b/ees/httpjsonmap.go @@ -89,7 +89,7 @@ func (httpEE *HTTPjsonMapEE) ExportEvent(cgrEv *utils.CGREvent) (err error) { oNm := map[string]*utils.OrderedNavigableMap{ utils.MetaExp: utils.NewOrderedNavigableMap(), } - eeReq := engine.NewEventRequest(utils.MapStorage(cgrEv.Event), httpEE.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(utils.MapStorage(cgrEv.Event), httpEE.dc, cgrEv.APIOpts, httpEE.cgrCfg.EEsCfg().Exporters[httpEE.cfgIdx].Tenant, httpEE.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(httpEE.cgrCfg.EEsCfg().Exporters[httpEE.cfgIdx].Timezone, diff --git a/ees/httppost.go b/ees/httppost.go index 75b4f584c..f252e0b27 100644 --- a/ees/httppost.go +++ b/ees/httppost.go @@ -85,7 +85,7 @@ func (httpPost *HTTPPost) ExportEvent(cgrEv *utils.CGREvent) (err error) { utils.MetaExp: utils.NewOrderedNavigableMap(), } req := utils.MapStorage(cgrEv.Event) - eeReq := engine.NewEventRequest(req, httpPost.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, httpPost.dc, cgrEv.APIOpts, httpPost.cgrCfg.EEsCfg().Exporters[httpPost.cfgIdx].Tenant, httpPost.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(httpPost.cgrCfg.EEsCfg().Exporters[httpPost.cfgIdx].Timezone, diff --git a/ees/posterjsonmap.go b/ees/posterjsonmap.go index 26d3c823e..e57820a67 100644 --- a/ees/posterjsonmap.go +++ b/ees/posterjsonmap.go @@ -100,7 +100,7 @@ func (pstrEE *PosterJSONMapEE) ExportEvent(cgrEv *utils.CGREvent) (err error) { oNm := map[string]*utils.OrderedNavigableMap{ utils.MetaExp: utils.NewOrderedNavigableMap(), } - eeReq := engine.NewEventRequest(utils.MapStorage(cgrEv.Event), pstrEE.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(utils.MapStorage(cgrEv.Event), pstrEE.dc, cgrEv.APIOpts, pstrEE.cgrCfg.EEsCfg().Exporters[pstrEE.cfgIdx].Tenant, pstrEE.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(pstrEE.cgrCfg.EEsCfg().Exporters[pstrEE.cfgIdx].Timezone, diff --git a/ees/posterjsonmap_it_test.go b/ees/posterjsonmap_it_test.go index 5fbae5de0..8f6fcf6f9 100644 --- a/ees/posterjsonmap_it_test.go +++ b/ees/posterjsonmap_it_test.go @@ -136,7 +136,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, }, @@ -167,7 +167,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, }, @@ -199,7 +199,7 @@ func testHTTPJsonMapExportEvent(t *testing.T) { "ExtraFields": map[string]string{"extra1": "val_extra1", "extra2": "val_extra2", "extra3": "val_extra3"}, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, }, diff --git a/ees/sql.go b/ees/sql.go index c0d5ffd6a..233ed4b88 100644 --- a/ees/sql.go +++ b/ees/sql.go @@ -163,7 +163,7 @@ func (sqlEe *SQLEe) ExportEvent(cgrEv *utils.CGREvent) (err error) { utils.MetaExp: utils.NewOrderedNavigableMap(), } req := utils.MapStorage(cgrEv.Event) - eeReq := engine.NewEventRequest(req, sqlEe.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, sqlEe.dc, cgrEv.APIOpts, sqlEe.cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].Tenant, sqlEe.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(sqlEe.cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].Timezone, diff --git a/ees/virtualee.go b/ees/virtualee.go index d817b7b0f..8e8f6168e 100644 --- a/ees/virtualee.go +++ b/ees/virtualee.go @@ -76,7 +76,7 @@ func (vEe *VirtualEe) ExportEvent(cgrEv *utils.CGREvent) (err error) { oNm := map[string]*utils.OrderedNavigableMap{ utils.MetaExp: utils.NewOrderedNavigableMap(), } - eeReq := engine.NewEventRequest(req, vEe.dc, cgrEv.Opts, + eeReq := engine.NewEventRequest(req, vEe.dc, cgrEv.APIOpts, vEe.cgrCfg.EEsCfg().Exporters[vEe.cfgIdx].Tenant, vEe.cgrCfg.GeneralCfg().DefaultTenant, utils.FirstNonEmpty(vEe.cgrCfg.EEsCfg().Exporters[vEe.cfgIdx].Timezone, diff --git a/engine/account.go b/engine/account.go index 2500eb7e5..5e6bf0139 100644 --- a/engine/account.go +++ b/engine/account.go @@ -560,7 +560,7 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo utils.BalanceID: defaultBalance.ID, utils.Units: defaultBalance.Value, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.BalanceUpdate, }, }, @@ -1102,7 +1102,7 @@ func (acc *Account) Publish() { ID: utils.GenUUID(), Time: utils.TimePointer(time.Now()), Event: acntSummary.AsMapInterface(), - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, } diff --git a/engine/action.go b/engine/action.go index 145bd5e00..63b991c84 100644 --- a/engine/action.go +++ b/engine/action.go @@ -1028,7 +1028,7 @@ func export(ub *Account, a *Action, acs Actions, extraData interface{}) (err err utils.UpdateTime: ub.UpdateTime, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, } diff --git a/engine/actions_test.go b/engine/actions_test.go index 2a2144a77..f1a5cd18b 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -2698,7 +2698,7 @@ func TestCdrLogAction(t *testing.T) { "ToR": "*monetary", "Usage": mock.args.CGREvent.Event["Usage"], }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(expCgrEv, mock.args.CGREvent) { t.Errorf("Expected: %+v \n,received: %+v", expCgrEv, mock.args.CGREvent) diff --git a/engine/attributes.go b/engine/attributes.go index 833104b5a..bcd90a47d 100644 --- a/engine/attributes.go +++ b/engine/attributes.go @@ -425,7 +425,7 @@ func (alS *AttributeService) V1GetAttributeForEvent(args *AttrArgsProcessEvent, } attrPrf, err := alS.attributeProfileForEvent(tnt, args.Context, args.AttributeIDs, args.Time, utils.MapStorage{ utils.MetaReq: args.CGREvent.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -461,7 +461,7 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent, args.CGREvent = args.CGREvent.Clone() eNV := utils.MapStorage{ utils.MetaReq: args.CGREvent.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, diff --git a/engine/balances.go b/engine/balances.go index 52ea3b2fa..80222ef38 100644 --- a/engine/balances.go +++ b/engine/balances.go @@ -773,7 +773,7 @@ func (bc Balances) SaveDirtyBalances(acc *Account) { ID: utils.GenUUID(), Time: utils.TimePointer(time.Now()), Event: acntSummary.AsMapInterface(), - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.AccountUpdate, }, } diff --git a/engine/calldesc.go b/engine/calldesc.go index d51902a2e..580277f71 100644 --- a/engine/calldesc.go +++ b/engine/calldesc.go @@ -145,10 +145,10 @@ type CallDescriptor struct { // AsCGREvent converts the CallDescriptor into CGREvent func (cd *CallDescriptor) AsCGREvent(opts map[string]interface{}) *utils.CGREvent { cgrEv := &utils.CGREvent{ - Tenant: cd.Tenant, - ID: utils.UUIDSha1Prefix(), // make it unique - Event: make(map[string]interface{}), - Opts: opts, + Tenant: cd.Tenant, + ID: utils.UUIDSha1Prefix(), // make it unique + Event: make(map[string]interface{}), + APIOpts: opts, } for k, v := range cd.ExtraFields { cgrEv.Event[k] = v diff --git a/engine/cdr.go b/engine/cdr.go index 46e045c41..d54fa58fb 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -443,10 +443,10 @@ func (cdr *CDR) AsCDRsql() (cdrSQL *CDRsql) { func (cdr *CDR) AsCGREvent() *utils.CGREvent { return &utils.CGREvent{ - Tenant: cdr.Tenant, - ID: utils.UUIDSha1Prefix(), - Event: cdr.AsMapStringIface(), - Opts: map[string]interface{}{}, + Tenant: cdr.Tenant, + ID: utils.UUIDSha1Prefix(), + Event: cdr.AsMapStringIface(), + APIOpts: map[string]interface{}{}, } } diff --git a/engine/cdrs.go b/engine/cdrs.go index 6d1d55fba..2a1c1d9f1 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -368,19 +368,19 @@ func (cdrS *CDRServer) chrgrSProcessEvent(cgrEv *utils.CGREvent) (cgrEvs []*util // attrSProcessEvent will send the event to StatS if the connection is configured func (cdrS *CDRServer) attrSProcessEvent(cgrEv *utils.CGREvent) (err error) { var rplyEv AttrSProcessEventReply - if cgrEv.Opts == nil { - cgrEv.Opts = make(map[string]interface{}) + if cgrEv.APIOpts == nil { + cgrEv.APIOpts = make(map[string]interface{}) } - cgrEv.Opts[utils.Subsys] = utils.MetaCDRs + cgrEv.APIOpts[utils.Subsys] = utils.MetaCDRs var processRuns *int - if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { processRuns = utils.IntPointer(int(v)) } } attrArgs := &AttrArgsProcessEvent{ Context: utils.StringPointer(utils.FirstNonEmpty( - utils.IfaceAsString(cgrEv.Opts[utils.OptsContext]), + utils.IfaceAsString(cgrEv.APIOpts[utils.OptsContext]), utils.MetaCDRs)), CGREvent: cgrEv, ProcessRuns: processRuns, @@ -403,10 +403,10 @@ func (cdrS *CDRServer) thdSProcessEvent(cgrEv *utils.CGREvent) (err error) { thArgs := &ThresholdsArgsProcessEvent{ CGREvent: cgrEv.Clone(), } - if thArgs.Opts == nil { - thArgs.Opts = make(map[string]interface{}) + if thArgs.APIOpts == nil { + thArgs.APIOpts = make(map[string]interface{}) } - thArgs.Opts[utils.MetaEventType] = utils.CDR + thArgs.APIOpts[utils.MetaEventType] = utils.CDR if err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().ThresholdSConns, nil, utils.ThresholdSv1ProcessEvent, thArgs, &tIDs); err != nil && @@ -529,10 +529,10 @@ func (cdrS *CDRServer) processEvent(ev *utils.CGREvent, for j, rtCDR := range cdrS.rateCDRWithErr( &CDRWithOpts{ CDR: cdr, - Opts: ev.Opts, + Opts: ev.APIOpts, }) { cgrEv := rtCDR.AsCGREvent() - cgrEv.Opts = cgrEvs[i].Opts + cgrEv.APIOpts = cgrEvs[i].APIOpts if j == 0 { // the first CDR will replace the events we got already as a small optimization cdrs[i] = rtCDR cgrEvs[i] = cgrEv @@ -705,7 +705,7 @@ func (cdrS *CDRServer) V1ProcessCDR(cdr *CDRWithOpts, reply *string) (err error) cdr.RunID = utils.MetaDefault } cgrEv := cdr.AsCGREvent() - cgrEv.Opts = cdr.Opts + cgrEv.APIOpts = cdr.Opts if _, err = cdrS.processEvent(cgrEv, len(cdrS.cgrCfg.CdrsCfg().ChargerSConns) != 0 && !cdr.PreRated, @@ -1059,7 +1059,7 @@ func (cdrS *CDRServer) V1RateCDRs(arg *ArgRateCDRs, reply *string) (err error) { for _, cdr := range cdrs { cdr.Cost = -1 // the cost will be recalculated cgrEv := cdr.AsCGREvent() - cgrEv.Opts = arg.Opts + cgrEv.APIOpts = arg.Opts if _, err = cdrS.processEvent(cgrEv, chrgS, attrS, false, true, store, true, export, thdS, statS); err != nil { return utils.NewErrServerError(err) diff --git a/engine/chargers.go b/engine/chargers.go index d6da438b6..fed88ba3b 100644 --- a/engine/chargers.go +++ b/engine/chargers.go @@ -49,7 +49,7 @@ func (cS *ChargerService) Shutdown() { func (cS *ChargerService) matchingChargerProfilesForEvent(tnt string, cgrEv *utils.CGREvent) (cPs ChargerProfiles, err error) { evNm := utils.MapStorage{ utils.MetaReq: cgrEv.Event, - utils.MetaOpts: cgrEv.Opts, + utils.MetaOpts: cgrEv.APIOpts, } cpIDs, err := MatchingItemIDsForEvent(evNm, cS.cfg.ChargerSCfg().StringIndexedFields, @@ -107,7 +107,7 @@ type ChrgSProcessEventReply struct { func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply []*ChrgSProcessEventReply, err error) { var cPs ChargerProfiles var processRuns *int - if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { processRuns = utils.IntPointer(int(v)) } @@ -120,7 +120,7 @@ func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply clonedEv := cgrEv.Clone() clonedEv.Tenant = tnt clonedEv.Event[utils.RunID] = cP.RunID - clonedEv.Opts[utils.Subsys] = utils.MetaChargers + clonedEv.APIOpts[utils.Subsys] = utils.MetaChargers rply[i] = &ChrgSProcessEventReply{ ChargerSProfile: cP.ID, CGREvent: clonedEv, @@ -133,7 +133,7 @@ func (cS *ChargerService) processEvent(tnt string, cgrEv *utils.CGREvent) (rply args := &AttrArgsProcessEvent{ AttributeIDs: cP.AttributeIDs, Context: utils.StringPointer(utils.FirstNonEmpty( - utils.IfaceAsString(clonedEv.Opts[utils.OptsContext]), + utils.IfaceAsString(clonedEv.APIOpts[utils.OptsContext]), utils.MetaChargers)), ProcessRuns: processRuns, CGREvent: clonedEv, diff --git a/engine/chargers_test.go b/engine/chargers_test.go index ceeaa388d..ed744978e 100755 --- a/engine/chargers_test.go +++ b/engine/chargers_test.go @@ -187,7 +187,7 @@ func TestChargerMatchingChargerProfilesForEvent(t *testing.T) { "UsageInterval": "1s", utils.Weight: "200.0", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaChargers, }, }, @@ -354,7 +354,7 @@ func TestChargerProcessEvent(t *testing.T) { "UsageInterval": "1s", utils.Weight: "200.0", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaChargers, }, }, diff --git a/engine/datamanager.go b/engine/datamanager.go index b0e3a921a..aa5d35fcc 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -2111,12 +2111,12 @@ func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, ove return } -// RemAccountActionPlansArgsWithOpts is used in replicatorV1 for dispatcher -type RemAccountActionPlansArgsWithOpts struct { - AcntID string - ApIDs []string - Tenant string - Opts map[string]interface{} +// RemAccountActionPlansArgsWithAPIOpts is used in replicatorV1 for dispatcher +type RemAccountActionPlansArgsWithAPIOpts struct { + AcntID string + ApIDs []string + Tenant string + APIOpts map[string]interface{} } func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err error) { @@ -2131,11 +2131,11 @@ func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err config.CgrConfig().DataDbCfg().RplFiltered, utils.AccountActionPlansPrefix, acntID, // this are used to get the host IDs from cache utils.ReplicatorSv1RemAccountActionPlans, - &RemAccountActionPlansArgsWithOpts{ + &RemAccountActionPlansArgsWithAPIOpts{ AcntID: acntID, ApIDs: apIDs, Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, - Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, + APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)}) } return diff --git a/engine/resources.go b/engine/resources.go index 19029c814..02d4ea489 100644 --- a/engine/resources.go +++ b/engine/resources.go @@ -445,7 +445,7 @@ func (rS *ResourceService) processThresholds(r *Resource, opts map[string]interf utils.ResourceID: r.ID, utils.Usage: r.totalUsage(), }, - Opts: opts, + APIOpts: opts, }, } var tIDs []string @@ -467,7 +467,7 @@ func (rS *ResourceService) matchingResourcesForEvent(tnt string, ev *utils.CGREv var rIDs utils.StringSet evNm := utils.MapStorage{ utils.MetaReq: ev.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, } if x, ok := Cache.Get(utils.CacheEventResources, evUUID); ok { // The ResourceIDs were cached as utils.StringSet{"resID":bool} isCached = true @@ -721,7 +721,7 @@ func (rS *ResourceService) V1AllocateResource(args utils.ArgRSv1ResourceUsage, r rS.storedResources.Add(r.TenantID()) rS.srMux.Unlock() } - if err = rS.processThresholds(r, args.Opts); err != nil { + if err = rS.processThresholds(r, args.APIOpts); err != nil { return } } @@ -788,7 +788,7 @@ func (rS *ResourceService) V1ReleaseResource(args utils.ArgRSv1ResourceUsage, re rS.storedResources.Add(r.TenantID()) } } - if err = rS.processThresholds(r, args.Opts); err != nil { + if err = rS.processThresholds(r, args.APIOpts); err != nil { return } } diff --git a/engine/routes.go b/engine/routes.go index aac0b892b..a7702f391 100644 --- a/engine/routes.go +++ b/engine/routes.go @@ -145,7 +145,7 @@ func (rpS *RouteService) Shutdown() { func (rpS *RouteService) matchingRouteProfilesForEvent(tnt string, ev *utils.CGREvent) (matchingRPrf []*RouteProfile, err error) { evNm := utils.MapStorage{ utils.MetaReq: ev.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, } rPrfIDs, err := MatchingItemIDsForEvent(evNm, rpS.cgrcfg.RouteSCfg().StringIndexedFields, @@ -569,12 +569,12 @@ func (rpS *RouteService) V1GetRoutes(args *ArgsGetRoutes, reply *SortedRoutesLis tnt = rpS.cgrcfg.GeneralCfg().DefaultTenant } if len(rpS.cgrcfg.RouteSCfg().AttributeSConns) != 0 { - if args.Opts == nil { - args.Opts = make(map[string]interface{}) + if args.APIOpts == nil { + args.APIOpts = make(map[string]interface{}) } - args.Opts[utils.Subsys] = utils.MetaRoutes + args.APIOpts[utils.Subsys] = utils.MetaRoutes var processRuns *int - if val, has := args.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := args.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { processRuns = utils.IntPointer(int(v)) } @@ -590,7 +590,7 @@ func (rpS *RouteService) V1GetRoutes(args *ArgsGetRoutes, reply *SortedRoutesLis if err := rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().AttributeSConns, nil, utils.AttributeSv1ProcessEvent, attrArgs, &rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 { args.CGREvent = rplyEv.CGREvent - args.Opts = rplyEv.Opts + args.APIOpts = rplyEv.APIOpts } else if err.Error() != utils.ErrNotFound.Error() { return utils.NewErrRouteS(err) } @@ -637,7 +637,7 @@ func (rpS *RouteService) sortedRoutesForProfile(tnt string, rPrfl *RouteProfile, //construct the DP and pass it to filterS nM := utils.MapStorage{ utils.MetaReq: ev.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, } passedRoutes := make(map[string]*Route) // apply filters for event diff --git a/engine/routes_test.go b/engine/routes_test.go index f9e1c578d..9ae9107a7 100644 --- a/engine/routes_test.go +++ b/engine/routes_test.go @@ -2253,10 +2253,10 @@ func TestRoutesSortedForEventWithLimitAndOffset2(t *testing.T) { } argsGetRoutes := &ArgsGetRoutes{ CGREvent: &utils.CGREvent{ - Tenant: "cgrates.org", - ID: "utils.CGREvent1", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 3}, + Tenant: "cgrates.org", + ID: "utils.CGREvent1", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 3}, }, } diff --git a/engine/stats.go b/engine/stats.go index 101802900..760e3972f 100644 --- a/engine/stats.go +++ b/engine/stats.go @@ -282,7 +282,7 @@ func (sS *StatService) storeStatQueue(sq *StatQueue) { func (sS *StatService) processEvent(tnt string, args *StatsArgsProcessEvent) (statQueueIDs []string, err error) { evNm := utils.MapStorage{ utils.MetaReq: args.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, } matchSQs, err := sS.matchingStatQueuesForEvent(tnt, args.StatIDs, args.Time, evNm) if err != nil { @@ -291,10 +291,10 @@ func (sS *StatService) processEvent(tnt string, args *StatsArgsProcessEvent) (st if len(matchSQs) == 0 { return nil, utils.ErrNotFound } - if args.Opts == nil { - args.Opts = make(map[string]interface{}) + if args.APIOpts == nil { + args.APIOpts = make(map[string]interface{}) } - args.Opts[utils.MetaEventType] = utils.StatUpdate + args.APIOpts[utils.MetaEventType] = utils.StatUpdate var stsIDs []string var withErrors bool for _, sq := range matchSQs { @@ -328,7 +328,7 @@ func (sS *StatService) processEvent(tnt string, args *StatsArgsProcessEvent) (st utils.EventType: utils.StatUpdate, utils.StatID: sq.ID, }, - Opts: args.Opts, + APIOpts: args.APIOpts, }, } for metricID, metric := range sq.SQMetrics { @@ -394,7 +394,7 @@ func (sS *StatService) V1GetStatQueuesForEvent(args *StatsArgsProcessEvent, repl var sQs StatQueues if sQs, err = sS.matchingStatQueuesForEvent(tnt, args.StatIDs, args.Time, utils.MapStorage{ utils.MetaReq: args.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, }); err != nil { return } diff --git a/engine/stats_test.go b/engine/stats_test.go index f66c80f44..fabe64c82 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -255,7 +255,7 @@ func TestMatchingStatQueuesForEvent(t *testing.T) { } } msq, err := statService.matchingStatQueuesForEvent(statsEvs[0].Tenant, statsEvs[0].StatIDs, statsEvs[0].Time, - utils.MapStorage{utils.MetaReq: statsEvs[0].Event, utils.MetaOpts: statsEvs[0].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[0].Event, utils.MetaOpts: statsEvs[0].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } @@ -267,7 +267,7 @@ func TestMatchingStatQueuesForEvent(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", stqs[0].sqPrfl, msq[0].sqPrfl) } msq, err = statService.matchingStatQueuesForEvent(statsEvs[1].Tenant, statsEvs[1].StatIDs, statsEvs[1].Time, - utils.MapStorage{utils.MetaReq: statsEvs[1].Event, utils.MetaOpts: statsEvs[1].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[1].Event, utils.MetaOpts: statsEvs[1].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } @@ -279,7 +279,7 @@ func TestMatchingStatQueuesForEvent(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", stqs[1].sqPrfl, msq[0].sqPrfl) } msq, err = statService.matchingStatQueuesForEvent(statsEvs[2].Tenant, statsEvs[2].StatIDs, statsEvs[2].Time, - utils.MapStorage{utils.MetaReq: statsEvs[2].Event, utils.MetaOpts: statsEvs[2].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[2].Event, utils.MetaOpts: statsEvs[2].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } @@ -737,7 +737,7 @@ func TestStatQueuesMatchWithIndexFalse(t *testing.T) { } statService.cgrcfg.StatSCfg().IndexedSelects = false msq, err := statService.matchingStatQueuesForEvent(statsEvs[0].Tenant, statsEvs[0].StatIDs, statsEvs[0].Time, - utils.MapStorage{utils.MetaReq: statsEvs[0].Event, utils.MetaOpts: statsEvs[0].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[0].Event, utils.MetaOpts: statsEvs[0].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } @@ -749,7 +749,7 @@ func TestStatQueuesMatchWithIndexFalse(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", stqs[0].sqPrfl, msq[0].sqPrfl) } msq, err = statService.matchingStatQueuesForEvent(statsEvs[1].Tenant, statsEvs[1].StatIDs, statsEvs[1].Time, - utils.MapStorage{utils.MetaReq: statsEvs[1].Event, utils.MetaOpts: statsEvs[1].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[1].Event, utils.MetaOpts: statsEvs[1].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } @@ -761,7 +761,7 @@ func TestStatQueuesMatchWithIndexFalse(t *testing.T) { t.Errorf("Expecting: %+v, received: %+v", stqs[1].sqPrfl, msq[0].sqPrfl) } msq, err = statService.matchingStatQueuesForEvent(statsEvs[2].Tenant, statsEvs[2].StatIDs, statsEvs[2].Time, - utils.MapStorage{utils.MetaReq: statsEvs[2].Event, utils.MetaOpts: statsEvs[2].Opts}) + utils.MapStorage{utils.MetaReq: statsEvs[2].Event, utils.MetaOpts: statsEvs[2].APIOpts}) if err != nil { t.Errorf("Error: %+v", err) } diff --git a/engine/thresholds.go b/engine/thresholds.go index e072415cc..c9c965b41 100644 --- a/engine/thresholds.go +++ b/engine/thresholds.go @@ -88,7 +88,7 @@ func (t *Threshold) ProcessEvent(args *ThresholdsArgsProcessEvent, dm *DataManag } var tntAcnt string var acnt string - if utils.IfaceAsString(args.Opts[utils.MetaEventType]) == utils.AccountUpdate { + if utils.IfaceAsString(args.APIOpts[utils.MetaEventType]) == utils.AccountUpdate { acnt, _ = args.FieldAsString(utils.ID) } else { acnt, _ = args.FieldAsString(utils.AccountField) @@ -224,7 +224,7 @@ func (tS *ThresholdService) StoreThreshold(t *Threshold) (err error) { func (tS *ThresholdService) matchingThresholdsForEvent(tnt string, args *ThresholdsArgsProcessEvent) (ts Thresholds, err error) { evNm := utils.MapStorage{ utils.MetaReq: args.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, } tIDs := utils.NewStringSet(args.ThresholdIDs) if len(tIDs) == 0 { diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index 309e677d9..f8dfd04e2 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -395,7 +395,7 @@ func testActionsitThresholdCDrLog(t *testing.T) { utils.Route: "SUPPL1", utils.Cost: -1.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, }, @@ -671,7 +671,7 @@ func testActionsitThresholdPostEvent(t *testing.T) { utils.Route: "SUPPL1", utils.Cost: -1.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.MetaEventType: utils.CDR, }, } diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index f96784a42..97d0d13a9 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -240,7 +240,7 @@ func TestAttributeProfileForEvent(t *testing.T) { atrp, err := attrService.attributeProfileForEvent(attrEvs[0].Tenant, attrEvs[0].Context, attrEvs[0].AttributeIDs, attrEvs[0].Time, utils.MapStorage{ utils.MetaReq: attrEvs[0].CGREvent.Event, - utils.MetaOpts: attrEvs[0].Opts, + utils.MetaOpts: attrEvs[0].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -254,7 +254,7 @@ func TestAttributeProfileForEvent(t *testing.T) { atrp, err = attrService.attributeProfileForEvent(attrEvs[1].Tenant, attrEvs[1].Context, attrEvs[1].AttributeIDs, attrEvs[1].Time, utils.MapStorage{ utils.MetaReq: attrEvs[1].CGREvent.Event, - utils.MetaOpts: attrEvs[1].Opts, + utils.MetaOpts: attrEvs[1].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -269,7 +269,7 @@ func TestAttributeProfileForEvent(t *testing.T) { atrp, err = attrService.attributeProfileForEvent(attrEvs[2].Tenant, attrEvs[2].Context, attrEvs[2].AttributeIDs, attrEvs[2].Time, utils.MapStorage{ utils.MetaReq: attrEvs[2].CGREvent.Event, - utils.MetaOpts: attrEvs[2].Opts, + utils.MetaOpts: attrEvs[2].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -291,7 +291,7 @@ func TestAttributeProcessEvent(t *testing.T) { } eNM := utils.MapStorage{ utils.MetaReq: attrEvs[0].CGREvent.Event, - utils.MetaOpts: attrEvs[0].Opts, + utils.MetaOpts: attrEvs[0].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -309,7 +309,7 @@ func TestAttributeProcessEventWithNotFound(t *testing.T) { attrEvs[3].CGREvent.Event["Account"] = "1010" //Field added in event after process eNM := utils.MapStorage{ utils.MetaReq: attrEvs[3].CGREvent.Event, - utils.MetaOpts: attrEvs[3].Opts, + utils.MetaOpts: attrEvs[3].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -330,7 +330,7 @@ func TestAttributeProcessEventWithIDs(t *testing.T) { } eNM := utils.MapStorage{ utils.MetaReq: attrEvs[3].CGREvent.Event, - utils.MetaOpts: attrEvs[3].Opts, + utils.MetaOpts: attrEvs[3].APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -1926,7 +1926,7 @@ func TestProcessAttributeConstant(t *testing.T) { } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -1981,12 +1981,12 @@ func TestProcessAttributeVariable(t *testing.T) { "RandomField": "Val2", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2048,12 +2048,12 @@ func TestProcessAttributeComposed(t *testing.T) { "RandomField2": "Concatenated", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2110,12 +2110,12 @@ func TestProcessAttributeUsageDifference(t *testing.T) { "RandomField2": "1514804400", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2172,12 +2172,12 @@ func TestProcessAttributeSum(t *testing.T) { "RandomField2": "5", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2234,12 +2234,12 @@ func TestProcessAttributeDiff(t *testing.T) { "RandomField2": "5", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2296,12 +2296,12 @@ func TestProcessAttributeMultiply(t *testing.T) { "RandomField2": "5", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2358,12 +2358,12 @@ func TestProcessAttributeDivide(t *testing.T) { "RandomField2": "5", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2420,12 +2420,12 @@ func TestProcessAttributeValueExponent(t *testing.T) { "RandomField2": "5", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2482,12 +2482,12 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) { "RandomField2": "2013-12-30T15:00:01Z", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2543,12 +2543,12 @@ func TestProcessAttributePrefix(t *testing.T) { "Field2": "Val2", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, @@ -2604,12 +2604,12 @@ func TestProcessAttributeSuffix(t *testing.T) { "Field2": "Val2", utils.Weight: "20.0", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eNM := utils.MapStorage{ utils.MetaReq: ev.CGREvent.Event, - utils.MetaOpts: ev.Opts, + utils.MetaOpts: ev.APIOpts, utils.MetaVars: utils.MapStorage{ utils.ProcessRuns: utils.NewNMData(0), }, diff --git a/ers/amqp_it_test.go b/ers/amqp_it_test.go index 4d14fa2b9..4d7fbfeda 100644 --- a/ers/amqp_it_test.go +++ b/ers/amqp_it_test.go @@ -115,7 +115,7 @@ func TestAMQPER(t *testing.T) { Event: map[string]interface{}{ "CGRID": randomCGRID, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) diff --git a/ers/ers.go b/ers/ers.go index e14ba192d..3232b24d5 100644 --- a/ers/ers.go +++ b/ers/ers.go @@ -175,7 +175,7 @@ func (erS *ERService) processEvent(cgrEv *utils.CGREvent, if reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent { - if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.Opts); err != nil { + if cgrArgs, err = utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts); err != nil { utils.Logger.Warning(fmt.Sprintf("<%s> args extraction for reader <%s> failed because <%s>", utils.ERs, rdrCfg.ID, err.Error())) err = nil // reset the error and continue the processing diff --git a/ers/ers_it_test.go b/ers/ers_it_test.go index 40d135c2d..ebdfeee29 100644 --- a/ers/ers_it_test.go +++ b/ers/ers_it_test.go @@ -184,11 +184,11 @@ func TestERsListenAndServeRdrEvents(t *testing.T) { srv.rdrEvents = make(chan *erEvent, 1) srv.rdrEvents <- &erEvent{ cgrEvent: &utils.CGREvent{ - Tenant: "", - ID: "", - Time: nil, - Event: nil, - Opts: nil, + Tenant: "", + ID: "", + Time: nil, + Event: nil, + APIOpts: nil, }, rdrCfg: &config.EventReaderCfg{ ID: "", @@ -430,11 +430,11 @@ func TestERsProcessEvent(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Tenant: "", - ID: "", - Time: nil, - Event: nil, - Opts: nil, + Tenant: "", + ID: "", + Time: nil, + Event: nil, + APIOpts: nil, } err := srv.processEvent(cgrEvent, rdrCfg) if err == nil || err.Error() != "unsupported reqType: <>" { @@ -459,11 +459,11 @@ func TestERsProcessEvent2(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Tenant: "", - ID: "", - Time: nil, - Event: nil, - Opts: nil, + Tenant: "", + ID: "", + Time: nil, + Event: nil, + APIOpts: nil, } err := srv.processEvent(cgrEvent, rdrCfg) if err != nil { @@ -487,7 +487,7 @@ func TestERsProcessEvent3(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -514,7 +514,7 @@ func TestERsProcessEvent4(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -545,7 +545,7 @@ func TestERsProcessEvent5(t *testing.T) { ID: "", Time: nil, Event: nil, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -572,7 +572,7 @@ func TestERsProcessEvent6(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -598,7 +598,7 @@ func TestERsProcessEvent7(t *testing.T) { }, } cgrEvent := &utils.CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -628,7 +628,7 @@ func TestERsProcessEvent8(t *testing.T) { ID: "", Time: nil, Event: nil, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -659,7 +659,7 @@ func TestERsProcessEvent9(t *testing.T) { ID: "", Time: nil, Event: nil, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -693,7 +693,7 @@ func TestERsProcessEvent10(t *testing.T) { ID: "", Time: nil, Event: nil, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } @@ -727,7 +727,7 @@ func TestERsProcessEvent11(t *testing.T) { Event: map[string]interface{}{ utils.Usage: time.Second, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRoutesLimit: true, }, } diff --git a/ers/partial_csv.go b/ers/partial_csv.go index 0e5d92408..026870fff 100644 --- a/ers/partial_csv.go +++ b/ers/partial_csv.go @@ -247,7 +247,7 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) { cgrEv := new(utils.CGREvent) cgrEv.ID = utils.UUIDSha1Prefix() cgrEv.Time = utils.TimePointer(time.Now()) - cgrEv.Opts = map[string]interface{}{} + cgrEv.APIOpts = map[string]interface{}{} for i, origCgrEv := range origCgrEvs { if i == 0 { cgrEv.Tenant = origCgrEv.Tenant @@ -255,8 +255,8 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) { for key, value := range origCgrEv.Event { cgrEv.Event[key] = value } - for key, val := range origCgrEv.Opts { - cgrEv.Opts[key] = val + for key, val := range origCgrEv.APIOpts { + cgrEv.APIOpts[key] = val } } rdr.rdrEvents <- &erEvent{ @@ -383,10 +383,10 @@ func (rdr *PartialCSVFileER) postCDR(itmID string, value interface{}) { }) // compose the CGREvent from slice cgrEv := &utils.CGREvent{ - ID: utils.UUIDSha1Prefix(), - Time: utils.TimePointer(time.Now()), - Event: make(map[string]interface{}), - Opts: make(map[string]interface{}), + ID: utils.UUIDSha1Prefix(), + Time: utils.TimePointer(time.Now()), + Event: make(map[string]interface{}), + APIOpts: make(map[string]interface{}), } for i, origCgrEv := range origCgrEvs { if i == 0 { @@ -395,8 +395,8 @@ func (rdr *PartialCSVFileER) postCDR(itmID string, value interface{}) { for key, value := range origCgrEv.Event { cgrEv.Event[key] = value } - for key, val := range origCgrEv.Opts { - cgrEv.Opts[key] = val + for key, val := range origCgrEv.APIOpts { + cgrEv.APIOpts[key] = val } } rdr.rdrEvents <- &erEvent{ diff --git a/ers/sql_it_test.go b/ers/sql_it_test.go index 2d377d3db..e1f57625a 100644 --- a/ers/sql_it_test.go +++ b/ers/sql_it_test.go @@ -247,7 +247,7 @@ func testSQLReader(t *testing.T) { Event: map[string]interface{}{ "CGRID": cdr.CGRID, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) @@ -281,7 +281,7 @@ func testSQLReader2(t *testing.T) { Event: map[string]interface{}{ "CGRID": cdr.CGRID, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) @@ -494,7 +494,7 @@ func testSQLReader3(t *testing.T) { Event: map[string]interface{}{ "CGRID": cdr.CGRID, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) @@ -528,7 +528,7 @@ func testSQLReader4(t *testing.T) { Event: map[string]interface{}{ "CGRID": cdr.CGRID, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } if !reflect.DeepEqual(ev.cgrEvent, expected) { t.Errorf("Expected %s ,received %s", utils.ToJSON(expected), utils.ToJSON(ev.cgrEvent)) diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 79f4583e9..1f9d1ebff 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -203,7 +203,7 @@ func testA1itDataSession1(t *testing.T) { utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Usage: "10240", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "28800s", utils.OptsSessionsTTLLastUsed: "0s", utils.OptsSessionsTTLUsage: "0s", @@ -242,7 +242,7 @@ func testA1itDataSession1(t *testing.T) { utils.AnswerTime: "2017-03-03 11:39:32 +0100 CET", utils.Usage: "2097152", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "28800s", utils.OptsSessionsTTLLastUsed: "2097152s", utils.OptsSessionsTTLUsage: "0s", diff --git a/general_tests/accountactions_it_test.go b/general_tests/accountactions_it_test.go index 1245a64ef..44ce228d2 100644 --- a/general_tests/accountactions_it_test.go +++ b/general_tests/accountactions_it_test.go @@ -204,7 +204,7 @@ func testAccActionsExecuteAction(t *testing.T) { Event: map[string]interface{}{ "Account": 1001, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "BAL_NEW": true, "BAL_ADD": true, }, @@ -224,7 +224,7 @@ func testAccActionsExecuteAction2(t *testing.T) { Event: map[string]interface{}{ "Account": 1001, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "BAL_NEW": true, "BAL_ADD": true, }, diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 8b959cc6c..a7acdc60e 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -135,7 +135,7 @@ func testAttributeSProcessEvent(t *testing.T) { utils.EventName: "VariableTest", utils.ToR: utils.MetaVoice, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } eRply := engine.AttrSProcessEventReply{ @@ -149,7 +149,7 @@ func testAttributeSProcessEvent(t *testing.T) { utils.Category: utils.MetaVoice, utils.ToR: utils.MetaVoice, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -217,7 +217,7 @@ func testAttributeSProcessEventWithAccount(t *testing.T) { Event: map[string]interface{}{ "EventName": "AddAccountInfo", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -231,7 +231,7 @@ func testAttributeSProcessEventWithAccount(t *testing.T) { "EventName": "AddAccountInfo", "Balance": "10", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -299,7 +299,7 @@ func testAttributeSProcessEventWithAccountFull(t *testing.T) { Event: map[string]interface{}{ "EventName": "AddFullAccount", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -313,7 +313,7 @@ func testAttributeSProcessEventWithAccountFull(t *testing.T) { "EventName": "AddFullAccount", "FullAccount": "{\"ID\":\"cgrates.org:1001\",\"BalanceMap\":{\"*monetary\":[{\"Uuid\":\"18160631-a4ae-4078-8048-b4c6b87a36c6\",\"ID\":\"\",\"Value\":10,\"ExpirationDate\":\"0001-01-01T00:00:00Z\",\"Weight\":10,\"DestinationIDs\":{},\"RatingSubject\":\"\",\"Categories\":{},\"SharedGroups\":{},\"Timings\":null,\"TimingIDs\":{},\"Disabled\":false,\"Factor\":null,\"Blocker\":false}]},\"UnitCounters\":null,\"ActionTriggers\":null,\"AllowNegative\":false,\"Disabled\":false,\"UpdateTime\":\"2020-10-06T12:43:51.805Z\"}", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -431,7 +431,7 @@ func testAttributeSProcessEventWithStat(t *testing.T) { Event: map[string]interface{}{ "EventName": "AddStatEvent", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -445,7 +445,7 @@ func testAttributeSProcessEventWithStat(t *testing.T) { "EventName": "AddStatEvent", "AcdMetric": "11", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -513,7 +513,7 @@ func testAttributeSProcessEventWithStatFull(t *testing.T) { Event: map[string]interface{}{ "EventName": "AddFullStats", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -527,7 +527,7 @@ func testAttributeSProcessEventWithStatFull(t *testing.T) { "EventName": "AddFullStats", "AllMetrics": "{\"*acd\":11,\"*asr\":100,\"*tcd\":22}", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -579,7 +579,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) { Event: map[string]interface{}{ "Account": "3001", "Destination": "3002"}, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, UsageID: "651a8db2-4f67-4cf8-b622-169e8a482e21", @@ -597,7 +597,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) { Event: map[string]interface{}{ "Account": "3001", "Destination": "3002"}, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, UsageID: "651a8db2-4f67-4cf8-b622-169e8a482e22", @@ -659,7 +659,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) { Event: map[string]interface{}{ "EventName": "AddResourceUsages", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -673,7 +673,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) { "EventName": "AddResourceUsages", "ResourceTotalUsages": "5", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -833,7 +833,7 @@ func testAttributeSProcessEventWithLibPhoneNumber(t *testing.T) { "EventName": "AddDestinationCarrier", "Destination": "+447779330921", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -848,7 +848,7 @@ func testAttributeSProcessEventWithLibPhoneNumber(t *testing.T) { "Destination": "+447779330921", "DestinationCarrier": "Orange", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -935,7 +935,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) { "EventName": "AddComposedInfo", "Destination": "+447779330921", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -950,7 +950,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) { "Destination": "+447779330921", "DestinationCarrier": "Orange;44", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) @@ -1019,7 +1019,7 @@ func testAttributeSProcessEventWithLibPhoneNumberFull(t *testing.T) { "EventName": "AddDestinationDetails", "Destination": "+447779330921", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } @@ -1034,7 +1034,7 @@ func testAttributeSProcessEventWithLibPhoneNumberFull(t *testing.T) { "Destination": "+447779330921", "DestinationDetails": "{\"Carrier\":\"Orange\",\"CountryCode\":44,\"CountryCodeSource\":1,\"Extension\":\"\",\"GeoLocation\":\"\",\"ItalianLeadingZero\":false,\"LengthOfNationalDestinationCode\":0,\"NationalNumber\":7779330921,\"NumberOfLeadingZeros\":1,\"NumberType\":1,\"PreferredDomesticCarrierCode\":\"\",\"RawInput\":\"+447779330921\",\"Region\":\"GB\"}", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } sort.Strings(eRply.AlteredFields) diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index 744320ed2..27d246b67 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -323,7 +323,7 @@ func testCacheRplPing(t *testing.T) { if err := dspEngine1RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRoute123", }, }, &rpl); err != nil { @@ -364,7 +364,7 @@ func testCacheRplCheckReplication(t *testing.T) { if err := dspEngine2RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRoute123", }, }, &rpl); err != nil { @@ -395,7 +395,7 @@ func testCacheRplAACheckReplication(t *testing.T) { if err := dspEngine2RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRouteFromDispatcher2", }, }, &rpl); err != nil { @@ -406,7 +406,7 @@ func testCacheRplAACheckReplication(t *testing.T) { if err := dspEngine1RPC.Call(utils.AttributeSv1Ping, &utils.CGREvent{ Tenant: "cgrates.org", - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRouteFromDispatcher1", }, }, &rpl); err != nil { @@ -470,7 +470,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { "EventName": "TestLoad", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRouteFromDispatcher1", }, }, &rpl); err != nil { @@ -492,7 +492,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { "EventName": "TestLoad", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRouteFromDispatcher2", }, }, &rpl); err != nil { @@ -583,7 +583,7 @@ func testCacheRplCheckLoadReplication(t *testing.T) { "EventName": "TestLoad", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testRoute123", }, }, &rpl); err != nil { diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index a0338e733..8086fdf05 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -75,7 +75,7 @@ var ( utils.Usage: 10 * time.Second, utils.Cost: 1.201, }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, } cdrsExpEvExp = map[string]interface{}{ diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index e517d8d58..5ed8252b6 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -275,7 +275,7 @@ func testCDRsOnExpHttpCdrReplication(t *testing.T) { } var reply string arg := testCdr1.AsCGREvent() - arg.Opts = map[string]interface{}{"ExporterID": "http_localhost"} + arg.APIOpts = map[string]interface{}{"ExporterID": "http_localhost"} // we expect that the cdr export to fail and go into the failed post directory if err := cdrsMasterRpc.Call(utils.CDRsV1ProcessEvent, diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 4881217e7..ca53bf2eb 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -461,7 +461,7 @@ func testV1DataInitSession(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.Usage: initUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "300s", utils.OptsSessionsTTLLastUsed: "0s", utils.OptsSessionsTTLMaxDelay: "1800s", @@ -508,7 +508,7 @@ func testV1DataUpdateWith1Mo(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.Usage: reqUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "28807s", utils.OptsSessionsTTLLastUsed: "0s", utils.OptsSessionsTTLMaxDelay: "1800s", @@ -552,7 +552,7 @@ func testV1DataUpdateWith1Go(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC), utils.Usage: reqUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "28807s", utils.OptsSessionsTTLLastUsed: "0s", utils.OptsSessionsTTLMaxDelay: "1800s", diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 1f437754b..1b41e214f 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -941,7 +941,7 @@ func testV1FltrChargerSuffix(t *testing.T) { utils.RunID: "Intra", utils.Destination: "999", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaChargers, }, }, @@ -978,7 +978,7 @@ func testV1FltrChargerSuffix(t *testing.T) { utils.RunID: "Inter", utils.Destination: "999", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaChargers, }, }, @@ -1038,7 +1038,7 @@ func testV1FltrAttributesPrefix(t *testing.T) { "CustomField2": "+2007", utils.Destination: "+1207", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } cgrEv := &engine.AttrArgsProcessEvent{ @@ -1050,7 +1050,7 @@ func testV1FltrAttributesPrefix(t *testing.T) { "CustomField2": "+2007", utils.Destination: "+1207", }, - Opts: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, Context: utils.StringPointer("prefix"), } diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index ac3118f80..04fe7e98b 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -200,7 +200,7 @@ func testSes2StirAuthenticate(t *testing.T) { utils.Destination: "1002", utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsStirIdentity: "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDAxIn0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken", }, }, @@ -211,14 +211,14 @@ func testSes2StirAuthenticate(t *testing.T) { t.Error(err) } // altered originator - args.Opts[utils.OptsStirOriginatorTn] = "1005" + args.APIOpts[utils.OptsStirOriginatorTn] = "1005" if err := ses2RPC.Call(utils.SessionSv1ProcessEvent, args, &rply); err == nil || err.Error() != "*stir_authenticate: wrong originatorTn" { t.Errorf("Expected error :%q ,receved: %v", "*stir_authenticate: wrong originatorTn", err) } // altered identity - args.Opts[utils.OptsStirIdentity] = "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDA1In0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken" + args.APIOpts[utils.OptsStirIdentity] = "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDA1In0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken" if err := ses2RPC.Call(utils.SessionSv1ProcessEvent, args, &rply); err == nil || err.Error() != "*stir_authenticate: crypto/ecdsa: verification error" { t.Errorf("Expected error :%q ,receved: %v", "*stir_authenticate: crypto/ecdsa: verification error", err) @@ -241,7 +241,7 @@ func testSes2StirInit(t *testing.T) { utils.Destination: "1002", utils.Usage: 10 * time.Minute, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsStirPublicKeyPath: "/usr/share/cgrates/stir/stir_pubkey.pem", utils.OptsStirPrivateKeyPath: "/usr/share/cgrates/stir/stir_privatekey.pem", }, diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 076969cb2..c12e29354 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -146,7 +146,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: initUsage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "ses12345", }, }, @@ -183,7 +183,7 @@ func testSes3ItProcessEvent(t *testing.T) { utils.AnswerTime: "2018-01-07T17:00:10Z", utils.Usage: 300000000000.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Subsys: utils.MetaSessionS, utils.OptsAPIKey: "ses12345", utils.MetaEventType: utils.StatUpdate, diff --git a/general_tests/sessionpause_it_test.go b/general_tests/sessionpause_it_test.go index 359410dd4..d97963ddc 100644 --- a/general_tests/sessionpause_it_test.go +++ b/general_tests/sessionpause_it_test.go @@ -135,7 +135,7 @@ func testSesPauseItInitSession(t *testing.T, cgrID string, chargeable bool, usag utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: usage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "0s", utils.OptsChargeable: chargeable, }, @@ -169,7 +169,7 @@ func testSesPauseItUpdateSession(t *testing.T, cgrID string, chargeable bool, us utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: usage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsChargeable: chargeable, }, }, @@ -202,7 +202,7 @@ func testSesPauseItTerminateSession(t *testing.T, cgrID string, chargeable bool, utils.AnswerTime: time.Date(2018, time.January, 7, 16, 60, 10, 0, time.UTC), utils.Usage: usage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsChargeable: chargeable, }, }, diff --git a/general_tests/sessionroutes_it_test.go b/general_tests/sessionroutes_it_test.go index 5b928d562..a4fef3aad 100644 --- a/general_tests/sessionroutes_it_test.go +++ b/general_tests/sessionroutes_it_test.go @@ -131,7 +131,7 @@ func testSesRoutesAuthorizeEvent(t *testing.T) { utils.SetupTime: time.Date(2018, 8, 24, 16, 00, 00, 0, time.UTC), utils.Usage: time.Minute, }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, } args := sessions.NewV1AuthorizeArgs(false, []string{}, false, []string{}, false, []string{}, false, false, @@ -262,7 +262,7 @@ func testSesRoutesProcessMessage(t *testing.T) { utils.SetupTime: time.Date(2018, 8, 24, 16, 00, 00, 0, time.UTC), utils.Usage: time.Minute, }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, } args := sessions.NewV1ProcessMessageArgs(false, []string{}, false, []string{}, false, []string{}, false, false, @@ -395,7 +395,7 @@ func testSesRoutesProcessEvent(t *testing.T) { utils.SetupTime: time.Date(2018, 8, 24, 16, 00, 00, 0, time.UTC), utils.Usage: time.Minute, }, - Opts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, + APIOpts: map[string]interface{}{utils.OptsRouteProfilesCount: 1}, } args := sessions.V1ProcessEventArgs{ Flags: []string{"*routes"}, diff --git a/rates/rates.go b/rates/rates.go index b4137d1b1..322cdf42d 100644 --- a/rates/rates.go +++ b/rates/rates.go @@ -74,7 +74,7 @@ func (rS *RateS) Call(serviceMethod string, args interface{}, reply interface{}) func (rS *RateS) matchingRateProfileForEvent(tnt string, rPfIDs []string, args *utils.ArgsCostForEvent) (rtPfl *utils.RateProfile, err error) { evNm := utils.MapStorage{ utils.MetaReq: args.CGREvent.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, } if len(rPfIDs) == 0 { var rPfIDMp utils.StringSet @@ -134,7 +134,7 @@ func (rS *RateS) matchingRateProfileForEvent(tnt string, rPfIDs []string, args * func (rS *RateS) rateProfileCostForEvent(rtPfl *utils.RateProfile, args *utils.ArgsCostForEvent, verbosity int) (rpCost *utils.RateProfileCost, err error) { evNm := utils.MapStorage{ utils.MetaReq: args.CGREvent.Event, - utils.MetaOpts: args.Opts, + utils.MetaOpts: args.APIOpts, } var rtIDs utils.StringSet if rtIDs, err = engine.MatchingItemIDsForEvent( diff --git a/rates/rates_test.go b/rates/rates_test.go index f7ac65adc..74bad439f 100644 --- a/rates/rates_test.go +++ b/rates/rates_test.go @@ -645,7 +645,7 @@ func BenchmarkRateS_V1CostForEvent(b *testing.B) { Event: map[string]interface{}{ utils.Subject: "1010", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2020, 12, 23, 59, 0, 0, 0, time.UTC), utils.OptsRatesUsage: "2h", }, @@ -737,7 +737,7 @@ func BenchmarkRateS_V1CostForEventSingleRate(b *testing.B) { Event: map[string]interface{}{ utils.Subject: "1001", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: time.Date(2020, 12, 23, 59, 0, 0, 0, time.UTC), utils.OptsRatesUsage: "2h", }, @@ -813,7 +813,7 @@ func TestRateProfileCostForEventInvalidUsage(t *testing.T) { ID: "RATE_1", Event: map[string]interface{}{ utils.AccountField: "1001"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "invalidUsageFormat", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -827,7 +827,7 @@ func TestRateProfileCostForEventInvalidUsage(t *testing.T) { ID: "RATE_1", Event: map[string]interface{}{ utils.AccountField: "1001"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesStartTime: "invalidStartTimeFormat", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -891,7 +891,7 @@ func TestRateProfileCostForEventZeroIncrement(t *testing.T) { ID: "RATE_1", Event: map[string]interface{}{ utils.AccountField: "1001"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "100m", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -954,7 +954,7 @@ func TestRateProfileCostForEventMaximumIterations(t *testing.T) { ID: "RATE_1", Event: map[string]interface{}{ utils.AccountField: "1001"}, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRatesUsage: "10000m", }}}, rateS.cfg.RateSCfg().Verbosity); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) diff --git a/registrarc/registrarcrpc_it_test.go b/registrarc/registrarcrpc_it_test.go index 0cb2c427c..476d39593 100644 --- a/registrarc/registrarcrpc_it_test.go +++ b/registrarc/registrarcrpc_it_test.go @@ -122,7 +122,7 @@ func testRPCChargerSNoAttr(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1010", }, - Opts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, + APIOpts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, } expErr := utils.NewErrServerError(rpcclient.ErrDisconnected).Error() var rply []*engine.ChrgSProcessEventReply @@ -145,7 +145,7 @@ func testRPCChargerSWithAttr(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1010", }, - Opts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, + APIOpts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.}, } processedEv := []*engine.ChrgSProcessEventReply{ @@ -158,7 +158,7 @@ func testRPCChargerSWithAttr(t *testing.T) { "Account": "1010", "RunID": "CustomerCharges", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "*processRuns": 1., "*subsys": "*chargers", }, @@ -174,7 +174,7 @@ func testRPCChargerSWithAttr(t *testing.T) { "RequestType": "*none", "RunID": "raw", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "*processRuns": 1., "*subsys": "*chargers", }, @@ -190,7 +190,7 @@ func testRPCChargerSWithAttr(t *testing.T) { "RunID": "SupplierCharges", "Subject": "SUPPLIER1", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "*processRuns": 1., "*subsys": "*chargers", }, diff --git a/sessions/session.go b/sessions/session.go index 0763bde97..dc81a8217 100644 --- a/sessions/session.go +++ b/sessions/session.go @@ -226,10 +226,10 @@ func (s *Session) asCGREvents() (cgrEvs []*utils.CGREvent) { cgrEvs = make([]*utils.CGREvent, len(s.SRuns)) // so we can gather all cdr info while under lock for i, sr := range s.SRuns { cgrEvs[i] = &utils.CGREvent{ - Tenant: s.Tenant, - ID: utils.UUIDSha1Prefix(), - Event: sr.Event, - Opts: s.OptsStart, + Tenant: s.Tenant, + ID: utils.UUIDSha1Prefix(), + Event: sr.Event, + APIOpts: s.OptsStart, } } return diff --git a/sessions/sessions.go b/sessions/sessions.go index 253bcd407..ba19a4b7b 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -386,10 +386,10 @@ func (sS *SessionS) forceSTerminate(s *Session, extraUsage time.Duration, tUsage var reply string argsRU := &utils.ArgRSv1ResourceUsage{ CGREvent: &utils.CGREvent{ - Tenant: s.Tenant, - ID: utils.GenUUID(), - Event: s.EventStart, - Opts: s.OptsStart, + Tenant: s.Tenant, + ID: utils.GenUUID(), + Event: s.EventStart, + APIOpts: s.OptsStart, }, UsageID: s.ResourceID, Units: 1, @@ -1155,7 +1155,7 @@ func (sS *SessionS) newSession(cgrEv *utils.CGREvent, resID, clntConnID string, Tenant: cgrEv.Tenant, ResourceID: resID, EventStart: evStart.Clone(), // decouple the event from the request so we can avoid concurrency with debit and ttl - OptsStart: engine.MapEvent(cgrEv.Opts).Clone(), + OptsStart: engine.MapEvent(cgrEv.APIOpts).Clone(), ClientConnID: clntConnID, DebitInterval: dbtItval, } @@ -1847,7 +1847,7 @@ func (args *V1AuthorizeArgs) ParseFlags(flags, sep string) { args.ForceDuration = true } } - args.Paginator, _ = utils.GetRoutePaginatorFromOpts(args.Opts) + args.Paginator, _ = utils.GetRoutePaginatorFromOpts(args.APIOpts) return } @@ -2265,7 +2265,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector, } if args.InitSession { var err error - opts := engine.MapEvent(args.Opts) + opts := engine.MapEvent(args.APIOpts) dbtItvl := sS.cgrCfg.SessionSCfg().DebitInterval if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { @@ -2284,7 +2284,7 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector, rply.MaxUsage = utils.DurationPointer(sS.cgrCfg.SessionSCfg().GetDefaultUsage(utils.IfaceAsString(args.CGREvent.Event[utils.ToR]))) } else { var sRunsUsage map[string]time.Duration - if sRunsUsage, err = sS.updateSession(s, nil, args.Opts, false); err != nil { + if sRunsUsage, err = sS.updateSession(s, nil, args.APIOpts, false); err != nil { return utils.NewErrRALs(err) } @@ -2477,7 +2477,7 @@ func (sS *SessionS) BiRPCv1UpdateSession(clnt rpcclient.ClientConnector, } if args.UpdateSession { ev := engine.MapEvent(args.CGREvent.Event) - opts := engine.MapEvent(args.Opts) + opts := engine.MapEvent(args.APIOpts) dbtItvl := sS.cgrCfg.SessionSCfg().DebitInterval if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { @@ -2496,7 +2496,7 @@ func (sS *SessionS) BiRPCv1UpdateSession(clnt rpcclient.ClientConnector, } } var sRunsUsage map[string]time.Duration - if sRunsUsage, err = sS.updateSession(s, ev, args.Opts, false); err != nil { + if sRunsUsage, err = sS.updateSession(s, ev, args.APIOpts, false); err != nil { return utils.NewErrRALs(err) } var maxUsage time.Duration @@ -2602,7 +2602,7 @@ func (sS *SessionS) BiRPCv1TerminateSession(clnt rpcclient.ClientConnector, } ev := engine.MapEvent(args.CGREvent.Event) - opts := engine.MapEvent(args.Opts) + opts := engine.MapEvent(args.APIOpts) cgrID := GetSetCGRID(ev) originID := ev.GetStringIgnoreErrors(utils.OriginID) if args.TerminateSession { @@ -2816,7 +2816,7 @@ func (args *V1ProcessMessageArgs) ParseFlags(flags, sep string) { args.ForceDuration = true } } - args.Paginator, _ = utils.GetRoutePaginatorFromOpts(args.Opts) + args.Paginator, _ = utils.GetRoutePaginatorFromOpts(args.APIOpts) return } @@ -3224,7 +3224,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, if argsFlagsWithParams.GetBool(utils.MetaSTIRAuthenticate) { for _, cgrEv := range getDerivedEvents(events, argsFlagsWithParams[utils.MetaSTIRAuthenticate].Has(utils.MetaDerivedReply)) { ev := engine.MapEvent(cgrEv.Event) - opts := engine.MapEvent(cgrEv.Opts) + opts := engine.MapEvent(cgrEv.APIOpts) attest := sS.cgrCfg.SessionSCfg().STIRCfg.AllowedAttest if uattest := opts.GetStringIgnoreErrors(utils.OptsStirATest); uattest != utils.EmptyString { attest = utils.NewStringSet(strings.Split(uattest, utils.InfieldSep)) @@ -3246,7 +3246,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, rply.STIRIdentity = make(map[string]string) for runID, cgrEv := range getDerivedEvents(events, argsFlagsWithParams[utils.MetaSTIRInitiate].Has(utils.MetaDerivedReply)) { ev := engine.MapEvent(cgrEv.Event) - opts := engine.MapEvent(cgrEv.Opts) + opts := engine.MapEvent(cgrEv.APIOpts) attest := sS.cgrCfg.SessionSCfg().STIRCfg.DefaultAttest if uattest := opts.GetStringIgnoreErrors(utils.OptsStirATest); uattest != utils.EmptyString { attest = uattest @@ -3383,14 +3383,14 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, utils.ResponderGetCost, &engine.CallDescriptorWithAPIOpts{ CallDescriptor: cd, - APIOpts: cgrEv.Opts, + APIOpts: cgrEv.APIOpts, }, &cc); err != nil { return err } rply.Cost[runID] = cc.Cost } } - opts := engine.MapEvent(args.Opts) + opts := engine.MapEvent(args.APIOpts) ev := engine.MapEvent(args.CGREvent.Event) originID := ev.GetStringIgnoreErrors(utils.OriginID) switch { @@ -3421,7 +3421,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, for _, sr := range s.SRuns { sRunsMaxUsage[sr.CD.RunID] = sS.cgrCfg.SessionSCfg().GetDefaultUsage(ev.GetStringIgnoreErrors(utils.ToR)) } - } else if sRunsMaxUsage, err = sS.updateSession(s, nil, args.Opts, false); err != nil { + } else if sRunsMaxUsage, err = sS.updateSession(s, nil, args.APIOpts, false); err != nil { return utils.NewErrRALs(err) } rply.MaxUsage = getDerivedMaxUsage(sRunsMaxUsage, ralsOpts.Has(utils.MetaDerivedReply)) @@ -3443,7 +3443,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } } var sRunsMaxUsage map[string]time.Duration - if sRunsMaxUsage, err = sS.updateSession(s, ev, args.Opts, false); err != nil { + if sRunsMaxUsage, err = sS.updateSession(s, ev, args.APIOpts, false); err != nil { return utils.NewErrRALs(err) } rply.MaxUsage = getDerivedMaxUsage(sRunsMaxUsage, ralsOpts.Has(utils.MetaDerivedReply)) @@ -3589,7 +3589,7 @@ func (sS *SessionS) BiRPCv1GetCost(clnt rpcclient.ClientConnector, utils.ResponderGetCost, &engine.CallDescriptorWithAPIOpts{ CallDescriptor: cd, - APIOpts: args.Opts, + APIOpts: args.APIOpts, }, &cc); err != nil { return } @@ -3824,19 +3824,19 @@ func (sS *SessionS) processAttributes(cgrEv *utils.CGREvent, attrIDs []string, if len(sS.cgrCfg.SessionSCfg().AttrSConns) == 0 { return rplyEv, utils.NewErrNotConnected(utils.AttributeS) } - if cgrEv.Opts == nil { - cgrEv.Opts = make(engine.MapEvent) + if cgrEv.APIOpts == nil { + cgrEv.APIOpts = make(engine.MapEvent) } - cgrEv.Opts[utils.Subsys] = utils.MetaSessionS + cgrEv.APIOpts[utils.Subsys] = utils.MetaSessionS var processRuns *int - if val, has := cgrEv.Opts[utils.OptsAttributesProcessRuns]; has { + if val, has := cgrEv.APIOpts[utils.OptsAttributesProcessRuns]; has { if v, err := utils.IfaceAsTInt64(val); err == nil { processRuns = utils.IntPointer(int(v)) } } attrArgs := &engine.AttrArgsProcessEvent{ Context: utils.StringPointer(utils.FirstNonEmpty( - utils.IfaceAsString(cgrEv.Opts[utils.OptsContext]), + utils.IfaceAsString(cgrEv.APIOpts[utils.OptsContext]), utils.MetaSessionS)), CGREvent: cgrEv, AttributeIDs: attrIDs, diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index bd4249024..0bdf155fc 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -584,7 +584,7 @@ func testSessionsDataTTLExpired(t *testing.T) { utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTLUsage: "2048", // will be charged on TTL }, }, @@ -725,7 +725,7 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { utils.LastUsed: "1024", utils.Usage: "4096", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTLUsage: "2048", // will be charged on TTL utils.OptsSessionsTTLLastUsed: "1024", }, @@ -865,7 +865,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Usage: "1024", utils.LastUsed: "1024", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "0", // cancel timeout since usage 0 will not update it }, }, @@ -914,7 +914,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { utils.Usage: "0", utils.LastUsed: "0", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTL: "1h", // cancel timeout since usage 0 will not update it }, }, @@ -1113,7 +1113,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: "1024", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsSessionsTTLLastUsage: "2048", }, }, diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index 02a7d3b43..c254b545f 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -150,7 +150,7 @@ func testSessionsItTerminatNonexist(t *testing.T) { utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "10s", }, }, @@ -225,7 +225,7 @@ func testSessionsItUpdateNonexist(t *testing.T) { utils.AnswerTime: time.Date(2016, time.January, 5, 18, 31, 05, 0, time.UTC), utils.Usage: usage, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "0s", }, }, diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index f43e1c58a..2fee9ac45 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -982,7 +982,7 @@ func TestV1AuthorizeArgsParseFlags11(t *testing.T) { t.Errorf("Expecting %+v,\n received: %+v", eOut, v1authArgs) } //normal check -> without *dispatchers - cgrArgs, _ := utils.GetRoutePaginatorFromOpts(v1authArgs.Opts) + cgrArgs, _ := utils.GetRoutePaginatorFromOpts(v1authArgs.APIOpts) eOut = &V1AuthorizeArgs{ GetMaxUsage: true, AuthorizeResources: true, @@ -1008,7 +1008,7 @@ func TestV1AuthorizeArgsParseFlags11(t *testing.T) { t.Errorf("Expecting %+v,\n received: %+v\n", utils.ToJSON(eOut), utils.ToJSON(v1authArgs)) } // //normal check -> with *dispatchers - cgrArgs, _ = utils.GetRoutePaginatorFromOpts(v1authArgs.Opts) + cgrArgs, _ = utils.GetRoutePaginatorFromOpts(v1authArgs.APIOpts) eOut = &V1AuthorizeArgs{ GetMaxUsage: true, AuthorizeResources: true, @@ -1690,7 +1690,7 @@ func TestSessionSNewV1AuthorizeArgsWithOpts(t *testing.T) { utils.AccountField: "1001", utils.Destination: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsAPIKey: "testkey", utils.OptsRouteID: "testrouteid", }, @@ -1701,7 +1701,7 @@ func TestSessionSNewV1AuthorizeArgsWithOpts(t *testing.T) { CGREvent: cgrEv, ForceDuration: true, } - cgrArgs, _ := utils.GetRoutePaginatorFromOpts(cgrEv.Opts) + cgrArgs, _ := utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts) rply := NewV1AuthorizeArgs(true, nil, false, nil, false, nil, true, false, false, false, false, cgrEv, cgrArgs, true, "") if !reflect.DeepEqual(expected, rply) { @@ -1735,7 +1735,7 @@ func TestSessionSNewV1AuthorizeArgsWithOpts2(t *testing.T) { utils.AccountField: "1001", utils.Destination: "1002", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsRouteID: "testrouteid", }, } @@ -1745,7 +1745,7 @@ func TestSessionSNewV1AuthorizeArgsWithOpts2(t *testing.T) { CGREvent: cgrEv, ForceDuration: true, } - cgrArgs, _ := utils.GetRoutePaginatorFromOpts(cgrEv.Opts) + cgrArgs, _ := utils.GetRoutePaginatorFromOpts(cgrEv.APIOpts) rply := NewV1AuthorizeArgs(true, nil, false, nil, false, nil, true, false, false, false, false, cgrEv, cgrArgs, true, "") if !reflect.DeepEqual(expected, rply) { diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go index 70d36f9fa..cec2ded4b 100644 --- a/sessions/sessionscover_test.go +++ b/sessions/sessionscover_test.go @@ -1843,7 +1843,7 @@ func TestAuthEventMockCall(t *testing.T) { Event: map[string]interface{}{ utils.Destination: "10", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.Usage: 10, }, } @@ -1858,7 +1858,7 @@ func TestAuthEventMockCall(t *testing.T) { t.Errorf("Expected %+v, received %+v", expectedTime, usage) } - cgrEv.Opts = map[string]interface{}{ + cgrEv.APIOpts = map[string]interface{}{ utils.Usage: 20, } expected := "RALS_ERROR:NO_MORE_DATA" @@ -2924,7 +2924,7 @@ func TestBiRPCv1InitiateSession2(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "invalid_usage", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "invalid_DUR_FORMAT", }, } @@ -2938,7 +2938,7 @@ func TestBiRPCv1InitiateSession2(t *testing.T) { if err := sessions.BiRPCv1InitiateSession(nil, args, rply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } - args.CGREvent.Opts[utils.OptsDebitInterval] = "10s" + args.CGREvent.APIOpts[utils.OptsDebitInterval] = "10s" expected = "ChargerS is disabled" if err := sessions.BiRPCv1InitiateSession(nil, args, rply); err == nil || err.Error() != expected { @@ -2972,7 +2972,7 @@ func TestBiRPCv1InitiateSession2(t *testing.T) { Event: map[string]interface{}{ utils.Usage: "1s", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "10s", }, } @@ -3213,7 +3213,7 @@ func TestBiRPCv1UpdateSession2(t *testing.T) { utils.Usage: "invalid_dur_format", utils.OriginID: "TEST_ID", }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "invalid_dur_format", }, } @@ -3224,7 +3224,7 @@ func TestBiRPCv1UpdateSession2(t *testing.T) { if err := sessions.BiRPCv1UpdateSession(nil, args, rply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - cgrEvent.Opts[utils.OptsDebitInterval] = "10s" + cgrEvent.APIOpts[utils.OptsDebitInterval] = "10s" args = NewV1UpdateSessionArgs(false, []string{}, true, cgrEvent, true) @@ -3331,14 +3331,14 @@ func TestBiRPCv1TerminateSession1(t *testing.T) { } cgrEvent.Event[utils.OriginID] = "ORIGIN_ID" - cgrEvent.Opts = make(map[string]interface{}) - cgrEvent.Opts[utils.OptsDebitInterval] = "invalid_time_format" + cgrEvent.APIOpts = make(map[string]interface{}) + cgrEvent.APIOpts[utils.OptsDebitInterval] = "invalid_time_format" args = NewV1TerminateSessionArgs(true, false, false, nil, false, nil, cgrEvent, true) expected = "RALS_ERROR:time: invalid duration \"invalid_time_format\"" if err := sessions.BiRPCv1TerminateSession(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - cgrEvent.Opts[utils.OptsDebitInterval] = "1m" + cgrEvent.APIOpts[utils.OptsDebitInterval] = "1m" //by this CGRID, there will be an empty session cgrEvent.Event[utils.CGRID] = "CGR_ID" @@ -3886,22 +3886,22 @@ func TestBiRPCv1ProcessEventStats(t *testing.T) { } args.Flags = []string{utils.MetaSTIRAuthenticate} - args.CGREvent.Opts = make(map[string]interface{}) - args.CGREvent.Opts[utils.OptsStirATest] = "stir;test;opts" + args.CGREvent.APIOpts = make(map[string]interface{}) + args.CGREvent.APIOpts[utils.OptsStirATest] = "stir;test;opts" expected = "*stir_authenticate: missing parts of the message header" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } args.Flags = []string{utils.MetaSTIRInitiate} - args.CGREvent.Opts = make(map[string]interface{}) - args.CGREvent.Opts[utils.OptsStirATest] = "stir;test;opts" + args.CGREvent.APIOpts = make(map[string]interface{}) + args.CGREvent.APIOpts[utils.OptsStirATest] = "stir;test;opts" expected = "*stir_authenticate: open : no such file or directory" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - args.CGREvent.Opts[utils.OptsStirOriginatorURI] = "+407590336423;USER_ID" + args.CGREvent.APIOpts[utils.OptsStirOriginatorURI] = "+407590336423;USER_ID" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } @@ -4091,13 +4091,13 @@ func TestBiRPCv1ProcessEventRals1(t *testing.T) { args.Flags = []string{utils.MetaRALs, utils.ConcatenatedKey(utils.MetaRALs, utils.MetaInitiate), utils.MetaChargers} - args.Opts = make(map[string]interface{}) - args.Opts[utils.OptsDebitInterval] = "invalid_dbtitrvl_format" + args.APIOpts = make(map[string]interface{}) + args.APIOpts[utils.OptsDebitInterval] = "invalid_dbtitrvl_format" expected = "RALS_ERROR:time: invalid duration \"invalid_dbtitrvl_format\"" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - args.Opts[utils.OptsDebitInterval] = "5s" + args.APIOpts[utils.OptsDebitInterval] = "5s" sessions.cgrCfg.SessionSCfg().ChargerSConns = []string{} expected = "ChargerS is disabled" @@ -4172,7 +4172,7 @@ func TestBiRPCv1ProcessEventRals2(t *testing.T) { utils.Destination: "1002", utils.RequestType: utils.MetaPrepaid, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "10s", }, }, @@ -4187,12 +4187,12 @@ func TestBiRPCv1ProcessEventRals2(t *testing.T) { args.Flags = []string{utils.MetaRALs, utils.ConcatenatedKey(utils.MetaRALs, utils.MetaUpdate), utils.MetaChargers} - args.Opts[utils.OptsDebitInterval] = "invalid_format" + args.APIOpts[utils.OptsDebitInterval] = "invalid_format" expected := "RALS_ERROR:time: invalid duration \"invalid_format\"" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - args.Opts[utils.OptsDebitInterval] = "10s" + args.APIOpts[utils.OptsDebitInterval] = "10s" args.Event[utils.CGRID] = "test_id_new" sessions.cgrCfg.SessionSCfg().ChargerSConns = []string{} @@ -4213,7 +4213,7 @@ func TestBiRPCv1ProcessEventRals2(t *testing.T) { args.Flags = []string{utils.MetaRALs, utils.ConcatenatedKey(utils.MetaRALs, utils.MetaUpdate), utils.MetaChargers} - delete(args.Opts, utils.OptsDebitInterval) + delete(args.APIOpts, utils.OptsDebitInterval) if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err != nil { t.Error(err) } @@ -4221,12 +4221,12 @@ func TestBiRPCv1ProcessEventRals2(t *testing.T) { args.Flags = []string{utils.MetaRALs, utils.ConcatenatedKey(utils.MetaRALs, utils.MetaTerminate), utils.MetaChargers} - args.Opts[utils.OptsDebitInterval] = "invalid_format" + args.APIOpts[utils.OptsDebitInterval] = "invalid_format" expected = "RALS_ERROR:time: invalid duration \"invalid_format\"" if err := sessions.BiRPCv1ProcessEvent(nil, args, &reply); err == nil || err.Error() != expected { t.Errorf("Exepected %+v, received %+v", expected, err) } - args.Opts[utils.OptsDebitInterval] = "10s" + args.APIOpts[utils.OptsDebitInterval] = "10s" args.Event[utils.CGRID] = "test_id_new" sessions.cgrCfg.SessionSCfg().ChargerSConns = []string{} @@ -4414,7 +4414,7 @@ func TestBiRPCv1GetCost(t *testing.T) { utils.Destination: "1002", utils.RequestType: utils.MetaPrepaid, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ utils.OptsDebitInterval: "10s", }, } diff --git a/utils/apitpdata.go b/utils/apitpdata.go index cf9ab7d10..54a9ae38f 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -1506,7 +1506,7 @@ type ArgsCostForEvent struct { // StartTime returns the event time used to check active rate profiles func (args *ArgsCostForEvent) StartTime(tmz string) (sTime time.Time, err error) { - if tIface, has := args.Opts[OptsRatesStartTime]; has { + if tIface, has := args.APIOpts[OptsRatesStartTime]; has { return IfaceAsTime(tIface, tmz) } return time.Now(), nil @@ -1515,7 +1515,7 @@ func (args *ArgsCostForEvent) StartTime(tmz string) (sTime time.Time, err error) // usage returns the event time used to check active rate profiles func (args *ArgsCostForEvent) Usage() (usage *decimal.Big, err error) { // first search for the usage in opts - if uIface, has := args.Opts[OptsRatesUsage]; has { + if uIface, has := args.APIOpts[OptsRatesUsage]; has { return IfaceAsBig(uIface) } // if the usage is not present in opts search in event diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index 63c695a95..4f24cfbd9 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -665,8 +665,8 @@ func TestArgRSv1ResourceUsageCloneCase1(t *testing.T) { func TestArgRSv1ResourceUsageCloneCase2(t *testing.T) { newArgRSv1 := &ArgRSv1ResourceUsage{ CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - Opts: map[string]interface{}{}, + Tenant: "*req.CGRID", + APIOpts: map[string]interface{}{}, }, UsageID: "randomID", UsageTTL: DurationPointer(2), @@ -682,9 +682,9 @@ func TestArgRSv1ResourceUsageCloneCase2(t *testing.T) { func TestArgRSv1ResourceUsageCloneCase3(t *testing.T) { newArgRSv1 := &ArgRSv1ResourceUsage{ CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{}, + Tenant: "*req.CGRID", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, UsageID: "randomID", UsageTTL: DurationPointer(2), @@ -1061,10 +1061,10 @@ func TestStartTimeNow(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } timpulet1 := time.Now() @@ -1082,10 +1082,10 @@ func TestStartTime(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{"*ratesStartTime": "2018-01-07T17:00:10Z"}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{"*ratesStartTime": "2018-01-07T17:00:10Z"}, }, } if result, err := testCostEventStruct.StartTime(""); err != nil { @@ -1099,10 +1099,10 @@ func TestStartTimeError(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{"*ratesStartTime": "start"}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{"*ratesStartTime": "start"}, }, } _, err := testCostEventStruct.StartTime("") @@ -1115,10 +1115,10 @@ func TestUsageMinute(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{}, }, } if rcv, err := testCostEventStruct.Usage(); err != nil { @@ -1132,10 +1132,10 @@ func TestUsageError(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{"*ratesUsage": "start"}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{"*ratesUsage": "start"}, }, } _, err := testCostEventStruct.Usage() @@ -1148,10 +1148,10 @@ func TestUsage(t *testing.T) { testCostEventStruct := &ArgsCostForEvent{ RateProfileIDs: []string{"123", "456", "789"}, CGREvent: &CGREvent{ - Tenant: "*req.CGRID", - ID: "", - Event: map[string]interface{}{}, - Opts: map[string]interface{}{"*ratesUsage": "2m10s"}, + Tenant: "*req.CGRID", + ID: "", + Event: map[string]interface{}{}, + APIOpts: map[string]interface{}{"*ratesUsage": "2m10s"}, }, } diff --git a/utils/cgrevent.go b/utils/cgrevent.go index ac25f8c32..e45e6f98d 100644 --- a/utils/cgrevent.go +++ b/utils/cgrevent.go @@ -24,11 +24,11 @@ import ( // CGREvent is a generic event processed by CGR services type CGREvent struct { - Tenant string - ID string - Time *time.Time // event time - Event map[string]interface{} - Opts map[string]interface{} + Tenant string + ID string + Time *time.Time // event time + Event map[string]interface{} + APIOpts map[string]interface{} cache map[string]interface{} } @@ -58,7 +58,7 @@ func (ev *CGREvent) FieldAsString(fldName string) (val string, err error) { // OptAsString returns an option as string func (ev *CGREvent) OptAsString(optName string) (val string, err error) { - iface, has := ev.Opts[optName] + iface, has := ev.APIOpts[optName] if !has { return "", ErrNotFound } @@ -67,7 +67,7 @@ func (ev *CGREvent) OptAsString(optName string) (val string, err error) { // OptAsInt64 returns an option as int64 func (ev *CGREvent) OptAsInt64(optName string) (int64, error) { - iface, has := ev.Opts[optName] + iface, has := ev.APIOpts[optName] if !has { return 0, ErrNotFound } @@ -156,10 +156,10 @@ func (ev *CGREvent) CacheRemove(key string) { func (ev *CGREvent) Clone() (clned *CGREvent) { clned = &CGREvent{ - Tenant: ev.Tenant, - ID: ev.ID, - Event: make(map[string]interface{}), // a bit forced but safe - Opts: make(map[string]interface{}), + Tenant: ev.Tenant, + ID: ev.ID, + Event: make(map[string]interface{}), // a bit forced but safe + APIOpts: make(map[string]interface{}), } if ev.Time != nil { clned.Time = TimePointer(*ev.Time) @@ -167,9 +167,9 @@ func (ev *CGREvent) Clone() (clned *CGREvent) { for k, v := range ev.Event { clned.Event[k] = v } - if ev.Opts != nil { - for opt, val := range ev.Opts { - clned.Opts[opt] = val + if ev.APIOpts != nil { + for opt, val := range ev.APIOpts { + clned.APIOpts[opt] = val } } return @@ -178,7 +178,7 @@ func (ev *CGREvent) Clone() (clned *CGREvent) { // AsDataProvider returns the CGREvent as MapStorage with *opts and *req paths set func (cgrEv *CGREvent) AsDataProvider() (ev DataProvider) { return MapStorage{ - MetaOpts: cgrEv.Opts, + MetaOpts: cgrEv.APIOpts, MetaReq: cgrEv.Event, } } diff --git a/utils/cgrevent_test.go b/utils/cgrevent_test.go index 4114ec652..6cbd9c919 100644 --- a/utils/cgrevent_test.go +++ b/utils/cgrevent_test.go @@ -272,7 +272,7 @@ func TestCGREventClone(t *testing.T) { "PddInterval": "1s", "Weight": 20.0, }, - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "testKey": 12, }, } @@ -455,7 +455,7 @@ func TestCGREventOptAsStringEmpty(t *testing.T) { func TestCGREventOptAsString(t *testing.T) { ev := &CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "testKey": 13, }, } @@ -506,7 +506,7 @@ func TestCGREventOptAsDuration(t *testing.T) { func TestCGREventAsDataProvider(t *testing.T) { ev := &CGREvent{ - Opts: map[string]interface{}{ + APIOpts: map[string]interface{}{ "testKey1": 13, "testKey2": "testString1", }, @@ -517,7 +517,7 @@ func TestCGREventAsDataProvider(t *testing.T) { } expected := MapStorage{ - MetaOpts: ev.Opts, + MetaOpts: ev.APIOpts, MetaReq: ev.Event, }