From ea112a66b3b84b5d1ec9cc2d5fc924b7807f1e63 Mon Sep 17 00:00:00 2001 From: adragusin Date: Thu, 9 Jul 2020 18:00:19 +0300 Subject: [PATCH] Updated ArgDispatcher with Opts --- cmd/cgr-loader/cgr-loader.go | 4 +- config/datadbcfg_test.go | 4 +- config/stordbcfg_test.go | 4 +- dispatchers/attributes.go | 12 +- dispatchers/attributes_it_test.go | 22 +-- dispatchers/caches.go | 60 +++--- dispatchers/caches_it_test.go | 22 +-- dispatchers/cdrs.go | 40 ++-- dispatchers/cdrs_it_test.go | 22 +-- dispatchers/chargers.go | 12 +- dispatchers/chargers_it_test.go | 12 +- dispatchers/config.go | 12 +- dispatchers/config_it_test.go | 2 +- dispatchers/core.go | 8 +- dispatchers/dispatchers.go | 10 +- dispatchers/guardian.go | 12 +- dispatchers/guardian_it_test.go | 6 +- dispatchers/rals.go | 8 +- dispatchers/rals_it_test.go | 4 +- dispatchers/rates.go | 4 +- dispatchers/rates_it_test.go | 2 +- dispatchers/resources.go | 24 +-- dispatchers/resources_it_test.go | 20 +- dispatchers/responder.go | 32 ++-- dispatchers/responder_it_test.go | 22 +-- dispatchers/routes.go | 12 +- dispatchers/routes_it_test.go | 14 +- dispatchers/scheduler.go | 16 +- dispatchers/scheduler_it_test.go | 2 +- dispatchers/servicemanager.go | 16 +- dispatchers/sessions.go | 92 +++++----- dispatchers/sessions_it_test.go | 42 ++--- dispatchers/stats.go | 24 +-- dispatchers/stats_it_test.go | 24 +-- dispatchers/thresholds.go | 20 +- dispatchers/thresholds_it_test.go | 14 +- engine/datamanager.go | 296 +++++++++++++++--------------- general_tests/cacherpl_it_test.go | 16 +- general_tests/session3_it_test.go | 2 +- sessions/sessions_test.go | 12 +- 40 files changed, 491 insertions(+), 491 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index a57098f88..8435e4013 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -349,8 +349,8 @@ func main() { } // reload cache if err = tpReader.ReloadCache(ldrCfg.GeneralCfg().DefaultCaching, *verbose, &utils.ArgDispatcher{ - APIKey: apiKey, - RouteID: routeID, + OptsAPIKey: apiKey, + OptsRouteID: routeID, }); err != nil { log.Fatal("Could not reload cache: ", err) } diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go index 3fa0961b2..8f03cc3e4 100644 --- a/config/datadbcfg_test.go +++ b/config/datadbcfg_test.go @@ -405,8 +405,8 @@ func TestDataDbCfgAsMapInterface(t *testing.T) { "remote_conns": []string{}, "replication_conns": []string{}, "items": map[string]interface{}{ - "*accounts": map[string]interface{}{"remote": true, "replicate": false, "APIKey": "", "RouteID": ""}, - "*reverse_destinations": map[string]interface{}{"remote": false, "replicate": false, "APIKey": "", "RouteID": ""}, + "*accounts": map[string]interface{}{"remote": true, "replicate": false, "*dispatcherApiKey": "", "*dispatcherRouteID": ""}, + "*reverse_destinations": map[string]interface{}{"remote": false, "replicate": false, "*dispatcherApiKey": "", "*dispatcherRouteID": ""}, }, } if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { diff --git a/config/stordbcfg_test.go b/config/stordbcfg_test.go index 6f26952c0..c98ae4f69 100644 --- a/config/stordbcfg_test.go +++ b/config/stordbcfg_test.go @@ -173,8 +173,8 @@ func TestStorDbCfgAsMapInterface(t *testing.T) { "query_timeout": "10s", "sslmode": "disable", "items": map[string]interface{}{ - "session_costs": map[string]interface{}{"remote": false, "replicate": false, "APIKey": "", "RouteID": ""}, - "cdrs": map[string]interface{}{"remote": false, "replicate": false, "APIKey": "", "RouteID": ""}, + "session_costs": map[string]interface{}{"remote": false, "replicate": false, "*dispatcherApiKey": "", "*dispatcherRouteID": ""}, + "cdrs": map[string]interface{}{"remote": false, "replicate": false, "*dispatcherApiKey": "", "*dispatcherRouteID": ""}, }, } if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { diff --git a/dispatchers/attributes.go b/dispatchers/attributes.go index ab925c7ae..ab0705d86 100755 --- a/dispatchers/attributes.go +++ b/dispatchers/attributes.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) AttributeSv1Ping(args *utils.CGREventWithArgDispatc return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.AttributeSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.Time); err != nil { + args.OptsAPIKey, args.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaAttributes, routeID, utils.AttributeSv1Ping, args, reply) @@ -59,13 +59,13 @@ func (dS *DispatcherService) AttributeSv1GetAttributeForEvent(args *engine.AttrA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.AttributeSv1GetAttributeForEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaAttributes, routeID, utils.AttributeSv1GetAttributeForEvent, args, reply) @@ -82,14 +82,14 @@ func (dS *DispatcherService) AttributeSv1ProcessEvent(args *engine.AttrArgsProce return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.AttributeSv1ProcessEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaAttributes, routeID, utils.AttributeSv1ProcessEvent, args, reply) diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index 70667a8ba..7a06eb869 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -104,7 +104,7 @@ func testDspAttrPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } if err := dispEngine.RPC.Call(utils.AttributeSv1Ping, &ev, &reply); err != nil { @@ -149,7 +149,7 @@ func testDspAttrPingFailoverNotFoundHost(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } @@ -190,7 +190,7 @@ func testDspAttrPingFailover2(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } allEngine.stopEngine(t) // stop the engine and the call should go to the second engine @@ -226,7 +226,7 @@ func testDspAttrGetAttrFailover(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } eAttrPrf := &engine.AttributeProfile{ @@ -317,7 +317,7 @@ func testDspAttrPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, }, &reply); err != nil { t.Error(err) @@ -374,7 +374,7 @@ func testDspAttrTestUnknownApiKey(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("1234"), + OptsAPIKey: utils.StringPointer("1234"), }, } var attrReply *engine.AttributeProfile @@ -395,7 +395,7 @@ func testDspAttrTestAuthKey(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } var attrReply *engine.AttributeProfile @@ -416,7 +416,7 @@ func testDspAttrTestAuthKey2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } eAttrPrf := &engine.AttributeProfile{ @@ -485,7 +485,7 @@ func testDspAttrTestAuthKey3(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } var attrReply *engine.AttributeProfile @@ -507,7 +507,7 @@ func testDspAttrGetAttrRoundRobin(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } eAttrPrf := &engine.AttributeProfile{ @@ -595,7 +595,7 @@ func testDspAttrGetAttrInternal(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("attr12345"), + OptsAPIKey: utils.StringPointer("attr12345"), }, } diff --git a/dispatchers/caches.go b/dispatchers/caches.go index ff9405adc..ad17d2e56 100644 --- a/dispatchers/caches.go +++ b/dispatchers/caches.go @@ -37,13 +37,13 @@ func (dS *DispatcherService) CacheSv1Ping(args *utils.CGREventWithArgDispatcher, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaCaches, routeID, utils.CacheSv1Ping, args, reply) @@ -61,13 +61,13 @@ func (dS *DispatcherService) CacheSv1GetItemIDs(args *utils.ArgsGetCacheItemIDsW return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1GetItemIDs, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1GetItemIDs, args, reply) @@ -85,13 +85,13 @@ func (dS *DispatcherService) CacheSv1HasItem(args *utils.ArgsGetCacheItemWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1HasItem, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1HasItem, args, reply) @@ -109,13 +109,13 @@ func (dS *DispatcherService) CacheSv1GetItemExpiryTime(args *utils.ArgsGetCacheI return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1GetItemExpiryTime, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1GetItemExpiryTime, args, reply) @@ -133,13 +133,13 @@ func (dS *DispatcherService) CacheSv1RemoveItem(args *utils.ArgsGetCacheItemWith return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1RemoveItem, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1RemoveItem, args, reply) @@ -157,13 +157,13 @@ func (dS *DispatcherService) CacheSv1Clear(args *utils.AttrCacheIDsWithArgDispat return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1Clear, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1Clear, args, reply) @@ -181,13 +181,13 @@ func (dS *DispatcherService) CacheSv1GetCacheStats(args *utils.AttrCacheIDsWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1GetCacheStats, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1GetCacheStats, args, reply) @@ -204,13 +204,13 @@ func (dS *DispatcherService) CacheSv1PrecacheStatus(args *utils.AttrCacheIDsWith return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1PrecacheStatus, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1PrecacheStatus, args, reply) @@ -228,13 +228,13 @@ func (dS *DispatcherService) CacheSv1HasGroup(args *utils.ArgsGetGroupWithArgDis return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1HasGroup, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1HasGroup, args, reply) @@ -252,13 +252,13 @@ func (dS *DispatcherService) CacheSv1GetGroupItemIDs(args *utils.ArgsGetGroupWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1GetGroupItemIDs, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1GetGroupItemIDs, args, reply) @@ -275,13 +275,13 @@ func (dS *DispatcherService) CacheSv1RemoveGroup(args *utils.ArgsGetGroupWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1RemoveGroup, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1RemoveGroup, args, reply) @@ -298,13 +298,13 @@ func (dS *DispatcherService) CacheSv1ReloadCache(args utils.AttrReloadCacheWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1ReloadCache, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1ReloadCache, args, reply) @@ -321,13 +321,13 @@ func (dS *DispatcherService) CacheSv1LoadCache(args utils.AttrReloadCacheWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1LoadCache, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1LoadCache, args, reply) @@ -344,13 +344,13 @@ func (dS *DispatcherService) CacheSv1ReplicateRemove(args *utils.ArgCacheReplica return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1ReplicateRemove, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1ReplicateRemove, args, reply) @@ -367,13 +367,13 @@ func (dS *DispatcherService) CacheSv1ReplicateSet(args *utils.ArgCacheReplicateS return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CacheSv1ReplicateSet, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCaches, routeID, utils.CacheSv1ReplicateSet, args, reply) diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index 88ed382e2..7b75a981d 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -85,7 +85,7 @@ func testDspChcPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, }, &reply); err != nil { t.Error(err) @@ -105,7 +105,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { expStats[utils.CacheRPCConnections].Items = 2 args := utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -120,7 +120,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { // Simple test that command is executed without errors if err := dispEngine.RPC.Call(utils.CacheSv1LoadCache, utils.AttrReloadCacheWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -232,7 +232,7 @@ func testDspChcPrecacheStatus(t *testing.T) { if err := dispEngine.RPC.Call(utils.CacheSv1PrecacheStatus, utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -252,7 +252,7 @@ func testDspChcGetItemIDs(t *testing.T) { CacheID: utils.CacheChargerProfiles, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -276,7 +276,7 @@ func testDspChcHasItem(t *testing.T) { ItemID: "cgrates.org:DEFAULT", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -298,7 +298,7 @@ func testDspChcGetItemExpiryTime(t *testing.T) { ItemID: "cgrates.org:DEFAULT", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -315,7 +315,7 @@ func testDspChcReloadCache(t *testing.T) { reply := "" if err := dispEngine.RPC.Call(utils.CacheSv1ReloadCache, &utils.AttrReloadCacheWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -335,7 +335,7 @@ func testDspChcRemoveItem(t *testing.T) { ItemID: "cgrates.org:DEFAULT", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -363,7 +363,7 @@ func testDspChcClear(t *testing.T) { reply := "" if err := dispEngine.RPC.Call(utils.CacheSv1Clear, utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -377,7 +377,7 @@ func testDspChcClear(t *testing.T) { expStats := engine.GetDefaultEmptyCacheStats() if err := dispEngine.RPC.Call(utils.CacheSv1GetCacheStats, utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chc12345"), + OptsAPIKey: utils.StringPointer("chc12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", diff --git a/dispatchers/cdrs.go b/dispatchers/cdrs.go index 8c206e370..11302634e 100644 --- a/dispatchers/cdrs.go +++ b/dispatchers/cdrs.go @@ -40,13 +40,13 @@ func (dS *DispatcherService) CDRsV1Ping(args *utils.CGREventWithArgDispatcher, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1Ping, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaCDRs, routeID, utils.CDRsV1Ping, args, reply) @@ -62,13 +62,13 @@ func (dS *DispatcherService) CDRsV1GetCDRs(args *utils.RPCCDRsFilterWithArgDispa return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1GetCDRs, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1GetCDRs, args, reply) @@ -84,13 +84,13 @@ func (dS *DispatcherService) CDRsV1GetCDRsCount(args *utils.RPCCDRsFilterWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1GetCDRsCount, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1GetCDRsCount, args, reply) @@ -106,13 +106,13 @@ func (dS *DispatcherService) CDRsV1StoreSessionCost(args *engine.AttrCDRSStoreSM return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1StoreSessionCost, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1StoreSessionCost, args, reply) @@ -128,13 +128,13 @@ func (dS *DispatcherService) CDRsV1RateCDRs(args *engine.ArgRateCDRs, reply *str return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1RateCDRs, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1RateCDRs, args, reply) @@ -150,13 +150,13 @@ func (dS *DispatcherService) CDRsV1ProcessExternalCDR(args *engine.ExternalCDRWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1ProcessExternalCDR, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1ProcessExternalCDR, args, reply) @@ -172,13 +172,13 @@ func (dS *DispatcherService) CDRsV1ProcessEvent(args *engine.ArgV1ProcessEvent, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1ProcessEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&args.CGREvent, utils.MetaCDRs, routeID, utils.CDRsV1ProcessEvent, args, reply) @@ -194,13 +194,13 @@ func (dS *DispatcherService) CDRsV1ProcessCDR(args *engine.CDRWithOpts, reply *s return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV1ProcessCDR, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV1ProcessCDR, args, reply) @@ -216,13 +216,13 @@ func (dS *DispatcherService) CDRsV2ProcessEvent(args *engine.ArgV1ProcessEvent, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV2ProcessEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&args.CGREvent, utils.MetaCDRs, routeID, utils.CDRsV2ProcessEvent, args, reply) @@ -238,13 +238,13 @@ func (dS *DispatcherService) CDRsV2StoreSessionCost(args *engine.ArgsV2CDRSStore return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CDRsV2StoreSessionCost, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCDRs, routeID, utils.CDRsV2StoreSessionCost, args, reply) diff --git a/dispatchers/cdrs_it_test.go b/dispatchers/cdrs_it_test.go index b8507ac0f..f11319882 100644 --- a/dispatchers/cdrs_it_test.go +++ b/dispatchers/cdrs_it_test.go @@ -108,7 +108,7 @@ func testDspCDRsPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, }, &reply); err != nil { t.Error(err) @@ -137,7 +137,7 @@ func testDspCDRsProcessEvent(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -160,7 +160,7 @@ func testDspCDRsCountCDR(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -182,7 +182,7 @@ func testDspCDRsGetCDR(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -203,7 +203,7 @@ func testDspCDRsGetCDRWithoutTenant(t *testing.T) { RunIDs: []string{utils.MetaDefault}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -232,7 +232,7 @@ func testDspCDRsProcessCDR(t *testing.T) { Usage: time.Duration(2) * time.Minute, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } if err := dispEngine.RPC.Call(utils.CDRsV1ProcessCDR, args, &reply); err != nil { @@ -255,7 +255,7 @@ func testDspCDRsGetCDR2(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -288,7 +288,7 @@ func testDspCDRsProcessExternalCDR(t *testing.T) { ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } if err := dispEngine.RPC.Call(utils.CDRsV1ProcessExternalCDR, args, &reply); err != nil { @@ -311,7 +311,7 @@ func testDspCDRsGetCDR3(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrs12345"), + OptsAPIKey: utils.StringPointer("cdrs12345"), }, } @@ -343,7 +343,7 @@ func testDspCDRsV2ProcessEvent(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrsv212345"), + OptsAPIKey: utils.StringPointer("cdrsv212345"), }, } @@ -381,7 +381,7 @@ func testDspCDRsV2StoreSessionCost(t *testing.T) { CostDetails: engine.NewEventCostFromCallCost(cc, "testDspCDRsV2StoreSessionCost", utils.MetaDefault), }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cdrsv212345"), + OptsAPIKey: utils.StringPointer("cdrsv212345"), }, } diff --git a/dispatchers/chargers.go b/dispatchers/chargers.go index b764ce453..5cdeffdc3 100755 --- a/dispatchers/chargers.go +++ b/dispatchers/chargers.go @@ -33,13 +33,13 @@ func (dS *DispatcherService) ChargerSv1Ping(args *utils.CGREventWithArgDispatche return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ChargerSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.Time); err != nil { + args.OptsAPIKey, args.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaChargers, routeID, utils.ChargerSv1Ping, args, reply) @@ -56,13 +56,13 @@ func (dS *DispatcherService) ChargerSv1GetChargersForEvent(args *utils.CGREventW return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ChargerSv1GetChargersForEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaChargers, routeID, utils.ChargerSv1GetChargersForEvent, args, reply) @@ -79,13 +79,13 @@ func (dS *DispatcherService) ChargerSv1ProcessEvent(args *utils.CGREventWithOpts return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ChargerSv1ProcessEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaChargers, routeID, utils.ChargerSv1ProcessEvent, args, reply) diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index e44f49c6d..4d679fa75 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -79,7 +79,7 @@ func testDspCppPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chrg12345"), + OptsAPIKey: utils.StringPointer("chrg12345"), }, } if err := dispEngine.RPC.Call(utils.ChargerSv1Ping, &ev, &reply); err != nil { @@ -112,7 +112,7 @@ func testDspCppGetChtgFailover(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chrg12345"), + OptsAPIKey: utils.StringPointer("chrg12345"), }, } eChargers := &engine.ChargerProfiles{ @@ -176,7 +176,7 @@ func testDspCppPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chrg12345"), + OptsAPIKey: utils.StringPointer("chrg12345"), }, }, &reply); err != nil { t.Error(err) @@ -195,7 +195,7 @@ func testDspCppTestAuthKey(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } var reply *engine.ChargerProfiles @@ -215,7 +215,7 @@ func testDspCppTestAuthKey2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chrg12345"), + OptsAPIKey: utils.StringPointer("chrg12345"), }, } eChargers := &engine.ChargerProfiles{ @@ -264,7 +264,7 @@ func testDspCppGetChtgRoundRobin(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("chrg12345"), + OptsAPIKey: utils.StringPointer("chrg12345"), }, } eChargers := &engine.ChargerProfiles{ diff --git a/dispatchers/config.go b/dispatchers/config.go index 498c59e04..233afc92d 100644 --- a/dispatchers/config.go +++ b/dispatchers/config.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) ConfigSv1GetJSONSection(args *config.StringWithArgD return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ConfigSv1GetJSONSection, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaConfig, routeID, utils.ConfigSv1GetJSONSection, args, reply) @@ -57,13 +57,13 @@ func (dS *DispatcherService) ConfigSv1ReloadConfigFromPath(args *config.ConfigRe return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ConfigSv1ReloadConfigFromPath, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaConfig, routeID, utils.ConfigSv1ReloadConfigFromPath, args, reply) @@ -79,13 +79,13 @@ func (dS *DispatcherService) ConfigSv1ReloadConfigFromJSON(args *config.JSONRelo return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ConfigSv1ReloadConfigFromJSON, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaConfig, routeID, utils.ConfigSv1ReloadConfigFromJSON, args, reply) diff --git a/dispatchers/config_it_test.go b/dispatchers/config_it_test.go index 9625a713c..88bca5490 100644 --- a/dispatchers/config_it_test.go +++ b/dispatchers/config_it_test.go @@ -74,7 +74,7 @@ func testDspConfigSv1GetJSONSection(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("cfg12345"), + OptsAPIKey: utils.StringPointer("cfg12345"), }, Section: "listen", }, &reply); err != nil { diff --git a/dispatchers/core.go b/dispatchers/core.go index 0fee1c3a9..89319cc8d 100644 --- a/dispatchers/core.go +++ b/dispatchers/core.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) CoreSv1Status(args *utils.TenantWithArgDispatcher, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CoreSv1Status, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaCore, routeID, utils.CoreSv1Status, args, reply) @@ -57,13 +57,13 @@ func (dS *DispatcherService) CoreSv1Ping(args *utils.CGREventWithArgDispatcher, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.CoreSv1Ping, tnt, - args.APIKey, args.Time); err != nil { + args.OptsAPIKey, args.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaCore, routeID, utils.CoreSv1Ping, args, reply) diff --git a/dispatchers/dispatchers.go b/dispatchers/dispatchers.go index 4ab28a931..f17963448 100755 --- a/dispatchers/dispatchers.go +++ b/dispatchers/dispatchers.go @@ -212,7 +212,7 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame apiKeyIface, hasApiKey := parameters[utils.APIKey] if hasApiKey && apiKeyIface != nil { argD = &utils.ArgDispatcher{ - APIKey: utils.StringPointer(apiKeyIface.(string)), + OptsAPIKey: utils.StringPointer(apiKeyIface.(string)), } } //check if we have RouteID in event and in case it has add it in ArgDispatcher @@ -220,10 +220,10 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame if hasRouteID && routeIDIface != nil { if !hasApiKey || apiKeyIface == nil { //in case we don't have APIKey, but we have RouteID we need to initialize the struct argD = &utils.ArgDispatcher{ - RouteID: utils.StringPointer(routeIDIface.(string)), + OptsRouteID: utils.StringPointer(routeIDIface.(string)), } } else { - argD.RouteID = utils.StringPointer(routeIDIface.(string)) + argD.OptsRouteID = utils.StringPointer(routeIDIface.(string)) } } @@ -234,7 +234,7 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame } if err = dS.authorize(args.Method, tenant, - argD.APIKey, utils.TimePointer(time.Now())); err != nil { + argD.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } @@ -281,7 +281,7 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame var routeID *string if argD != nil { - routeID = argD.RouteID + routeID = argD.OptsRouteID } if err := dS.Dispatch(&utils.CGREvent{Tenant: tenant, Event: parameters}, utils.MetaApier, routeID, args.Method, realArgs, realReply); err != nil { diff --git a/dispatchers/guardian.go b/dispatchers/guardian.go index 2af93da1b..d0c902095 100644 --- a/dispatchers/guardian.go +++ b/dispatchers/guardian.go @@ -37,13 +37,13 @@ func (dS *DispatcherService) GuardianSv1Ping(args *utils.CGREventWithArgDispatch } if err = dS.authorize(utils.GuardianSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaGuardian, routeID, utils.GuardianSv1Ping, args, reply) @@ -61,13 +61,13 @@ func (dS *DispatcherService) GuardianSv1RemoteLock(args AttrRemoteLockWithApiKey return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.GuardianSv1RemoteLock, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaGuardian, routeID, utils.GuardianSv1RemoteLock, args, reply) @@ -85,13 +85,13 @@ func (dS *DispatcherService) GuardianSv1RemoteUnlock(args AttrRemoteUnlockWithAp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.GuardianSv1RemoteUnlock, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaGuardian, routeID, utils.GuardianSv1RemoteUnlock, args, reply) diff --git a/dispatchers/guardian_it_test.go b/dispatchers/guardian_it_test.go index 1322cbca9..acb2ae2f7 100644 --- a/dispatchers/guardian_it_test.go +++ b/dispatchers/guardian_it_test.go @@ -72,7 +72,7 @@ func testDspGrdPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("grd12345"), + OptsAPIKey: utils.StringPointer("grd12345"), }, }, &reply); err != nil { t.Error(err) @@ -95,7 +95,7 @@ func testDspGrdLock(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("grd12345"), + OptsAPIKey: utils.StringPointer("grd12345"), }, }, &reply); err != nil { t.Error(err) @@ -108,7 +108,7 @@ func testDspGrdLock(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("grd12345"), + OptsAPIKey: utils.StringPointer("grd12345"), }, }, &unlockReply); err != nil { t.Error(err) diff --git a/dispatchers/rals.go b/dispatchers/rals.go index cd42495f6..d5b457ca3 100644 --- a/dispatchers/rals.go +++ b/dispatchers/rals.go @@ -34,13 +34,13 @@ func (dS *DispatcherService) RALsV1Ping(args *utils.CGREventWithArgDispatcher, r return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.RALsV1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaRALs, routeID, utils.RALsV1Ping, args, rpl) @@ -54,13 +54,13 @@ func (dS *DispatcherService) RALsV1GetRatingPlansCost(args *utils.RatingPlanCost } if err = dS.authorize(utils.RALsV1GetRatingPlansCost, tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tenant}, utils.MetaRALs, routeID, utils.RALsV1GetRatingPlansCost, args, rpl) diff --git a/dispatchers/rals_it_test.go b/dispatchers/rals_it_test.go index 9bfcf6244..8cfbfcab0 100644 --- a/dispatchers/rals_it_test.go +++ b/dispatchers/rals_it_test.go @@ -71,7 +71,7 @@ func testDspRALsPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rals12345"), + OptsAPIKey: utils.StringPointer("rals12345"), }, }, &reply); err != nil { t.Error(err) @@ -87,7 +87,7 @@ func testDspRALsGetRatingPlanCost(t *testing.T) { SetupTime: utils.META_NOW, Usage: "1h", ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rals12345"), + OptsAPIKey: utils.StringPointer("rals12345"), }, } var reply RatingPlanCost diff --git a/dispatchers/rates.go b/dispatchers/rates.go index 99a8103ea..56ecb39c2 100644 --- a/dispatchers/rates.go +++ b/dispatchers/rates.go @@ -30,13 +30,13 @@ func (dS *DispatcherService) RateSv1Ping(args *utils.CGREventWithArgDispatcher, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.RateSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.RateS, routeID, utils.RateSv1Ping, args, rpl) diff --git a/dispatchers/rates_it_test.go b/dispatchers/rates_it_test.go index f862451e0..18161d00a 100644 --- a/dispatchers/rates_it_test.go +++ b/dispatchers/rates_it_test.go @@ -69,7 +69,7 @@ func testDspRPrfPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rPrf12345"), + OptsAPIKey: utils.StringPointer("rPrf12345"), }, }, &reply); err != nil { t.Error(err) diff --git a/dispatchers/resources.go b/dispatchers/resources.go index 7062059e5..ea8815c5d 100755 --- a/dispatchers/resources.go +++ b/dispatchers/resources.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) ResourceSv1Ping(args *utils.CGREventWithArgDispatch return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResourceSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResources, routeID, utils.ResourceSv1Ping, args, rpl) @@ -58,14 +58,14 @@ func (dS *DispatcherService) ResourceSv1GetResourcesForEvent(args utils.ArgRSv1R return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResourceSv1GetResourcesForEvent, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResources, routeID, utils.ResourceSv1GetResourcesForEvent, args, reply) @@ -82,14 +82,14 @@ func (dS *DispatcherService) ResourceSv1AuthorizeResources(args utils.ArgRSv1Res return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResourceSv1AuthorizeResources, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResources, routeID, utils.ResourceSv1AuthorizeResources, args, reply) @@ -106,14 +106,14 @@ func (dS *DispatcherService) ResourceSv1AllocateResources(args utils.ArgRSv1Reso return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResourceSv1AllocateResources, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResources, routeID, utils.ResourceSv1AllocateResources, args, reply) @@ -130,14 +130,14 @@ func (dS *DispatcherService) ResourceSv1ReleaseResources(args utils.ArgRSv1Resou return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResourceSv1ReleaseResources, tnt, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResources, routeID, utils.ResourceSv1ReleaseResources, args, reply) @@ -153,11 +153,11 @@ func (dS *DispatcherService) ResourceSv1GetResource(args *utils.TenantIDWithArgD } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ResourceSv1GetResource, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } - routeID := args.ArgDispatcher.RouteID + routeID := args.ArgDispatcher.OptsRouteID return dS.Dispatch(&utils.CGREvent{ Tenant: tnt, ID: args.ID, diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go index 9cfc7c10a..0a69719d7 100755 --- a/dispatchers/resources_it_test.go +++ b/dispatchers/resources_it_test.go @@ -76,7 +76,7 @@ func testDspResPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1Ping, &ev, &reply); err != nil { @@ -110,7 +110,7 @@ func testDspResPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, }, &reply); err != nil { t.Error(err) @@ -132,7 +132,7 @@ func testDspResTestAuthKey(t *testing.T) { }, UsageID: utils.UUIDSha1Prefix(), ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } @@ -155,7 +155,7 @@ func testDspResTestAuthKey2(t *testing.T) { }, UsageID: utils.UUIDSha1Prefix(), ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } eRs := &engine.Resources{ @@ -189,7 +189,7 @@ func testDspResTestAuthKey3(t *testing.T) { }, Units: 1, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AllocateResources, @@ -218,7 +218,7 @@ func testDspResTestAuthKey3(t *testing.T) { }, Units: 17, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, @@ -238,7 +238,7 @@ func testDspResTestAuthKey3(t *testing.T) { "Destination": "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1ReleaseResources, @@ -259,7 +259,7 @@ func testDspResTestAuthKey3(t *testing.T) { }, Units: 6, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1AuthorizeResources, &argsRU, &reply); err != nil { @@ -279,7 +279,7 @@ func testDspResTestAuthKey3(t *testing.T) { }, UsageID: "651a8db2-4f67-4cf8-b622-169e8a482e61", ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1GetResourcesForEvent, args, &rs); err != nil { @@ -305,7 +305,7 @@ func testDspResTestAuthKey3(t *testing.T) { argsGetResource := &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("res12345"), + OptsAPIKey: utils.StringPointer("res12345"), }, } if err := dispEngine.RPC.Call(utils.ResourceSv1GetResource, argsGetResource, &r); err != nil { diff --git a/dispatchers/responder.go b/dispatchers/responder.go index 057397b59..3e4417318 100644 --- a/dispatchers/responder.go +++ b/dispatchers/responder.go @@ -37,13 +37,13 @@ func (dS *DispatcherService) ResponderPing(args *utils.CGREventWithArgDispatcher return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderPing, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaResponder, routeID, utils.ResponderPing, args, reply) @@ -56,13 +56,13 @@ func (dS *DispatcherService) ResponderGetCost(args *engine.CallDescriptorWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderGetCost, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderGetCost, args, reply) @@ -75,13 +75,13 @@ func (dS *DispatcherService) ResponderDebit(args *engine.CallDescriptorWithArgDi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderDebit, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderDebit, args, reply) @@ -94,13 +94,13 @@ func (dS *DispatcherService) ResponderMaxDebit(args *engine.CallDescriptorWithAr return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderMaxDebit, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderMaxDebit, args, reply) @@ -113,13 +113,13 @@ func (dS *DispatcherService) ResponderRefundIncrements(args *engine.CallDescript return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderRefundIncrements, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderRefundIncrements, args, reply) @@ -132,13 +132,13 @@ func (dS *DispatcherService) ResponderRefundRounding(args *engine.CallDescriptor return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderRefundRounding, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderRefundRounding, args, reply) @@ -151,13 +151,13 @@ func (dS *DispatcherService) ResponderGetMaxSessionTime(args *engine.CallDescrip return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderGetMaxSessionTime, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.AsCGREvent(), utils.MetaResponder, routeID, utils.ResponderGetMaxSessionTime, args, reply) @@ -171,13 +171,13 @@ func (dS *DispatcherService) ResponderShutdown(args *utils.TenantWithArgDispatch return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ResponderShutdown, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaResponder, routeID, utils.ResponderShutdown, args, reply) diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 51422e00a..cf4c168c3 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -75,7 +75,7 @@ func testDspResponderStatus(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), + OptsAPIKey: utils.StringPointer("rsp12345"), }, } if err := dispEngine.RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { @@ -103,8 +103,8 @@ func getNodeWithRoute(route string, t *testing.T) string { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), - RouteID: &route, + OptsAPIKey: utils.StringPointer("rsp12345"), + OptsRouteID: &route, }, } ev := utils.TenantWithArgDispatcher{ @@ -112,8 +112,8 @@ func getNodeWithRoute(route string, t *testing.T) string { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), - RouteID: &route, + OptsAPIKey: utils.StringPointer("rsp12345"), + OptsRouteID: &route, }, } @@ -149,7 +149,7 @@ func testDspResponderShutdown(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), + OptsAPIKey: utils.StringPointer("rsp12345"), }, } if err := dispEngine.RPC.Call(utils.ResponderShutdown, ev, &reply); err != nil { @@ -181,7 +181,7 @@ func testDspResponderBroadcast(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), + OptsAPIKey: utils.StringPointer("rsp12345"), }, } if err := dispEngine.RPC.Call(utils.ResponderPing, pingEv, &pingReply); err != nil { @@ -218,8 +218,8 @@ func testDspResponderInternal(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), - RouteID: &route, + OptsAPIKey: utils.StringPointer("rsp12345"), + OptsRouteID: &route, }, } ev := utils.TenantWithArgDispatcher{ @@ -227,8 +227,8 @@ func testDspResponderInternal(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("rsp12345"), - RouteID: &route, + OptsAPIKey: utils.StringPointer("rsp12345"), + OptsRouteID: &route, }, } if err := dispEngine.RPC.Call(utils.CoreSv1Ping, pingEv, &pingReply); err != nil { diff --git a/dispatchers/routes.go b/dispatchers/routes.go index bede5b571..6102a55e8 100755 --- a/dispatchers/routes.go +++ b/dispatchers/routes.go @@ -34,13 +34,13 @@ func (dS *DispatcherService) RouteSv1Ping(args *utils.CGREventWithArgDispatcher, } if err = dS.authorize(utils.RouteSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaRoutes, routeID, utils.RouteSv1Ping, args, reply) @@ -55,13 +55,13 @@ func (dS *DispatcherService) RouteSv1GetRoutes(args *engine.ArgsGetRoutes, } if err = dS.authorize(utils.RouteSv1GetRoutes, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaRoutes, routeID, utils.RouteSv1GetRoutes, args, reply) @@ -76,13 +76,13 @@ func (dS *DispatcherService) RouteSv1GetRouteProfilesForEvent(args *utils.CGREve } if err = dS.authorize(utils.RouteSv1GetRouteProfilesForEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaRoutes, routeID, utils.RouteSv1GetRouteProfilesForEvent, args, reply) diff --git a/dispatchers/routes_it_test.go b/dispatchers/routes_it_test.go index 5efe86249..f07f7b3f0 100755 --- a/dispatchers/routes_it_test.go +++ b/dispatchers/routes_it_test.go @@ -80,7 +80,7 @@ func testDspSupPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, }, &reply); err != nil { t.Error(err) @@ -101,7 +101,7 @@ func testDspSupPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, } if err := dispEngine.RPC.Call(utils.RouteSv1Ping, &ev, &reply); err != nil { @@ -179,7 +179,7 @@ func testDspSupGetSupFailover(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, } if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes, @@ -213,7 +213,7 @@ func testDspSupTestAuthKey(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes, @@ -263,7 +263,7 @@ func testDspSupTestAuthKey2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, } if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes, @@ -330,7 +330,7 @@ func testDspSupGetSupRoundRobin(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, } if err := dispEngine.RPC.Call(utils.RouteSv1GetRoutes, @@ -361,7 +361,7 @@ func testDspSupGetSupplierForEvent(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sup12345"), + OptsAPIKey: utils.StringPointer("sup12345"), }, } expected := engine.RouteProfile{ diff --git a/dispatchers/scheduler.go b/dispatchers/scheduler.go index f27a1ce9f..cfbb90023 100644 --- a/dispatchers/scheduler.go +++ b/dispatchers/scheduler.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) SchedulerSv1Ping(args *utils.CGREventWithArgDispatc } if err = dS.authorize(utils.SchedulerSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaScheduler, routeID, utils.SchedulerSv1Ping, args, reply) @@ -55,13 +55,13 @@ func (dS *DispatcherService) SchedulerSv1Reload(args *utils.CGREventWithArgDispa } if err = dS.authorize(utils.SchedulerSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaScheduler, routeID, utils.SchedulerSv1Reload, args, reply) @@ -75,13 +75,13 @@ func (dS *DispatcherService) SchedulerSv1ExecuteActions(args *utils.AttrsExecute } if err = dS.authorize(utils.SchedulerSv1ExecuteActions, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: args.Tenant}, utils.MetaScheduler, routeID, utils.SchedulerSv1ExecuteActions, args, reply) @@ -95,13 +95,13 @@ func (dS *DispatcherService) SchedulerSv1ExecuteActionPlans(args *utils.AttrsExe } if err = dS.authorize(utils.SchedulerSv1ExecuteActionPlans, args.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: args.Tenant}, utils.MetaScheduler, routeID, utils.SchedulerSv1ExecuteActionPlans, args, reply) diff --git a/dispatchers/scheduler_it_test.go b/dispatchers/scheduler_it_test.go index dcc129618..30580e6a7 100644 --- a/dispatchers/scheduler_it_test.go +++ b/dispatchers/scheduler_it_test.go @@ -70,7 +70,7 @@ func testDspSchedPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("sched12345"), + OptsAPIKey: utils.StringPointer("sched12345"), }, }, &reply); err != nil { t.Error(err) diff --git a/dispatchers/servicemanager.go b/dispatchers/servicemanager.go index d48189b3f..828c94cd2 100644 --- a/dispatchers/servicemanager.go +++ b/dispatchers/servicemanager.go @@ -37,13 +37,13 @@ func (dS *DispatcherService) ServiceManagerV1Ping(args *utils.CGREventWithArgDis } if err = dS.authorize(utils.ServiceManagerV1Ping, args.Tenant, - args.APIKey, args.Time); err != nil { + args.OptsAPIKey, args.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaServiceManager, routeID, utils.ServiceManagerV1Ping, args, reply) @@ -60,13 +60,13 @@ func (dS *DispatcherService) ServiceManagerV1StartService(args ArgStartServiceWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ServiceManagerV1StartService, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaServiceManager, routeID, utils.ServiceManagerV1StartService, args, reply) @@ -83,13 +83,13 @@ func (dS *DispatcherService) ServiceManagerV1StopService(args ArgStartServiceWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ServiceManagerV1StopService, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaServiceManager, routeID, utils.ServiceManagerV1StopService, args, reply) @@ -106,13 +106,13 @@ func (dS *DispatcherService) ServiceManagerV1ServiceStatus(args ArgStartServiceW return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ServiceManagerV1ServiceStatus, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaServiceManager, routeID, utils.ServiceManagerV1ServiceStatus, args, reply) diff --git a/dispatchers/sessions.go b/dispatchers/sessions.go index 2ac7ab402..18c2a2bb7 100755 --- a/dispatchers/sessions.go +++ b/dispatchers/sessions.go @@ -33,13 +33,13 @@ func (dS *DispatcherService) SessionSv1Ping(args *utils.CGREventWithArgDispatche } if err = dS.authorize(utils.SessionSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1Ping, args, reply) @@ -54,13 +54,13 @@ func (dS *DispatcherService) SessionSv1AuthorizeEvent(args *sessions.V1Authorize } if err = dS.authorize(utils.SessionSv1AuthorizeEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1AuthorizeEvent, args, reply) @@ -75,13 +75,13 @@ func (dS *DispatcherService) SessionSv1AuthorizeEventWithDigest(args *sessions.V } if err = dS.authorize(utils.SessionSv1AuthorizeEventWithDigest, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1AuthorizeEventWithDigest, args, reply) @@ -96,13 +96,13 @@ func (dS *DispatcherService) SessionSv1InitiateSession(args *sessions.V1InitSess } if err = dS.authorize(utils.SessionSv1InitiateSession, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1InitiateSession, args, reply) @@ -117,13 +117,13 @@ func (dS *DispatcherService) SessionSv1InitiateSessionWithDigest(args *sessions. } if err = dS.authorize(utils.SessionSv1InitiateSessionWithDigest, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1InitiateSessionWithDigest, args, reply) @@ -138,13 +138,13 @@ func (dS *DispatcherService) SessionSv1UpdateSession(args *sessions.V1UpdateSess } if err = dS.authorize(utils.SessionSv1UpdateSession, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1UpdateSession, args, reply) @@ -161,13 +161,13 @@ func (dS *DispatcherService) SessionSv1SyncSessions(args *utils.TenantWithArgDis return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1SyncSessions, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1SyncSessions, args, reply) @@ -182,13 +182,13 @@ func (dS *DispatcherService) SessionSv1TerminateSession(args *sessions.V1Termina } if err = dS.authorize(utils.SessionSv1TerminateSession, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1TerminateSession, args, reply) @@ -203,13 +203,13 @@ func (dS *DispatcherService) SessionSv1ProcessCDR(args *utils.CGREventWithArgDis } if err = dS.authorize(utils.SessionSv1ProcessCDR, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1ProcessCDR, args, reply) @@ -224,13 +224,13 @@ func (dS *DispatcherService) SessionSv1ProcessMessage(args *sessions.V1ProcessMe } if err = dS.authorize(utils.SessionSv1ProcessMessage, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1ProcessMessage, args, reply) @@ -245,13 +245,13 @@ func (dS *DispatcherService) SessionSv1ProcessEvent(args *sessions.V1ProcessEven } if err = dS.authorize(utils.SessionSv1ProcessEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1ProcessEvent, args, reply) @@ -266,13 +266,13 @@ func (dS *DispatcherService) SessionSv1GetCost(args *sessions.V1ProcessEventArgs } if err = dS.authorize(utils.SessionSv1GetCost, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaSessionS, routeID, utils.SessionSv1GetCost, args, reply) @@ -289,13 +289,13 @@ func (dS *DispatcherService) SessionSv1GetActiveSessions(args *utils.SessionFilt return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1GetActiveSessions, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1GetActiveSessions, args, reply) @@ -312,13 +312,13 @@ func (dS *DispatcherService) SessionSv1GetActiveSessionsCount(args *utils.Sessio return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1GetActiveSessionsCount, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1GetActiveSessionsCount, args, reply) @@ -335,13 +335,13 @@ func (dS *DispatcherService) SessionSv1ForceDisconnect(args *utils.SessionFilter return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1ForceDisconnect, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1ForceDisconnect, args, reply) @@ -358,13 +358,13 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessions(args *utils.SessionFil return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1GetPassiveSessions, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1GetPassiveSessions, args, reply) @@ -381,13 +381,13 @@ func (dS *DispatcherService) SessionSv1GetPassiveSessionsCount(args *utils.Sessi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1GetPassiveSessionsCount, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1GetPassiveSessionsCount, args, reply) @@ -404,13 +404,13 @@ func (dS *DispatcherService) SessionSv1ReplicateSessions(args ArgsReplicateSessi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1ReplicateSessions, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1ReplicateSessions, args, reply) @@ -427,13 +427,13 @@ func (dS *DispatcherService) SessionSv1SetPassiveSession(args *sessions.Session, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1SetPassiveSession, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1SetPassiveSession, args, reply) @@ -449,13 +449,13 @@ func (dS *DispatcherService) SessionSv1ActivateSessions(args *utils.SessionIDsWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1ActivateSessions, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1ActivateSessions, args, reply) @@ -471,13 +471,13 @@ func (dS *DispatcherService) SessionSv1DeactivateSessions(args *utils.SessionIDs return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1DeactivateSessions, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1DeactivateSessions, args, reply) @@ -490,13 +490,13 @@ func (dS *DispatcherService) SessionSv1STIRAuthenticate(args *sessions.V1STIRAut return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1STIRAuthenticate, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1STIRAuthenticate, args, reply) @@ -509,13 +509,13 @@ func (dS *DispatcherService) SessionSv1STIRIdentity(args *sessions.V1STIRIdentit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.SessionSv1STIRIdentity, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaSessionS, routeID, utils.SessionSv1STIRIdentity, args, reply) diff --git a/dispatchers/sessions_it_test.go b/dispatchers/sessions_it_test.go index 303e9c94b..fb989bfcd 100755 --- a/dispatchers/sessions_it_test.go +++ b/dispatchers/sessions_it_test.go @@ -143,7 +143,7 @@ func testDspSessionPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, }, &reply); err != nil { t.Error(err) @@ -164,7 +164,7 @@ func testDspSessionPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } if err := dispEngine.RPC.Call(utils.SessionSv1Ping, &ev, &reply); err != nil { @@ -209,7 +209,7 @@ func testDspSessionTestAuthKey(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } var rply sessions.V1AuthorizeReplyWithDigest @@ -243,7 +243,7 @@ func testDspSessionAuthorize(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1AuthorizeReplyWithDigest @@ -295,7 +295,7 @@ func testDspSessionInit(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1InitReplyWithDigest @@ -314,7 +314,7 @@ func testDspSessionInit(t *testing.T) { func testDspGetSessions(t *testing.T) { filtr := utils.SessionFilter{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, Tenant: "cgrates.org", Filters: []string{}, @@ -370,7 +370,7 @@ func testDspSessionUpdate(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1UpdateSessionReply @@ -437,7 +437,7 @@ func testDspSessionUpdate2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1UpdateSessionReply @@ -509,7 +509,7 @@ func testDspSessionTerminate(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply string @@ -541,7 +541,7 @@ func testDspSessionProcessCDR(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } @@ -580,7 +580,7 @@ func testDspSessionProcessEvent(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1ProcessMessageReply @@ -653,7 +653,7 @@ func testDspSessionProcessEvent2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("pse12345"), + OptsAPIKey: utils.StringPointer("pse12345"), }, } var rply sessions.V1ProcessMessageReply @@ -719,7 +719,7 @@ func testDspSessionReplicate(t *testing.T) { if err := dispEngine.RPC.Call(utils.SessionSv1ReplicateSessions, &ArgsReplicateSessionsWithApiKey{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, TenantArg: utils.TenantArg{ Tenant: "cgrates.org", @@ -751,7 +751,7 @@ func testDspSessionPassive(t *testing.T) { var repl int filtr := utils.SessionFilter{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, Tenant: "cgrates.org", Filters: []string{}, @@ -820,7 +820,7 @@ func testDspSessionPassive(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, }, &reply); err != nil { t.Fatal(err) @@ -853,7 +853,7 @@ func testDspSessionForceDisconect(t *testing.T) { var repl int filtr := utils.SessionFilter{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, Tenant: "cgrates.org", Filters: []string{}, @@ -921,7 +921,7 @@ func testDspSessionProcessEvent3(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("pse12345"), + OptsAPIKey: utils.StringPointer("pse12345"), }, } var rply sessions.V1ProcessEventReply @@ -934,7 +934,7 @@ func testDspSessionProcessEvent3(t *testing.T) { if err := dispEngine.RPC.Call(utils.SessionSv1GetActiveSessionsCount, utils.SessionFilter{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, Tenant: "cgrates.org", Filters: []string{}, @@ -964,7 +964,7 @@ func testDspSessionGetCost(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } @@ -994,7 +994,7 @@ func testDspSessionSTIRAuthenticate(t *testing.T) { Identity: "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDAxIn0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken", OriginatorTn: "1001", ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, }, &rply); err != nil { t.Fatal(err) @@ -1016,7 +1016,7 @@ func testDspSessionSTIRIdentity(t *testing.T) { PrivateKeyPath: "/usr/share/cgrates/stir/stir_privatekey.pem", OverwriteIAT: true, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply string diff --git a/dispatchers/stats.go b/dispatchers/stats.go index 9c1df6dd4..de76ba9fd 100755 --- a/dispatchers/stats.go +++ b/dispatchers/stats.go @@ -36,13 +36,13 @@ func (dS *DispatcherService) StatSv1Ping(args *utils.CGREventWithArgDispatcher, } if err = dS.authorize(utils.StatSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaStats, routeID, utils.StatSv1Ping, args, reply) @@ -57,13 +57,13 @@ func (dS *DispatcherService) StatSv1GetStatQueuesForEvent(args *engine.StatsArgs } if err = dS.authorize(utils.StatSv1GetStatQueuesForEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaStats, routeID, utils.StatSv1GetStatQueuesForEvent, args, reply) @@ -78,13 +78,13 @@ func (dS *DispatcherService) StatSv1GetQueueStringMetrics(args *utils.TenantIDWi } if err = dS.authorize(utils.StatSv1GetQueueStringMetrics, args.TenantID.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{ Tenant: args.Tenant, @@ -102,13 +102,13 @@ func (dS *DispatcherService) StatSv1ProcessEvent(args *engine.StatsArgsProcessEv } if err = dS.authorize(utils.StatSv1ProcessEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaStats, routeID, utils.StatSv1ProcessEvent, args, reply) @@ -122,13 +122,13 @@ func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWit } if err = dS.authorize(utils.StatSv1GetQueueFloatMetrics, args.TenantID.Tenant, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{ Tenant: args.Tenant, @@ -148,13 +148,13 @@ func (dS *DispatcherService) StatSv1GetQueueIDs(args *utils.TenantWithArgDispatc return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.StatSv1GetQueueIDs, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaStats, routeID, utils.StatSv1GetQueueIDs, diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go index 10b5e0f00..a569e9073 100755 --- a/dispatchers/stats_it_test.go +++ b/dispatchers/stats_it_test.go @@ -79,7 +79,7 @@ func testDspStsPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, } if err := dispEngine.RPC.Call(utils.StatSv1Ping, &ev, &reply); err != nil { @@ -119,7 +119,7 @@ func testDspStsGetStatFailover(t *testing.T) { utils.Destination: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, } if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil { @@ -130,7 +130,7 @@ func testDspStsGetStatFailover(t *testing.T) { args2 := utils.TenantIDWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, TenantID: &utils.TenantID{ Tenant: "cgrates.org", @@ -165,7 +165,7 @@ func testDspStsPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, }, &reply); err != nil { t.Error(err) @@ -188,7 +188,7 @@ func testDspStsTestAuthKey(t *testing.T) { utils.PDD: time.Duration(12 * time.Second)}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, @@ -198,7 +198,7 @@ func testDspStsTestAuthKey(t *testing.T) { args2 := utils.TenantIDWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, TenantID: &utils.TenantID{ Tenant: "cgrates.org", @@ -230,7 +230,7 @@ func testDspStsTestAuthKey2(t *testing.T) { utils.Destination: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, } if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil { @@ -241,7 +241,7 @@ func testDspStsTestAuthKey2(t *testing.T) { args2 := utils.TenantIDWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, TenantID: &utils.TenantID{ Tenant: "cgrates.org", @@ -274,7 +274,7 @@ func testDspStsTestAuthKey2(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, } if err := dispEngine.RPC.Call(utils.StatSv1ProcessEvent, args, &reply); err != nil { @@ -301,7 +301,7 @@ func testDspStsTestAuthKey3(t *testing.T) { args2 := utils.TenantIDWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, TenantID: &utils.TenantID{ Tenant: "cgrates.org", @@ -327,7 +327,7 @@ func testDspStsTestAuthKey3(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, }, &reply); err != nil { t.Error(err) @@ -354,7 +354,7 @@ func testDspStsTestAuthKey3(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("stat12345"), + OptsAPIKey: utils.StringPointer("stat12345"), }, }, &reply); err != nil { t.Error(err) diff --git a/dispatchers/thresholds.go b/dispatchers/thresholds.go index 495bdc5ad..d20317d6d 100755 --- a/dispatchers/thresholds.go +++ b/dispatchers/thresholds.go @@ -36,13 +36,13 @@ func (dS *DispatcherService) ThresholdSv1Ping(args *utils.CGREventWithArgDispatc if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1Ping, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaThresholds, routeID, utils.ThresholdSv1Ping, args, reply) @@ -57,13 +57,13 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdsForEvent(args *engine.Args if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1GetThresholdsForEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaThresholds, routeID, utils.ThresholdSv1GetThresholdsForEvent, args, t) @@ -78,13 +78,13 @@ func (dS *DispatcherService) ThresholdSv1ProcessEvent(args *engine.ArgsProcessEv if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1ProcessEvent, args.CGREvent.Tenant, - args.APIKey, args.CGREvent.Time); err != nil { + args.OptsAPIKey, args.CGREvent.Time); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(args.CGREvent, utils.MetaThresholds, routeID, utils.ThresholdSv1ProcessEvent, args, tIDs) @@ -100,13 +100,13 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithA } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1GetThresholdIDs, - tnt, args.APIKey, utils.TimePointer(time.Now())); err != nil { + tnt, args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{Tenant: tnt}, utils.MetaThresholds, routeID, utils.ThresholdSv1GetThresholdIDs, args, tIDs) @@ -122,13 +122,13 @@ func (dS *DispatcherService) ThresholdSv1GetThreshold(args *utils.TenantIDWithAr } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ThresholdSv1GetThreshold, tnt, - args.APIKey, utils.TimePointer(time.Now())); err != nil { + args.OptsAPIKey, utils.TimePointer(time.Now())); err != nil { return } } var routeID *string if args.ArgDispatcher != nil { - routeID = args.ArgDispatcher.RouteID + routeID = args.ArgDispatcher.OptsRouteID } return dS.Dispatch(&utils.CGREvent{ Tenant: tnt, diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go index 6d1cd00e8..37991a6ad 100755 --- a/dispatchers/thresholds_it_test.go +++ b/dispatchers/thresholds_it_test.go @@ -79,7 +79,7 @@ func testDspThPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, } if err := dispEngine.RPC.Call(utils.ThresholdSv1Ping, &ev, &reply); err != nil { @@ -115,7 +115,7 @@ func testDspThProcessEventFailover(t *testing.T) { utils.Account: "1001"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, } @@ -144,7 +144,7 @@ func testDspThPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, }, &reply); err != nil { t.Error(err) @@ -165,7 +165,7 @@ func testDspThTestAuthKey(t *testing.T) { utils.Account: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("12345"), + OptsAPIKey: utils.StringPointer("12345"), }, } @@ -193,7 +193,7 @@ func testDspThTestAuthKey2(t *testing.T) { utils.Account: "1002"}, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, } @@ -234,7 +234,7 @@ func testDspThTestAuthKey3(t *testing.T) { ID: "THD_ACNT_1002", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, }, &th); err != nil { t.Error(err) @@ -254,7 +254,7 @@ func testDspThTestAuthKey3(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("thr12345"), + OptsAPIKey: utils.StringPointer("thr12345"), }, }, &ids); err != nil { t.Fatal(err) diff --git a/engine/datamanager.go b/engine/datamanager.go index 405e1834b..15d350d48 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -363,8 +363,8 @@ func (dm *DataManager) SetDestination(dest *Destination, transactionID string) ( Destination: dest, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -388,8 +388,8 @@ func (dm *DataManager) RemoveDestination(destID string, transactionID string) (e Arg: destID, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -428,8 +428,8 @@ func (dm *DataManager) GetReverseDestination(prefix string, Arg: prefix, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &ids); err == nil { // need to discuss @@ -467,8 +467,8 @@ func (dm *DataManager) GetAccount(id string) (acc *Account, err error) { Arg: id, TenantArg: utils.TenantArg{Tenant: tenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &acc); err == nil { err = dm.dataDB.SetAccountDrv(acc) @@ -497,8 +497,8 @@ func (dm *DataManager) SetAccount(acc *Account) (err error) { &AccountWithArgDispatcher{ Account: acc, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -523,8 +523,8 @@ func (dm *DataManager) RemoveAccount(id string) (err error) { Arg: id, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -554,8 +554,8 @@ func (dm *DataManager) GetStatQueue(tenant, id string, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, sq); err == nil { var ssq *StoredStatQueue if dm.dataDB.GetStorageType() != utils.MetaInternal { @@ -612,8 +612,8 @@ func (dm *DataManager) SetStatQueue(sq *StatQueue) (err error) { &StoredStatQueueWithArgDispatcher{ StoredStatQueue: ssq, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -638,8 +638,8 @@ func (dm *DataManager) RemoveStatQueue(tenant, id string, transactionID string) &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -727,8 +727,8 @@ func (dm *DataManager) SetFilter(fltr *Filter, withIndex bool) (err error) { &FilterWithArgDispatcher{ Filter: fltr, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -775,8 +775,8 @@ func (dm *DataManager) RemoveFilter(tenant, id, transactionID string, withIndex &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -804,8 +804,8 @@ func (dm *DataManager) GetThreshold(tenant, id string, utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &th); err == nil { err = dm.dataDB.SetThresholdDrv(th) } @@ -845,8 +845,8 @@ func (dm *DataManager) SetThreshold(th *Threshold) (err error) { &ThresholdWithArgDispatcher{ Threshold: th, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -869,8 +869,8 @@ func (dm *DataManager) RemoveThreshold(tenant, id, transactionID string) (err er &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -899,8 +899,8 @@ func (dm *DataManager) GetThresholdProfile(tenant, id string, cacheRead, cacheWr &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &th); err == nil { err = dm.dataDB.SetThresholdProfileDrv(th) } @@ -955,8 +955,8 @@ func (dm *DataManager) SetThresholdProfile(th *ThresholdProfile, withIndex bool) &ThresholdProfileWithArgDispatcher{ ThresholdProfile: th, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID)}, + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID)}, }, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -996,8 +996,8 @@ func (dm *DataManager) RemoveThresholdProfile(tenant, id, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1026,8 +1026,8 @@ func (dm *DataManager) GetStatQueueProfile(tenant, id string, cacheRead, cacheWr &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &sqp); err == nil { err = dm.dataDB.SetStatQueueProfileDrv(sqp) } @@ -1082,8 +1082,8 @@ func (dm *DataManager) SetStatQueueProfile(sqp *StatQueueProfile, withIndex bool &StatQueueProfileWithArgDispatcher{ StatQueueProfile: sqp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1123,8 +1123,8 @@ func (dm *DataManager) RemoveStatQueueProfile(tenant, id, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1152,8 +1152,8 @@ func (dm *DataManager) GetTiming(id string, skipCache bool, Arg: id, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &t); err == nil { err = dm.dataDB.SetTimingDrv(t) @@ -1196,8 +1196,8 @@ func (dm *DataManager) SetTiming(t *utils.TPTiming) (err error) { &utils.TPTimingWithArgDispatcher{ TPTiming: t, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1249,8 +1249,8 @@ func (dm *DataManager) GetResource(tenant, id string, cacheRead, cacheWrite bool &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &rs); err == nil { err = dm.dataDB.SetResourceDrv(rs) } @@ -1291,8 +1291,8 @@ func (dm *DataManager) SetResource(rs *Resource) (err error) { &ResourceWithArgDispatcher{ Resource: rs, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1316,8 +1316,8 @@ func (dm *DataManager) RemoveResource(tenant, id, transactionID string) (err err &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1345,8 +1345,8 @@ func (dm *DataManager) GetResourceProfile(tenant, id string, cacheRead, cacheWri utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &rp); err == nil { err = dm.dataDB.SetResourceProfileDrv(rp) } @@ -1402,8 +1402,8 @@ func (dm *DataManager) SetResourceProfile(rp *ResourceProfile, withIndex bool) ( &ResourceProfileWithArgDispatcher{ ResourceProfile: rp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1442,8 +1442,8 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, w utils.ReplicatorSv1RemoveResourceProfile, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1471,8 +1471,8 @@ func (dm *DataManager) GetActionTriggers(id string, skipCache bool, Arg: id, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, attrs); err == nil { err = dm.dataDB.SetActionTriggersDrv(id, attrs) @@ -1516,8 +1516,8 @@ func (dm *DataManager) RemoveActionTriggers(id, transactionID string) (err error Arg: id, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1549,8 +1549,8 @@ func (dm *DataManager) SetActionTriggers(key string, attr ActionTriggers, &SetActionTriggersArgWithArgDispatcher{ Attrs: attr, Key: key, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID)}, + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID)}, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, }, &reply); err != nil { err = utils.CastRPCErr(err) @@ -1582,8 +1582,8 @@ func (dm *DataManager) GetSharedGroup(key string, skipCache bool, Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &sg); err == nil { err = dm.dataDB.SetSharedGroupDrv(sg) @@ -1628,8 +1628,8 @@ func (dm *DataManager) SetSharedGroup(sg *SharedGroup, SharedGroup: sg, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1658,8 +1658,8 @@ func (dm *DataManager) RemoveSharedGroup(id, transactionID string) (err error) { Arg: id, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1689,8 +1689,8 @@ func (dm *DataManager) GetActions(key string, skipCache bool, transactionID stri Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &as); err == nil { err = dm.dataDB.SetActionsDrv(key, as) @@ -1740,8 +1740,8 @@ func (dm *DataManager) SetActions(key string, as Actions, transactionID string) Key: key, Acs: as, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1769,8 +1769,8 @@ func (dm *DataManager) RemoveActions(key, transactionID string) (err error) { Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1788,8 +1788,8 @@ func (dm *DataManager) GetActionPlan(key string, skipCache bool, transactionID s Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &ats); err == nil { err = dm.dataDB.SetActionPlanDrv(key, ats, true, utils.NonTransactional) @@ -1829,8 +1829,8 @@ func (dm *DataManager) SetActionPlan(key string, ats *ActionPlan, Overwrite: overwrite, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1852,8 +1852,8 @@ func (dm *DataManager) GetAllActionPlans() (ats map[string]*ActionPlan, err erro Arg: utils.EmptyString, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &ats) } @@ -1880,8 +1880,8 @@ func (dm *DataManager) RemoveActionPlan(key string, transactionID string) (err e Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -1900,8 +1900,8 @@ func (dm *DataManager) GetAccountActionPlans(acntID string, Arg: acntID, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &apIDs); err == nil { err = dm.dataDB.SetAccountActionPlansDrv(acntID, apIDs, true) @@ -1940,8 +1940,8 @@ func (dm *DataManager) SetAccountActionPlans(acntID string, aPlIDs []string, ove Overwrite: overwrite, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -1974,8 +1974,8 @@ func (dm *DataManager) RemAccountActionPlans(acntID string, apIDs []string) (err AcntID: acntID, ApIDs: apIDs, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2004,8 +2004,8 @@ func (dm *DataManager) GetRatingPlan(key string, skipCache bool, Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &rp); err == nil { err = dm.dataDB.SetRatingPlanDrv(rp) @@ -2048,8 +2048,8 @@ func (dm *DataManager) SetRatingPlan(rp *RatingPlan, transactionID string) (err RatingPlan: rp, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2078,8 +2078,8 @@ func (dm *DataManager) RemoveRatingPlan(key string, transactionID string) (err e Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2111,8 +2111,8 @@ func (dm *DataManager) GetRatingProfile(key string, skipCache bool, Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &rpf); err == nil { err = dm.dataDB.SetRatingProfileDrv(rpf) @@ -2156,8 +2156,8 @@ func (dm *DataManager) SetRatingProfile(rpf *RatingProfile, RatingProfile: rpf, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2187,8 +2187,8 @@ func (dm *DataManager) RemoveRatingProfile(key string, Arg: key, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2224,8 +2224,8 @@ func (dm *DataManager) GetRouteProfile(tenant, id string, cacheRead, cacheWrite &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &rpp); err == nil { err = dm.dataDB.SetRouteProfileDrv(rpp) } @@ -2284,8 +2284,8 @@ func (dm *DataManager) SetRouteProfile(rpp *RouteProfile, withIndex bool) (err e &RouteProfileWithArgDispatcher{ RouteProfile: rpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2325,8 +2325,8 @@ func (dm *DataManager) RemoveRouteProfile(tenant, id, transactionID string, with &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2428,8 +2428,8 @@ func (dm *DataManager) SetAttributeProfile(ap *AttributeProfile, withIndex bool) &AttributeProfileWithArgDispatcher{ AttributeProfile: ap, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2471,8 +2471,8 @@ func (dm *DataManager) RemoveAttributeProfile(tenant, id string, transactionID s &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2501,8 +2501,8 @@ func (dm *DataManager) GetChargerProfile(tenant, id string, cacheRead, cacheWrit &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &cpp); err == nil { err = dm.dataDB.SetChargerProfileDrv(cpp) } @@ -2557,8 +2557,8 @@ func (dm *DataManager) SetChargerProfile(cpp *ChargerProfile, withIndex bool) (e &ChargerProfileWithArgDispatcher{ ChargerProfile: cpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2599,8 +2599,8 @@ func (dm *DataManager) RemoveChargerProfile(tenant, id string, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2629,8 +2629,8 @@ func (dm *DataManager) GetDispatcherProfile(tenant, id string, cacheRead, cacheW &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &dpp); err == nil { err = dm.dataDB.SetDispatcherProfileDrv(dpp) } @@ -2687,8 +2687,8 @@ func (dm *DataManager) SetDispatcherProfile(dpp *DispatcherProfile, withIndex bo &DispatcherProfileWithArgDispatcher{ DispatcherProfile: dpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2731,8 +2731,8 @@ func (dm *DataManager) RemoveDispatcherProfile(tenant, id string, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2761,8 +2761,8 @@ func (dm *DataManager) GetDispatcherHost(tenant, id string, cacheRead, cacheWrit &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &dH); err == nil { err = dm.dataDB.SetDispatcherHostDrv(dH) } @@ -2803,8 +2803,8 @@ func (dm *DataManager) SetDispatcherHost(dpp *DispatcherHost) (err error) { &DispatcherHostWithArgDispatcher{ DispatcherHost: dpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2836,8 +2836,8 @@ func (dm *DataManager) RemoveDispatcherHost(tenant, id string, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -2857,8 +2857,8 @@ func (dm *DataManager) GetItemLoadIDs(itemIDPrefix string, cacheWrite bool) (loa Arg: itemIDPrefix, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }, }, &loadIDs); err == nil { err = dm.dataDB.SetLoadIDsDrv(loadIDs) @@ -2905,8 +2905,8 @@ func (dm *DataManager) SetLoadIDs(loadIDs map[string]int64) (err error) { LoadIDs: loadIDs, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -2938,8 +2938,8 @@ func (dm *DataManager) GetRateProfile(tenant, id string, cacheRead, cacheWrite b &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &rpp); err == nil { err = dm.dataDB.SetRateProfileDrv(rpp) } @@ -3021,8 +3021,8 @@ func (dm *DataManager) SetRateProfile(rpp *RateProfile, withIndex bool) (err err &RateProfileWithArgDispatcher{ RateProfile: rpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -3066,8 +3066,8 @@ func (dm *DataManager) RemoveRateProfile(tenant, id string, &utils.TenantIDWithArgDispatcher{ TenantID: &utils.TenantID{Tenant: tenant, ID: id}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply) } return @@ -3118,8 +3118,8 @@ func (dm *DataManager) RemoveRateProfileRates(tenant, id string, rateIDs []strin &RateProfileWithArgDispatcher{ RateProfile: oldRpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -3164,8 +3164,8 @@ func (dm *DataManager) SetRateProfileRates(rpp *RateProfile, withIndex bool) (er &RateProfileWithArgDispatcher{ RateProfile: oldRpp, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID), + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID), }}, &reply); err != nil { err = utils.CastRPCErr(err) return @@ -3214,8 +3214,8 @@ func (dm *DataManager) GetIndexes(idxItmType, tntCtx, idxKey string, IdxKey: idxKey, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID)}, + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID)}, }, &indexes); err == nil { err = dm.dataDB.SetIndexesDrv(idxItmType, tntCtx, indexes, true, utils.NonTransactional) } @@ -3265,8 +3265,8 @@ func (dm *DataManager) SetIndexes(idxItmType, tntCtx string, Indexes: indexes, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID)}, + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID)}, }, &reply); err != nil { err = utils.CastRPCErr(err) } @@ -3292,8 +3292,8 @@ func (dm *DataManager) RemoveIndexes(idxItmType, tntCtx, idxKey string) (err err IdxKey: idxKey, TenantArg: utils.TenantArg{Tenant: config.CgrConfig().GeneralCfg().DefaultTenant}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer(itm.APIKey), - RouteID: utils.StringPointer(itm.RouteID)}, + OptsAPIKey: utils.StringPointer(itm.APIKey), + OptsRouteID: utils.StringPointer(itm.RouteID)}, }, &reply); err != nil { err = utils.CastRPCErr(err) } diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index d6b84d3dd..6394b3c82 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -312,7 +312,7 @@ func testCacheRplPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRoute123"), + OptsRouteID: utils.StringPointer("testRoute123"), }, } if err := dspEngine1RPC.Call(utils.CoreSv1Status, &ev, &reply); err != nil { @@ -327,7 +327,7 @@ func testCacheRplPing(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRoute123"), + OptsRouteID: utils.StringPointer("testRoute123"), }, }, &rpl); err != nil { t.Error(err) @@ -373,7 +373,7 @@ func testCacheRplCheckReplication(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRoute123"), + OptsRouteID: utils.StringPointer("testRoute123"), }, }, &rpl); err != nil { t.Error(err) @@ -407,7 +407,7 @@ func testCacheRplAACheckReplication(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRouteFromDispatcher2"), + OptsRouteID: utils.StringPointer("testRouteFromDispatcher2"), }, }, &rpl); err != nil { t.Error(err) @@ -420,7 +420,7 @@ func testCacheRplAACheckReplication(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRouteFromDispatcher1"), + OptsRouteID: utils.StringPointer("testRouteFromDispatcher1"), }, }, &rpl); err != nil { t.Error(err) @@ -487,7 +487,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRouteFromDispatcher1"), + OptsRouteID: utils.StringPointer("testRouteFromDispatcher1"), }, }, &rpl); err != nil { t.Error(err) @@ -508,7 +508,7 @@ func testCacheRplAACheckLoadReplication(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRouteFromDispatcher2"), + OptsRouteID: utils.StringPointer("testRouteFromDispatcher2"), }, }, &rpl); err != nil { t.Error(err) @@ -605,7 +605,7 @@ func testCacheRplCheckLoadReplication(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testRoute123"), + OptsRouteID: utils.StringPointer("testRoute123"), }, }, &rpl); err != nil { t.Error(err) diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index 03ee54bc7..2ac913d21 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -148,7 +148,7 @@ func testSes3ItProcessEvent(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("ses12345"), + OptsAPIKey: utils.StringPointer("ses12345"), }, } var rply sessions.V1ProcessMessageReply diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 894db2ecc..a8f380bdb 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -1494,8 +1494,8 @@ func TestSessionSNewV1AuthorizeArgsWithArgDispatcher(t *testing.T) { GetAttributes: true, CGREvent: cgrEv, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("testkey"), - RouteID: utils.StringPointer("testrouteid"), + OptsAPIKey: utils.StringPointer("testkey"), + OptsRouteID: utils.StringPointer("testrouteid"), }, ForceDuration: true, Opts: opts, @@ -1517,8 +1517,8 @@ func TestSessionSNewV1AuthorizeArgsWithArgDispatcher(t *testing.T) { RoutesMaxCost: utils.MetaRoutesEventCost, CGREvent: cgrEv, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("testkey"), - RouteID: utils.StringPointer("testrouteid"), + OptsAPIKey: utils.StringPointer("testkey"), + OptsRouteID: utils.StringPointer("testrouteid"), }, ForceDuration: true, Opts: opts, @@ -1547,7 +1547,7 @@ func TestSessionSNewV1AuthorizeArgsWithArgDispatcher2(t *testing.T) { GetAttributes: true, CGREvent: cgrEv, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testrouteid"), + OptsRouteID: utils.StringPointer("testrouteid"), }, ForceDuration: true, Opts: opts, @@ -1569,7 +1569,7 @@ func TestSessionSNewV1AuthorizeArgsWithArgDispatcher2(t *testing.T) { RoutesMaxCost: utils.MetaRoutesEventCost, CGREvent: cgrEv, ArgDispatcher: &utils.ArgDispatcher{ - RouteID: utils.StringPointer("testrouteid"), + OptsRouteID: utils.StringPointer("testrouteid"), }, ForceDuration: true, Opts: opts,