diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index 8e99e4ac8..e457725ca 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -903,7 +903,7 @@ func testSSv1ItDynamicDebit(t *testing.T) { InitSession: true, GetAttributes: true, Opts: map[string]interface{}{ - utils.DebitInterval: 30 * time.Millisecond, + utils.OptsDebitInterval: 30 * time.Millisecond, }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/config/datadbcfg.go b/config/datadbcfg.go index 77cbc4ec1..da226c8f1 100644 --- a/config/datadbcfg.go +++ b/config/datadbcfg.go @@ -167,8 +167,8 @@ func (itm *ItemOpt) AsMapInterface() map[string]interface{} { return map[string]interface{}{ utils.RemoteCfg: itm.Remote, utils.ReplicateCfg: itm.Replicate, - utils.RouteID: itm.RouteID, - utils.APIKey: itm.APIKey, + utils.OptsRouteID: itm.RouteID, + utils.OptsAPIKey: itm.APIKey, } } diff --git a/dispatchers/attributes_it_test.go b/dispatchers/attributes_it_test.go index 95f3bcf0f..2d9d81e02 100755 --- a/dispatchers/attributes_it_test.go +++ b/dispatchers/attributes_it_test.go @@ -358,7 +358,7 @@ func testDspAttrTestMissingApiKey(t *testing.T) { } var attrReply *engine.AttributeProfile if err := dispEngine.RPC.Call(utils.AttributeSv1GetAttributeForEvent, - args, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing(utils.APIKey).Error() { + args, &attrReply); err == nil || err.Error() != utils.NewErrMandatoryIeMissing(utils.OptsAPIKey).Error() { t.Errorf("Error:%v rply=%s", err, utils.ToJSON(attrReply)) } } diff --git a/dispatchers/dispatchers.go b/dispatchers/dispatchers.go index 4ab28a931..6ca3a5e20 100755 --- a/dispatchers/dispatchers.go +++ b/dispatchers/dispatchers.go @@ -81,14 +81,14 @@ func (dS *DispatcherService) authorizeEvent(ev *utils.CGREvent, func (dS *DispatcherService) authorize(method, tenant string, apiKey *string, evTime *time.Time) (err error) { if apiKey == nil || *apiKey == "" { - return utils.NewErrMandatoryIeMissing(utils.APIKey) + return utils.NewErrMandatoryIeMissing(utils.OptsAPIKey) } ev := &utils.CGREvent{ Tenant: tenant, ID: utils.UUIDSha1Prefix(), Time: evTime, Event: map[string]interface{}{ - utils.APIKey: *apiKey, + utils.OptsAPIKey: *apiKey, }, } var rplyEv engine.AttrSProcessEventReply @@ -209,14 +209,14 @@ func (dS *DispatcherService) V1Apier(apier interface{}, args *utils.MethodParame var argD *utils.ArgDispatcher //check if we have APIKey in event and in case it has add it in ArgDispatcher - apiKeyIface, hasApiKey := parameters[utils.APIKey] + apiKeyIface, hasApiKey := parameters[utils.OptsAPIKey] if hasApiKey && apiKeyIface != nil { argD = &utils.ArgDispatcher{ APIKey: utils.StringPointer(apiKeyIface.(string)), } } //check if we have RouteID in event and in case it has add it in ArgDispatcher - routeIDIface, hasRouteID := parameters[utils.RouteID] + routeIDIface, hasRouteID := parameters[utils.OptsRouteID] 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{ diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go index c4fe56c19..90fbe128f 100644 --- a/dispatchers/replicator.go +++ b/dispatchers/replicator.go @@ -35,13 +35,13 @@ func (dS *DispatcherService) ReplicatorSv1Ping(args *utils.CGREventWithArgDispat return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1Ping, 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.MetaReplicator, routeID, utils.ReplicatorSv1Ping, args, rpl) @@ -57,13 +57,13 @@ func (dS *DispatcherService) ReplicatorSv1GetAccount(args *utils.StringWithApiKe return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetAccount, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetAccount, args, rpl) @@ -79,13 +79,13 @@ func (dS *DispatcherService) ReplicatorSv1GetDestination(args *utils.StringWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetDestination, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetDestination, args, rpl) @@ -101,13 +101,13 @@ func (dS *DispatcherService) ReplicatorSv1GetReverseDestination(args *utils.Stri return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetReverseDestination, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetReverseDestination, args, rpl) @@ -123,11 +123,11 @@ func (dS *DispatcherService) ReplicatorSv1GetStatQueue(args *utils.TenantIDWithA } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetStatQueue, 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, @@ -144,11 +144,11 @@ func (dS *DispatcherService) ReplicatorSv1GetFilter(args *utils.TenantIDWithArgD } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetFilter, 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, @@ -165,11 +165,11 @@ func (dS *DispatcherService) ReplicatorSv1GetThreshold(args *utils.TenantIDWithA } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetThreshold, 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, @@ -186,11 +186,11 @@ func (dS *DispatcherService) ReplicatorSv1GetThresholdProfile(args *utils.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetThresholdProfile, 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, @@ -207,11 +207,11 @@ func (dS *DispatcherService) ReplicatorSv1GetStatQueueProfile(args *utils.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetStatQueueProfile, 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, @@ -228,13 +228,13 @@ func (dS *DispatcherService) ReplicatorSv1GetTiming(args *utils.StringWithApiKey return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetTiming, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetTiming, args, rpl) @@ -250,11 +250,11 @@ func (dS *DispatcherService) ReplicatorSv1GetResource(args *utils.TenantIDWithAr } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetResource, 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, @@ -271,11 +271,11 @@ func (dS *DispatcherService) ReplicatorSv1GetResourceProfile(args *utils.TenantI } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetResourceProfile, 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, @@ -292,13 +292,13 @@ func (dS *DispatcherService) ReplicatorSv1GetActionTriggers(args *utils.StringWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetActionTriggers, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetActionTriggers, args, rpl) @@ -314,13 +314,13 @@ func (dS *DispatcherService) ReplicatorSv1GetSharedGroup(args *utils.StringWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetSharedGroup, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetSharedGroup, args, rpl) @@ -336,13 +336,13 @@ func (dS *DispatcherService) ReplicatorSv1GetActions(args *utils.StringWithApiKe return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetActions, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetActions, args, rpl) @@ -358,13 +358,13 @@ func (dS *DispatcherService) ReplicatorSv1GetActionPlan(args *utils.StringWithAp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetActionPlan, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetActionPlan, args, rpl) @@ -380,13 +380,13 @@ func (dS *DispatcherService) ReplicatorSv1GetAllActionPlans(args *utils.StringWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetAllActionPlans, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetAllActionPlans, args, rpl) @@ -402,13 +402,13 @@ func (dS *DispatcherService) ReplicatorSv1GetAccountActionPlans(args *utils.Stri return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetAccountActionPlans, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetAccountActionPlans, args, rpl) @@ -424,13 +424,13 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingPlan(args *utils.StringWithAp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetRatingPlan, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetRatingPlan, args, rpl) @@ -446,13 +446,13 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingProfile(args *utils.StringWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetRatingProfile, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetRatingProfile, args, rpl) @@ -468,11 +468,11 @@ func (dS *DispatcherService) ReplicatorSv1GetRouteProfile(args *utils.TenantIDWi } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetRouteProfile, 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, @@ -489,11 +489,11 @@ func (dS *DispatcherService) ReplicatorSv1GetAttributeProfile(args *utils.Tenant } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetAttributeProfile, 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, @@ -510,11 +510,11 @@ func (dS *DispatcherService) ReplicatorSv1GetChargerProfile(args *utils.TenantID } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetChargerProfile, 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, @@ -531,11 +531,11 @@ func (dS *DispatcherService) ReplicatorSv1GetDispatcherProfile(args *utils.Tenan } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetDispatcherProfile, 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, @@ -552,11 +552,11 @@ func (dS *DispatcherService) ReplicatorSv1GetDispatcherHost(args *utils.TenantID } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetDispatcherHost, 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, @@ -573,11 +573,11 @@ func (dS *DispatcherService) ReplicatorSv1GetRateProfile(args *utils.TenantIDWit } if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 { if err = dS.authorize(utils.ReplicatorSv1GetRateProfile, 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, @@ -594,13 +594,13 @@ func (dS *DispatcherService) ReplicatorSv1GetItemLoadIDs(args *utils.StringWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetItemLoadIDs, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1GetItemLoadIDs, args, rpl) @@ -616,13 +616,13 @@ func (dS *DispatcherService) ReplicatorSv1SetThresholdProfile(args *engine.Thres return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetThresholdProfile, args.ThresholdProfile.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.ThresholdProfile.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1SetThresholdProfile, args, rpl) @@ -638,13 +638,13 @@ func (dS *DispatcherService) ReplicatorSv1SetThreshold(args *engine.ThresholdWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetThreshold, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetThreshold, args, rpl) @@ -660,13 +660,13 @@ func (dS *DispatcherService) ReplicatorSv1SetDestination(args *engine.Destinatio return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetDestination, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetDestination, args, rpl) @@ -682,13 +682,13 @@ func (dS *DispatcherService) ReplicatorSv1SetAccount(args *engine.AccountWithArg return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetAccount, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetAccount, args, rpl) @@ -704,13 +704,13 @@ func (dS *DispatcherService) ReplicatorSv1SetReverseDestination(args *engine.Des return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetReverseDestination, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetReverseDestination, args, rpl) @@ -726,13 +726,13 @@ func (dS *DispatcherService) ReplicatorSv1SetStatQueue(args *engine.StoredStatQu return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetStatQueue, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetStatQueue, args, rpl) @@ -748,13 +748,13 @@ func (dS *DispatcherService) ReplicatorSv1SetFilter(args *engine.FilterWithArgDi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetFilter, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetFilter, args, rpl) @@ -770,13 +770,13 @@ func (dS *DispatcherService) ReplicatorSv1SetStatQueueProfile(args *engine.StatQ return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetStatQueueProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetStatQueueProfile, args, rpl) @@ -792,13 +792,13 @@ func (dS *DispatcherService) ReplicatorSv1SetTiming(args *utils.TPTimingWithArgD return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetTiming, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetTiming, args, rpl) @@ -814,13 +814,13 @@ func (dS *DispatcherService) ReplicatorSv1SetResource(args *engine.ResourceWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetResource, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetResource, args, rpl) @@ -836,13 +836,13 @@ func (dS *DispatcherService) ReplicatorSv1SetResourceProfile(args *engine.Resour return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetResourceProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetResourceProfile, args, rpl) @@ -858,13 +858,13 @@ func (dS *DispatcherService) ReplicatorSv1SetActionTriggers(args *engine.SetActi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetActionTriggers, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetActionTriggers, args, rpl) @@ -880,13 +880,13 @@ func (dS *DispatcherService) ReplicatorSv1SetSharedGroup(args *engine.SharedGrou return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetSharedGroup, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetSharedGroup, args, rpl) @@ -902,13 +902,13 @@ func (dS *DispatcherService) ReplicatorSv1SetActions(args *engine.SetActionsArgs return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetActions, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetActions, args, rpl) @@ -924,13 +924,13 @@ func (dS *DispatcherService) ReplicatorSv1SetRatingPlan(args *engine.RatingPlanW return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetRatingPlan, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetRatingPlan, args, rpl) @@ -946,13 +946,13 @@ func (dS *DispatcherService) ReplicatorSv1SetRatingProfile(args *engine.RatingPr return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetRatingProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetRatingProfile, args, rpl) @@ -968,13 +968,13 @@ func (dS *DispatcherService) ReplicatorSv1SetRouteProfile(args *engine.RouteProf return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetRouteProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetRouteProfile, args, rpl) @@ -990,13 +990,13 @@ func (dS *DispatcherService) ReplicatorSv1SetAttributeProfile(args *engine.Attri return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetAttributeProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetAttributeProfile, args, rpl) @@ -1012,13 +1012,13 @@ func (dS *DispatcherService) ReplicatorSv1SetChargerProfile(args *engine.Charger return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetChargerProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetChargerProfile, args, rpl) @@ -1034,13 +1034,13 @@ func (dS *DispatcherService) ReplicatorSv1SetDispatcherProfile(args *engine.Disp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetDispatcherProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetDispatcherProfile, args, rpl) @@ -1056,13 +1056,13 @@ func (dS *DispatcherService) ReplicatorSv1SetRateProfile(args *engine.RateProfil return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetRateProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetRateProfile, args, rpl) @@ -1078,13 +1078,13 @@ func (dS *DispatcherService) ReplicatorSv1SetActionPlan(args *engine.SetActionPl return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetActionPlan, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetActionPlan, args, rpl) @@ -1100,13 +1100,13 @@ func (dS *DispatcherService) ReplicatorSv1SetAccountActionPlans(args *engine.Set return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetAccountActionPlans, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetAccountActionPlans, args, rpl) @@ -1122,13 +1122,13 @@ func (dS *DispatcherService) ReplicatorSv1SetDispatcherHost(args *engine.Dispatc return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetDispatcherHost, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetDispatcherHost, args, rpl) @@ -1144,13 +1144,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveThreshold(args *utils.TenantIDWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveThreshold, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveThreshold, args, rpl) @@ -1166,13 +1166,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDestination(args *utils.StringWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveDestination, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveDestination, args, rpl) @@ -1188,13 +1188,13 @@ func (dS *DispatcherService) ReplicatorSv1SetLoadIDs(args *utils.LoadIDsWithArgD return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetLoadIDs, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1SetLoadIDs, args, rpl) @@ -1210,13 +1210,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAccount(args *utils.StringWithAp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveAccount, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveAccount, args, rpl) @@ -1232,13 +1232,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveStatQueue(args *utils.TenantIDWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveStatQueue, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveStatQueue, args, rpl) @@ -1254,13 +1254,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveFilter(args *utils.TenantIDWithA return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveFilter, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveFilter, args, rpl) @@ -1276,13 +1276,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveThresholdProfile(args *utils.Ten return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveThresholdProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveThresholdProfile, args, rpl) @@ -1298,13 +1298,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveStatQueueProfile(args *utils.Ten return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveStatQueueProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveStatQueueProfile, args, rpl) @@ -1320,13 +1320,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveTiming(args *utils.StringWithApi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveTiming, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveTiming, args, rpl) @@ -1342,13 +1342,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveResource(args *utils.TenantIDWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveResource, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveResource, args, rpl) @@ -1364,13 +1364,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveResourceProfile(args *utils.Tena return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveResourceProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveResourceProfile, args, rpl) @@ -1386,13 +1386,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionTriggers(args *utils.Strin return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveActionTriggers, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveActionTriggers, args, rpl) @@ -1408,13 +1408,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveSharedGroup(args *utils.StringWi return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveSharedGroup, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveSharedGroup, args, rpl) @@ -1430,13 +1430,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActions(args *utils.StringWithAp return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveActions, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveActions, args, rpl) @@ -1452,13 +1452,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveActionPlan(args *utils.StringWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveActionPlan, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveActionPlan, args, rpl) @@ -1474,13 +1474,13 @@ func (dS *DispatcherService) ReplicatorSv1RemAccountActionPlans(args *engine.Rem return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemAccountActionPlans, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemAccountActionPlans, args, rpl) @@ -1496,13 +1496,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingPlan(args *utils.StringWit return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveRatingPlan, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveRatingPlan, args, rpl) @@ -1518,13 +1518,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingProfile(args *utils.String return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveRatingProfile, args.TenantArg.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.TenantArg.Tenant}, utils.MetaReplicator, routeID, utils.ReplicatorSv1RemoveRatingProfile, args, rpl) @@ -1540,13 +1540,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRouteProfile(args *utils.TenantI return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveRouteProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveRouteProfile, args, rpl) @@ -1562,13 +1562,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAttributeProfile(args *utils.Ten return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveAttributeProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveAttributeProfile, args, rpl) @@ -1584,13 +1584,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveChargerProfile(args *utils.Tenan return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveChargerProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveChargerProfile, args, rpl) @@ -1606,13 +1606,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherProfile(args *utils.Te return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveDispatcherProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveDispatcherProfile, args, rpl) @@ -1628,13 +1628,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherHost(args *utils.Tenan return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveDispatcherHost, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveDispatcherHost, args, rpl) @@ -1650,13 +1650,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRateProfile(args *utils.TenantID return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveRateProfile, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveRateProfile, args, rpl) @@ -1673,13 +1673,13 @@ func (dS *DispatcherService) ReplicatorSv1GetIndexes(args *utils.GetIndexesArg, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1GetIndexes, 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.MetaReplicator, routeID, utils.ReplicatorSv1GetIndexes, args, reply) @@ -1696,13 +1696,13 @@ func (dS *DispatcherService) ReplicatorSv1SetIndexes(args *utils.SetIndexesArg, return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1SetIndexes, 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.MetaReplicator, routeID, utils.ReplicatorSv1SetIndexes, args, reply) @@ -1719,13 +1719,13 @@ func (dS *DispatcherService) ReplicatorSv1RemoveIndexes(args *utils.GetIndexesAr return utils.NewErrMandatoryIeMissing(utils.ArgDispatcherField) } if err = dS.authorize(utils.ReplicatorSv1RemoveIndexes, 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.MetaReplicator, routeID, utils.ReplicatorSv1RemoveIndexes, args, reply) diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go index 6dd0dbec3..4febed89c 100644 --- a/dispatchers/replicator_it_test.go +++ b/dispatchers/replicator_it_test.go @@ -101,7 +101,7 @@ func testDspRplPingFailover(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345"), + OptsAPIKey: utils.StringPointer("repl12345"), }, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1Ping, &ev, &reply); err != nil { @@ -141,7 +141,7 @@ func testDspRplAccount(t *testing.T) { Disabled: true, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345"), + OptsAPIKey: utils.StringPointer("repl12345"), }, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetAccount, attrSetAccount, &replyStr); err != nil { @@ -154,7 +154,7 @@ func testDspRplAccount(t *testing.T) { argsGetAccount := &utils.StringWithApiKey{ Arg: "cgrates.org:1008", ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345"), + OptsAPIKey: utils.StringPointer("repl12345"), }, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAccount, argsGetAccount, &reply); err != nil { @@ -178,7 +178,7 @@ func testDspRplAccount(t *testing.T) { if err := dispEngine.RPC.Call(utils.ReplicatorSv1RemoveAccount, &utils.StringWithApiKey{ Arg: "cgrates.org:1008", ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, }, &replyStr); err != nil { t.Error(err) } else if replyStr != utils.OK { @@ -199,7 +199,7 @@ func testDspRplSupplierProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRouteProfile, argSetSupplierProfile, &replyStr); err != nil { @@ -216,7 +216,7 @@ func testDspRplSupplierProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRouteProfile, argRouteProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetSupplierProfile: ", err) @@ -258,7 +258,7 @@ func testDspRplAttributeProfile(t *testing.T) { ID: "id", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetAttributeProfile, setAttributeProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetAttributeProfile: ", err) @@ -274,7 +274,7 @@ func testDspRplAttributeProfile(t *testing.T) { ID: "id", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAttributeProfile, argAttributeProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetAttributeProfile: ", err) @@ -316,7 +316,7 @@ func testDspRplChargerProfile(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetChargerProfile, setChargerProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetChargerProfile: ", err) @@ -331,7 +331,7 @@ func testDspRplChargerProfile(t *testing.T) { ID: "id", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetChargerProfile, argsChargerProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetChargerProfile: ", err) @@ -373,7 +373,7 @@ func testDspRplDispatcherProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetDispatcherProfile, setDispatcherProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetDispatcherProfile: ", err) @@ -388,7 +388,7 @@ func testDspRplDispatcherProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherProfile, argsDispatcherProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetDispatcherProfile: ", err) @@ -430,7 +430,7 @@ func testDspRplDispatcherHost(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetDispatcherHost, setDispatcherHost, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetDispatcherHost: ", err) @@ -445,7 +445,7 @@ func testDspRplDispatcherHost(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDispatcherHost, argsDispatcherHost, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetDispatcherHost: ", err) @@ -487,7 +487,7 @@ func testDspRplFilter(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetFilter, setFilter, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetFilter: ", err) @@ -502,7 +502,7 @@ func testDspRplFilter(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetFilter, argsFilter, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetFilter: ", err) @@ -544,7 +544,7 @@ func testDspRplThreshold(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetThreshold, setThreshold, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetThreshold: ", err) @@ -559,7 +559,7 @@ func testDspRplThreshold(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThreshold, argsThreshold, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetThreshold: ", err) @@ -601,7 +601,7 @@ func testDspRplThresholdProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetThresholdProfile, setThresholdProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetThresholdProfile: ", err) @@ -616,7 +616,7 @@ func testDspRplThresholdProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetThresholdProfile, argsThresholdProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetThresholdProfile: ", err) @@ -658,7 +658,7 @@ func testDspRplStatQueue(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetStatQueue, setStatQueue, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetStatQueue: ", err) @@ -673,7 +673,7 @@ func testDspRplStatQueue(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueue, argsStatQueue, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetStatQueue: ", err) @@ -715,7 +715,7 @@ func testDspRplStatQueueProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetStatQueueProfile, setStatQueueProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetStatQueueProfile: ", err) @@ -730,7 +730,7 @@ func testDspRplStatQueueProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetStatQueueProfile, argsStatQueueProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetStatQueueProfile: ", err) @@ -772,7 +772,7 @@ func testDspRplResource(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetResource, setResource, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetResource: ", err) @@ -787,7 +787,7 @@ func testDspRplResource(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResource, argsResource, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetResource: ", err) @@ -829,7 +829,7 @@ func testDspRplResourceProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetResourceProfile, setResourceProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetResourceProfile: ", err) @@ -844,7 +844,7 @@ func testDspRplResourceProfile(t *testing.T) { ID: "ID", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetResourceProfile, argsResourceProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetResourceProfile: ", err) @@ -889,7 +889,7 @@ func testDspRplTiming(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetTiming, setTiming, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetTiming: ", err) @@ -904,7 +904,7 @@ func testDspRplTiming(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetTiming, argsTiming, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetTiming: ", err) @@ -945,7 +945,7 @@ func testDspRplActionTriggers(t *testing.T) { Attrs: engine.ActionTriggers{ &engine.ActionTrigger{ID: "testActionTriggers"}}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetActionTriggers, setActionTriggers, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetActionTriggers: ", err) @@ -959,7 +959,7 @@ func testDspRplActionTriggers(t *testing.T) { TenantArg: utils.TenantArg{ Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActionTriggers, argsActionTriggers, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetActionTriggers: ", err) @@ -998,7 +998,7 @@ func testDspRplSharedGroup(t *testing.T) { Id: "IDSharedGroup", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetSharedGroup, setSharedGroup, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetSharedGroup: ", err) @@ -1013,7 +1013,7 @@ func testDspRplSharedGroup(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetSharedGroup, argsSharedGroup, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetSharedGroup: ", err) @@ -1057,7 +1057,7 @@ func testDspRplActions(t *testing.T) { Key: "KeyActions", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetActions, setActions, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetActions: ", err) @@ -1072,7 +1072,7 @@ func testDspRplActions(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActions, argsActions, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetActions: ", err) @@ -1123,7 +1123,7 @@ func testDspRplActionPlan(t *testing.T) { Key: "KeyActionPlan", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetActionPlan, setActionPlan, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetActionPlan: ", err) @@ -1138,7 +1138,7 @@ func testDspRplActionPlan(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetActionPlan, argsActionPlan, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetActionPlan: ", err) @@ -1178,7 +1178,7 @@ func testDspRplAccountActionPlans(t *testing.T) { AcntID: "KeyAccountActionPlans", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetAccountActionPlans, setAccountActionPlans, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetAccountActionPlans: ", err) @@ -1193,7 +1193,7 @@ func testDspRplAccountActionPlans(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetAccountActionPlans, argsAccountActionPlans, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetAccountActionPlans: ", err) @@ -1239,7 +1239,7 @@ func testDspRplRatingPlan(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRatingPlan, setRatingPlan, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetRatingPlan: ", err) @@ -1252,7 +1252,7 @@ func testDspRplRatingPlan(t *testing.T) { Arg: "id", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRatingPlan, argsRatingPlan, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetRatingPlan: ", err) @@ -1296,7 +1296,7 @@ func testDspRplRatingProfile(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRatingProfile, setRatingProfile, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetRatingProfile: ", err) @@ -1309,7 +1309,7 @@ func testDspRplRatingProfile(t *testing.T) { Arg: "idRatingProfile", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRatingProfile, argsRatingProfile, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetRatingProfile: ", err) @@ -1351,7 +1351,7 @@ func testDspRplDestination(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetDestination, setDestination, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetDestination: ", err) @@ -1364,7 +1364,7 @@ func testDspRplDestination(t *testing.T) { Arg: "idDestination", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetDestination, argsDestination, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetDestination: ", err) @@ -1406,7 +1406,7 @@ func testDspRplLoadIDs(t *testing.T) { Tenant: "cgrates.org", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetLoadIDs, setLoadIDs, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetLoadIDs: ", err) @@ -1419,7 +1419,7 @@ func testDspRplLoadIDs(t *testing.T) { Arg: "idLoadIDs", TenantArg: utils.TenantArg{Tenant: "cgrates.org"}, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetItemLoadIDs, argsLoadIDs, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetItemLoadIDs: ", err) @@ -1473,7 +1473,7 @@ func testDspRplRateProfile(t *testing.T) { }, }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1SetRateProfile, rPrf, &replyStr); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.SetRateProfile: ", err) @@ -1488,7 +1488,7 @@ func testDspRplRateProfile(t *testing.T) { ID: "RP1", }, ArgDispatcher: &utils.ArgDispatcher{ - APIKey: utils.StringPointer("repl12345")}, + OptsAPIKey: utils.StringPointer("repl12345")}, } if err := dispEngine.RPC.Call(utils.ReplicatorSv1GetRateProfile, args, &reply); err != nil { t.Error("Unexpected error when calling ReplicatorSv1.GetRateProfile: ", err) diff --git a/engine/datamanager.go b/engine/datamanager.go index 3b754ceb9..d0008cd0d 100644 --- a/engine/datamanager.go +++ b/engine/datamanager.go @@ -332,8 +332,8 @@ func (dm *DataManager) GetDestination(key string, skipCache bool, transactionID 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), }, }, &dest); err == nil { err = dm.dataDB.SetDestinationDrv(dest, utils.NonTransactional) diff --git a/engine/libroutes.go b/engine/libroutes.go index a77cda81f..cb8514d75 100644 --- a/engine/libroutes.go +++ b/engine/libroutes.go @@ -163,7 +163,7 @@ func (sSpls *SortedRoutes) Digest() string { func (ss *SortedRoute) AsNavigableMap() (nm utils.NavigableMap2) { nm = utils.NavigableMap2{ - utils.RouteID: utils.NewNMData(ss.RouteID), + utils.OptsRouteID: utils.NewNMData(ss.RouteID), utils.RouteParameters: utils.NewNMData(ss.RouteParameters), } sd := utils.NavigableMap2{} diff --git a/engine/model_helpers.go b/engine/model_helpers.go index 85f0442cf..656d2e8af 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -1899,7 +1899,7 @@ type TPRoutes []*TpRoute // CSVHeader return the header for csv fields as a slice of string func (tps TPRoutes) CSVHeader() (result []string) { return []string{"#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.ActivationIntervalString, - utils.Sorting, utils.SortingParameters, utils.RouteID, utils.RouteFilterIDs, + utils.Sorting, utils.SortingParameters, utils.OptsRouteID, utils.RouteFilterIDs, utils.RouteAccountIDs, utils.RouteRatingplanIDs, utils.RouteResourceIDs, utils.RouteStatIDs, utils.RouteWeight, utils.RouteBlocker, utils.RouteParameters, utils.Weight, diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index 22bf8bf28..41f3795a2 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -186,9 +186,9 @@ func testA1itDataSession1(t *testing.T) { initArgs := &sessions.V1InitSessionArgs{ InitSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "28800s", - utils.SessionTTLLastUsed: "0s", - utils.SessionTTLUsage: "0s", + utils.OptsSessionTTL: "28800s", + utils.OptsSessionTTLLastUsed: "0s", + utils.OptsSessionTTLUsage: "0s", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -222,9 +222,9 @@ func testA1itDataSession1(t *testing.T) { updateArgs := &sessions.V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "28800s", - utils.SessionTTLLastUsed: "2097152s", - utils.SessionTTLUsage: "0s", + utils.OptsSessionTTL: "28800s", + utils.OptsSessionTTLLastUsed: "2097152s", + utils.OptsSessionTTLUsage: "0s", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 93c0d14fd..8c2629f03 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -445,10 +445,10 @@ func testV1DataInitSession(t *testing.T) { args := &sessions.V1InitSessionArgs{ InitSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "300s", - utils.SessionTTLLastUsed: "0s", - utils.SessionTTLMaxDelay: "1800s", - utils.SessionTTLUsage: "0s", + utils.OptsSessionTTL: "300s", + utils.OptsSessionTTLLastUsed: "0s", + utils.OptsSessionTTLMaxDelay: "1800s", + utils.OptsSessionTTLUsage: "0s", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -489,10 +489,10 @@ func testV1DataUpdateWith1Mo(t *testing.T) { args := &sessions.V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "28807s", - utils.SessionTTLLastUsed: "0s", - utils.SessionTTLMaxDelay: "1800s", - utils.SessionTTLUsage: "0s"}, + utils.OptsSessionTTL: "28807s", + utils.OptsSessionTTLLastUsed: "0s", + utils.OptsSessionTTLMaxDelay: "1800s", + utils.OptsSessionTTLUsage: "0s"}, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testV1DataUpdateWith1Mo", @@ -533,10 +533,10 @@ func testV1DataUpdateWith1Go(t *testing.T) { args := &sessions.V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "28807s", - utils.SessionTTLLastUsed: "0s", - utils.SessionTTLMaxDelay: "1800s", - utils.SessionTTLUsage: "0s"}, + utils.OptsSessionTTL: "28807s", + utils.OptsSessionTTLLastUsed: "0s", + utils.OptsSessionTTLMaxDelay: "1800s", + utils.OptsSessionTTLUsage: "0s"}, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", ID: "testV1DataUpdateWith1Go", diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index db05e8006..6806ba2c8 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -188,7 +188,7 @@ func testSes2StirAuthenticate(t *testing.T) { args := &sessions.V1ProcessEventArgs{ Flags: []string{utils.MetaSTIRAuthenticate}, Opts: map[string]interface{}{ - utils.STIRIdentity: "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDAxIn0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken", + utils.OptsStirIdentity: "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDAxIn0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -210,14 +210,14 @@ func testSes2StirAuthenticate(t *testing.T) { t.Error(err) } // altered originator - args.Opts[utils.STIROriginatorTn] = "1005" + args.Opts[utils.OptsStirOriginatorTn] = "1005" if err := ses2RPC.Call(utils.SessionSv1ProcessEvent, args, &rply); err == nil || err.Error() != "*stir_authenticate: wrong originatorTn" { t.Errorf("Expected error :%q ,receved: %v", "*stir_authenticate: wrong originatorTn", err) } // altered identity - args.Opts[utils.STIRIdentity] = "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDA1In0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken" + args.Opts[utils.OptsStirIdentity] = "eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiL3Vzci9zaGFyZS9jZ3JhdGVzL3N0aXIvc3Rpcl9wdWJrZXkucGVtIn0.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyIxMDAyIl19LCJpYXQiOjE1ODcwMzg4MDIsIm9yaWciOnsidG4iOiIxMDA1In0sIm9yaWdpZCI6IjEyMzQ1NiJ9.cMEMlFnfyTu8uxfeU4RoZTamA7ifFT9Ibwrvi1_LKwL2xAU6fZ_CSIxKbtyOpNhM_sV03x7CfA_v0T4sHkifzg;info=;ppt=shaken" if err := ses2RPC.Call(utils.SessionSv1ProcessEvent, args, &rply); err == nil || err.Error() != "*stir_authenticate: crypto/ecdsa: verification error" { t.Errorf("Expected error :%q ,receved: %v", "*stir_authenticate: crypto/ecdsa: verification error", err) @@ -228,8 +228,8 @@ func testSes2StirInit(t *testing.T) { args := &sessions.V1ProcessEventArgs{ Flags: []string{utils.MetaSTIRInitiate}, Opts: map[string]interface{}{ - utils.STIRPublicKeyPath: "/usr/share/cgrates/stir/stir_pubkey.pem", - utils.STIRPrivateKeyPath: "/usr/share/cgrates/stir/stir_privatekey.pem", + utils.OptsStirPublicKeyPath: "/usr/share/cgrates/stir/stir_pubkey.pem", + utils.OptsStirPrivateKeyPath: "/usr/share/cgrates/stir/stir_privatekey.pem", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/sessions/sessions.go b/sessions/sessions.go index bce9f5c53..9e6484d24 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -211,17 +211,17 @@ func (sS *SessionS) setSTerminator(s *Session, opts engine.MapEvent) { var err error // TTL var ttl time.Duration - if opts.HasField(utils.SessionTTL) { - ttl, err = opts.GetDuration(utils.SessionTTL) - } else if s.OptsStart.HasField(utils.SessionTTL) { - ttl, err = s.OptsStart.GetDuration(utils.SessionTTL) + if opts.HasField(utils.OptsSessionTTL) { + ttl, err = opts.GetDuration(utils.OptsSessionTTL) + } else if s.OptsStart.HasField(utils.OptsSessionTTL) { + ttl, err = s.OptsStart.GetDuration(utils.OptsSessionTTL) } else { ttl = sS.cgrCfg.SessionSCfg().SessionTTL } if err != nil { utils.Logger.Warning( fmt.Sprintf("<%s>, cannot extract <%s> for session:<%s>, from it's options: <%s>, err: <%s>", - utils.SessionS, utils.SessionTTL, s.CGRID, opts, err)) + utils.SessionS, utils.OptsSessionTTL, s.CGRID, opts, err)) return } if ttl == 0 { @@ -229,17 +229,17 @@ func (sS *SessionS) setSTerminator(s *Session, opts engine.MapEvent) { } // random delay computation var maxDelay time.Duration - if opts.HasField(utils.SessionTTLMaxDelay) { - maxDelay, err = opts.GetDuration(utils.SessionTTLMaxDelay) - } else if s.OptsStart.HasField(utils.SessionTTLMaxDelay) { - maxDelay, err = s.OptsStart.GetDuration(utils.SessionTTLMaxDelay) + if opts.HasField(utils.OptsSessionTTLMaxDelay) { + maxDelay, err = opts.GetDuration(utils.OptsSessionTTLMaxDelay) + } else if s.OptsStart.HasField(utils.OptsSessionTTLMaxDelay) { + maxDelay, err = s.OptsStart.GetDuration(utils.OptsSessionTTLMaxDelay) } else if sS.cgrCfg.SessionSCfg().SessionTTLMaxDelay != nil { maxDelay = *sS.cgrCfg.SessionSCfg().SessionTTLMaxDelay } if err != nil { utils.Logger.Warning( fmt.Sprintf("<%s>, cannot extract <%s> for session:<%s>, from it's options: <%s>, err: <%s>", - utils.SessionS, utils.SessionTTLMaxDelay, s.CGRID, opts.String(), err.Error())) + utils.SessionS, utils.OptsSessionTTLMaxDelay, s.CGRID, opts.String(), err.Error())) return } if maxDelay != 0 { @@ -249,47 +249,47 @@ func (sS *SessionS) setSTerminator(s *Session, opts engine.MapEvent) { } // LastUsed var ttlLastUsed *time.Duration - if opts.HasField(utils.SessionTTLLastUsed) { - ttlLastUsed, err = opts.GetDurationPtr(utils.SessionTTLLastUsed) - } else if s.OptsStart.HasField(utils.SessionTTLLastUsed) { - ttlLastUsed, err = s.OptsStart.GetDurationPtr(utils.SessionTTLLastUsed) + if opts.HasField(utils.OptsSessionTTLLastUsed) { + ttlLastUsed, err = opts.GetDurationPtr(utils.OptsSessionTTLLastUsed) + } else if s.OptsStart.HasField(utils.OptsSessionTTLLastUsed) { + ttlLastUsed, err = s.OptsStart.GetDurationPtr(utils.OptsSessionTTLLastUsed) } else { ttlLastUsed = sS.cgrCfg.SessionSCfg().SessionTTLLastUsed } if err != nil { utils.Logger.Warning( fmt.Sprintf("<%s>, cannot extract <%s> for session:<%s>, from it's options: <%s>, err: <%s>", - utils.SessionS, utils.SessionTTLLastUsed, s.CGRID, opts.String(), err.Error())) + utils.SessionS, utils.OptsSessionTTLLastUsed, s.CGRID, opts.String(), err.Error())) return } // LastUsage var ttlLastUsage *time.Duration - if opts.HasField(utils.SessionTTLLastUsage) { - ttlLastUsage, err = opts.GetDurationPtr(utils.SessionTTLLastUsage) - } else if s.OptsStart.HasField(utils.SessionTTLLastUsage) { - ttlLastUsage, err = s.OptsStart.GetDurationPtr(utils.SessionTTLLastUsage) + if opts.HasField(utils.OptsSessionTTLLastUsage) { + ttlLastUsage, err = opts.GetDurationPtr(utils.OptsSessionTTLLastUsage) + } else if s.OptsStart.HasField(utils.OptsSessionTTLLastUsage) { + ttlLastUsage, err = s.OptsStart.GetDurationPtr(utils.OptsSessionTTLLastUsage) } else { ttlLastUsage = sS.cgrCfg.SessionSCfg().SessionTTLLastUsage } if err != nil { utils.Logger.Warning( fmt.Sprintf("<%s>, cannot extract <%s> for session:<%s>, from it's options: <%s>, err: <%s>", - utils.SessionS, utils.SessionTTLLastUsage, s.CGRID, opts.String(), err.Error())) + utils.SessionS, utils.OptsSessionTTLLastUsage, s.CGRID, opts.String(), err.Error())) return } // TTLUsage var ttlUsage *time.Duration - if opts.HasField(utils.SessionTTLUsage) { - ttlUsage, err = opts.GetDurationPtr(utils.SessionTTLUsage) - } else if s.OptsStart.HasField(utils.SessionTTLUsage) { - ttlUsage, err = s.OptsStart.GetDurationPtr(utils.SessionTTLUsage) + if opts.HasField(utils.OptsSessionTTLUsage) { + ttlUsage, err = opts.GetDurationPtr(utils.OptsSessionTTLUsage) + } else if s.OptsStart.HasField(utils.OptsSessionTTLUsage) { + ttlUsage, err = s.OptsStart.GetDurationPtr(utils.OptsSessionTTLUsage) } else { ttlUsage = sS.cgrCfg.SessionSCfg().SessionTTLUsage } if err != nil { utils.Logger.Warning( fmt.Sprintf("<%s>, cannot extract <%s> for session:<%s>, from it's options: <%s>, err: <%s>", - utils.SessionS, utils.SessionTTLUsage, s.CGRID, opts.String(), err.Error())) + utils.SessionS, utils.OptsSessionTTLUsage, s.CGRID, opts.String(), err.Error())) return } // previously defined, reset @@ -2224,8 +2224,8 @@ func (sS *SessionS) BiRPCv1InitiateSession(clnt rpcclient.ClientConnector, var err error opts := engine.MapEvent(args.Opts) dbtItvl := sS.cgrCfg.SessionSCfg().DebitInterval - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } @@ -2435,8 +2435,8 @@ func (sS *SessionS) BiRPCv1UpdateSession(clnt rpcclient.ClientConnector, ev := engine.MapEvent(args.CGREvent.Event) opts := engine.MapEvent(args.Opts) dbtItvl := sS.cgrCfg.SessionSCfg().DebitInterval - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } @@ -2580,8 +2580,8 @@ func (sS *SessionS) BiRPCv1TerminateSession(clnt rpcclient.ClientConnector, return utils.NewErrMandatoryIeMissing(utils.OriginID) } dbtItvl := sS.cgrCfg.SessionSCfg().DebitInterval - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } @@ -3087,7 +3087,7 @@ func (v1Rply *V1ProcessEventReply) AsNavigableMap() utils.NavigableMap2 { for k, v := range v1Rply.STIRIdentity { stir[k] = utils.NewNMData(v) } - cgrReply[utils.STIRIdentity] = stir + cgrReply[utils.OptsStirIdentity] = stir } } return cgrReply @@ -3211,18 +3211,18 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, if argsFlagsWithParams.HasKey(utils.MetaSTIRAuthenticate) { attest := sS.cgrCfg.SessionSCfg().STIRCfg.AllowedAttest - if uattest := opts.GetStringIgnoreErrors(utils.STIRATest); uattest != utils.EmptyString { + if uattest := opts.GetStringIgnoreErrors(utils.OptsStirATest); uattest != utils.EmptyString { attest = utils.NewStringSet(strings.Split(uattest, utils.INFIELD_SEP)) } var stirMaxDur time.Duration - if stirMaxDur, err = opts.GetDuration(utils.STIRPayloadMaxDuration); err != nil { + if stirMaxDur, err = opts.GetDuration(utils.OptsStirPayloadMaxDuration); err != nil { stirMaxDur = sS.cgrCfg.SessionSCfg().STIRCfg.PayloadMaxduration } - if err = AuthStirShaken(opts.GetStringIgnoreErrors(utils.STIRIdentity), - utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.STIROriginatorTn), ev.GetStringIgnoreErrors(utils.Account)), - opts.GetStringIgnoreErrors(utils.STIROriginatorURI), - utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.STIRDestinationTn), ev.GetStringIgnoreErrors(utils.Destination)), - opts.GetStringIgnoreErrors(utils.STIRDestinationURI), + if err = AuthStirShaken(opts.GetStringIgnoreErrors(utils.OptsStirIdentity), + utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirOriginatorTn), ev.GetStringIgnoreErrors(utils.Account)), + opts.GetStringIgnoreErrors(utils.OptsStirOriginatorURI), + utils.FirstNonEmpty(opts.GetStringIgnoreErrors(utils.OptsStirDestinationTn), ev.GetStringIgnoreErrors(utils.Destination)), + opts.GetStringIgnoreErrors(utils.OptsStirDestinationURI), attest, stirMaxDur); err != nil { return utils.NewSTIRError(err.Error()) } @@ -3241,26 +3241,26 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, chrEv := engine.MapEvent(chrs.CGREvent.Event) runID := chrs.ChargerSProfile attest := sS.cgrCfg.SessionSCfg().STIRCfg.DefaultAttest - if uattest := chrOpts.GetStringIgnoreErrors(utils.STIRATest); uattest != utils.EmptyString { + if uattest := chrOpts.GetStringIgnoreErrors(utils.OptsStirATest); uattest != utils.EmptyString { attest = uattest } - destURI := chrOpts.GetStringIgnoreErrors(utils.STIRDestinationTn) - destTn := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.STIRDestinationTn), chrEv.GetStringIgnoreErrors(utils.Destination)) + destURI := chrOpts.GetStringIgnoreErrors(utils.OptsStirDestinationTn) + destTn := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.OptsStirDestinationTn), chrEv.GetStringIgnoreErrors(utils.Destination)) dest := utils.NewPASSporTDestinationsIdentity(strings.Split(destTn, utils.INFIELD_SEP), strings.Split(destURI, utils.INFIELD_SEP)) var orig *utils.PASSporTOriginsIdentity - if origURI := chrOpts.GetStringIgnoreErrors(utils.STIROriginatorURI); origURI != utils.EmptyString { + if origURI := chrOpts.GetStringIgnoreErrors(utils.OptsStirOriginatorURI); origURI != utils.EmptyString { orig = utils.NewPASSporTOriginsIdentity(utils.EmptyString, origURI) } else { orig = utils.NewPASSporTOriginsIdentity( - utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.STIROriginatorTn), + utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.OptsStirOriginatorTn), chrEv.GetStringIgnoreErrors(utils.Account)), utils.EmptyString) } - pubkeyPath := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.STIRPublicKeyPath), sS.cgrCfg.SessionSCfg().STIRCfg.PublicKeyPath) - prvkeyPath := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.STIRPrivateKeyPath), sS.cgrCfg.SessionSCfg().STIRCfg.PrivateKeyPath) + pubkeyPath := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.OptsStirPublicKeyPath), sS.cgrCfg.SessionSCfg().STIRCfg.PublicKeyPath) + prvkeyPath := utils.FirstNonEmpty(chrOpts.GetStringIgnoreErrors(utils.OptsStirPrivateKeyPath), sS.cgrCfg.SessionSCfg().STIRCfg.PrivateKeyPath) payload := utils.NewPASSporTPayload(attest, chrs.CGREvent.ID, *dest, *orig) header := utils.NewPASSporTHeader(pubkeyPath) @@ -3383,8 +3383,8 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } // check for init session case ralsFlagsWithParams.HasKey(utils.MetaInitiate): - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } @@ -3408,8 +3408,8 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } //check for update session case ralsFlagsWithParams.HasKey(utils.MetaUpdate): - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } @@ -3432,8 +3432,8 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector, } // check for terminate session case ralsFlagsWithParams.HasKey(utils.MetaTerminate): - if opts.HasField(utils.DebitInterval) { // dynamic DebitInterval via CGRDebitInterval - if dbtItvl, err = opts.GetDuration(utils.DebitInterval); err != nil { + if opts.HasField(utils.OptsDebitInterval) { // dynamic DebitInterval via CGRDebitInterval + if dbtItvl, err = opts.GetDuration(utils.OptsDebitInterval); err != nil { return utils.NewErrRALs(err) } } diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 4edaa6b3a..25e178a2e 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -570,7 +570,7 @@ func testSessionsDataTTLExpired(t *testing.T) { initArgs := &V1InitSessionArgs{ InitSession: true, Opts: map[string]interface{}{ - utils.SessionTTLUsage: "2048", // will be charged on TTL + utils.OptsSessionTTLUsage: "2048", // will be charged on TTL }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -709,8 +709,8 @@ func testSessionsDataTTLExpMultiUpdates(t *testing.T) { updateArgs := &V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTLUsage: "2048", // will be charged on TTL - utils.SessionTTLLastUsed: "1024", + utils.OptsSessionTTLUsage: "2048", // will be charged on TTL + utils.OptsSessionTTLLastUsed: "1024", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -849,7 +849,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { updateArgs := &V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "0", // cancel timeout since usage 0 will not update it + utils.OptsSessionTTL: "0", // cancel timeout since usage 0 will not update it }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -898,7 +898,7 @@ func testSessionsDataMultipleDataNoUsage(t *testing.T) { updateArgs = &V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.SessionTTL: "1h", // cancel timeout since usage 0 will not update it + utils.OptsSessionTTL: "1h", // cancel timeout since usage 0 will not update it }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -1098,7 +1098,7 @@ func testSessionsDataTTLLastUsage(t *testing.T) { initArgs := &V1InitSessionArgs{ InitSession: true, Opts: map[string]interface{}{ - utils.SessionTTLLastUsage: "2048", + utils.OptsSessionTTLLastUsage: "2048", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index dba0a3abb..0326c8225 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -136,7 +136,7 @@ func testSessionsItTerminatUnexist(t *testing.T) { termArgs := &V1TerminateSessionArgs{ TerminateSession: true, Opts: map[string]interface{}{ - utils.DebitInterval: "10s", + utils.OptsDebitInterval: "10s", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", @@ -211,7 +211,7 @@ func testSessionsItUpdateUnexist(t *testing.T) { updtArgs := &V1UpdateSessionArgs{ UpdateSession: true, Opts: map[string]interface{}{ - utils.DebitInterval: "10s", + utils.OptsDebitInterval: "10s", }, CGREvent: &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index c58331cfc..c43cfea34 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -1478,8 +1478,8 @@ func TestSessionSrelocateSessionS(t *testing.T) { func TestSessionSNewV1AuthorizeArgsWithArgDispatcher(t *testing.T) { opts := map[string]interface{}{ - utils.APIKey: "testkey", - utils.RouteID: "testrouteid", + utils.OptsAPIKey: "testkey", + utils.OptsRouteID: "testrouteid", } cgrEv := &utils.CGREvent{ Tenant: "cgrates.org", @@ -1532,7 +1532,7 @@ func TestSessionSNewV1AuthorizeArgsWithArgDispatcher(t *testing.T) { func TestSessionSNewV1AuthorizeArgsWithArgDispatcher2(t *testing.T) { opts := map[string]interface{}{ - utils.RouteID: "testrouteid", + utils.OptsRouteID: "testrouteid", } cgrEv := &utils.CGREvent{ Tenant: "cgrates.org", diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 3bdc20d7a..f94d16e99 100755 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -1347,8 +1347,8 @@ type SessionFilter struct { // ArgDispatcher the basic information for dispatcher type ArgDispatcher struct { - APIKey *string - RouteID *string + OptsAPIKey *string + OptsRouteID *string } // Clone returns a copy of the ArgDispatcher @@ -1357,11 +1357,11 @@ func (arg *ArgDispatcher) Clone() (clned *ArgDispatcher) { return } clned = new(ArgDispatcher) - if arg.APIKey != nil { - clned.APIKey = StringPointer(*arg.APIKey) + if arg.OptsAPIKey != nil { + clned.OptsAPIKey = StringPointer(*arg.OptsAPIKey) } - if arg.RouteID != nil { - clned.RouteID = StringPointer(*arg.RouteID) + if arg.OptsRouteID != nil { + clned.OptsRouteID = StringPointer(*arg.OptsRouteID) } return } diff --git a/utils/cgrevent.go b/utils/cgrevent.go index dbd797828..a3ba6fe28 100644 --- a/utils/cgrevent.go +++ b/utils/cgrevent.go @@ -193,25 +193,25 @@ func getArgDispatcherFromOpts(ev map[string]interface{}) (arg *ArgDispatcher) { return } //check if we have APIKey in event and in case it has add it in ArgDispatcher - apiKeyIface, hasAPIKey := ev[APIKey] + apiKeyIface, hasAPIKey := ev[OptsAPIKey] if hasAPIKey { - delete(ev, APIKey) + delete(ev, OptsAPIKey) arg = &ArgDispatcher{ - APIKey: StringPointer(apiKeyIface.(string)), + OptsAPIKey: StringPointer(apiKeyIface.(string)), } } //check if we have RouteID in event and in case it has add it in ArgDispatcher - routeIDIface, hasRouteID := ev[RouteID] + routeIDIface, hasRouteID := ev[OptsRouteID] if !hasRouteID { return } - delete(ev, RouteID) + delete(ev, OptsRouteID) if !hasAPIKey { //in case we don't have APIKey, but we have RouteID we need to initialize the struct return &ArgDispatcher{ - RouteID: StringPointer(routeIDIface.(string)), + OptsRouteID: StringPointer(routeIDIface.(string)), } } - arg.RouteID = StringPointer(routeIDIface.(string)) + arg.OptsRouteID = StringPointer(routeIDIface.(string)) return } diff --git a/utils/cgrevent_test.go b/utils/cgrevent_test.go index 61d5149e1..2e2f28748 100644 --- a/utils/cgrevent_test.go +++ b/utils/cgrevent_test.go @@ -298,29 +298,29 @@ func TestCGREventconsumeArgDispatcher(t *testing.T) { //normal check without APIkey routeID := "route" opts = map[string]interface{}{ - RouteID: routeID, + OptsRouteID: routeID, } eOut := &ArgDispatcher{ - RouteID: &routeID, + OptsRouteID: &routeID, } rcv = getArgDispatcherFromOpts(opts) if !reflect.DeepEqual(eOut, rcv) { t.Errorf("Expecting: %+v, received: %+v", eOut, rcv) } //check if *route_id was deleted - if _, has := opts[RouteID]; has { + if _, has := opts[OptsRouteID]; has { t.Errorf("*route_id wasn't deleted") } //normal check with routeID and APIKey apiKey := "key" - opts = map[string]interface{}{RouteID: routeID, APIKey: apiKey} - eOut.APIKey = &apiKey + opts = map[string]interface{}{OptsRouteID: routeID, OptsAPIKey: apiKey} + eOut.OptsAPIKey = &apiKey rcv = getArgDispatcherFromOpts(opts) //check if *api_key and *route_id was deleted - if _, has := opts[APIKey]; has { + if _, has := opts[OptsAPIKey]; has { t.Errorf("*api_key wasn't deleted") - } else if _, has := opts[RouteID]; has { + } else if _, has := opts[OptsRouteID]; has { t.Errorf("*route_id wasn't deleted") } if !reflect.DeepEqual(eOut, rcv) { @@ -511,8 +511,8 @@ func TestCGREventWithArgDispatcherClone(t *testing.T) { routeID := "routeid" rcv.ArgDispatcher = &ArgDispatcher{ - APIKey: &apiKey, - RouteID: &routeID, + OptsAPIKey: &apiKey, + OptsRouteID: &routeID, } if reflect.DeepEqual(cgrEventWithArgDispatcher.ArgDispatcher, rcv.ArgDispatcher) { t.Errorf("Expected to be different") @@ -546,8 +546,8 @@ func TestCGREventWithOptsClone(t *testing.T) { }, }, ArgDispatcher: &ArgDispatcher{ - APIKey: StringPointer("api1"), - RouteID: StringPointer("route1"), + OptsAPIKey: StringPointer("api1"), + OptsRouteID: StringPointer("route1"), }, Opts: map[string]interface{}{ "Context": MetaSessionS, @@ -559,8 +559,8 @@ func TestCGREventWithOptsClone(t *testing.T) { } //check vars rcv.ArgDispatcher = &ArgDispatcher{ - APIKey: StringPointer("apikey"), - RouteID: StringPointer("routeid"), + OptsAPIKey: StringPointer("apikey"), + OptsRouteID: StringPointer("routeid"), } if reflect.DeepEqual(cgrEventWithOpts.ArgDispatcher, rcv.ArgDispatcher) { t.Errorf("Expected to be different") diff --git a/utils/consts.go b/utils/consts.go index b33883b56..8403478e9 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -2204,38 +2204,15 @@ var ( ) // CGROptionsSet the possible cgr options -var CGROptionsSet = NewStringSet([]string{STIRATest, STIRPayloadMaxDuration, - STIRIdentity, STIROriginatorTn, STIROriginatorURI, STIRDestinationTn, - STIRDestinationURI, STIRPublicKeyPath, STIRPrivateKeyPath, - DebitInterval, Context, SessionTTL, SessionTTLMaxDelay, - SessionTTLLastUsed, SessionTTLLastUsage, SessionTTLUsage, APIKey, RouteID}) +var CGROptionsSet = NewStringSet([]string{OptsStirATest, OptsStirPayloadMaxDuration, + OptsStirIdentity, OptsStirOriginatorTn, OptsStirOriginatorURI, OptsStirDestinationTn, + OptsStirDestinationURI, OptsStirPublicKeyPath, OptsStirPrivateKeyPath, + OptsDebitInterval, Context, OptsSessionTTL, OptsSessionTTLMaxDelay, + OptsSessionTTLLastUsed, OptsSessionTTLLastUsage, OptsSessionTTLUsage, OptsAPIKey, OptsRouteID}) // SessionS ProccessEvent posible options const ( - // STIR - STIRATest = "STIRATest" - STIRPayloadMaxDuration = "STIRPayloadMaxDuration" - STIRIdentity = "STIRIdentity" - STIROriginatorTn = "STIROriginatorTn" - STIROriginatorURI = "STIROriginatorURI" - STIRDestinationTn = "STIRDestinationTn" - STIRDestinationURI = "STIRDestinationURI" - STIRPublicKeyPath = "STIRPublicKeyPath" - STIRPrivateKeyPath = "STIRPrivateKeyPath" - - DebitInterval = "DebitInterval" - Context = "Context" - - // SessionS terminator - SessionTTL = "SessionTTL" - SessionTTLMaxDelay = "SessionTTLMaxDelay" - SessionTTLLastUsed = "SessionTTLLastUsed" - SessionTTLLastUsage = "SessionTTLLastUsage" - SessionTTLUsage = "SessionTTLUsage" - - // DispatcherS - APIKey = "APIKey" - RouteID = "RouteID" + Context = "Context" // SupplierS RoutesLimit = "RoutesLimit" @@ -2261,7 +2238,26 @@ const ( // Event Opts const ( - OptsRatesStartTime = "*ratesStartTime" + OptsRatesStartTime = "*ratesStartTime" + OptsSessionTTL = "*sessionTTL" + OptsSessionTTLMaxDelay = "*sessionTTLMaxDelay" + OptsSessionTTLLastUsed = "*sessionTTLLastUsed" + OptsSessionTTLLastUsage = "*sessionTTLLastUsage" + OptsSessionTTLUsage = "*sessionTTLUsage" + OptsDebitInterval = "*sessionDebitInterval" + // STIR + OptsStirATest = "*stirATest" + OptsStirPayloadMaxDuration = "*stirPayloadMaxDuration" + OptsStirIdentity = "*stirIdentity" + OptsStirOriginatorTn = "*stirOriginatorTn" + OptsStirOriginatorURI = "*stirOriginatorURI" + OptsStirDestinationTn = "*stirDestinationTn" + OptsStirDestinationURI = "*stirDestinationURI" + OptsStirPublicKeyPath = "*stirPublicKeyPath" + OptsStirPrivateKeyPath = "*stirPrivateKeyPath" + // DispatcherS + OptsAPIKey = "*dispatcherApiKey" + OptsRouteID = "*dispatcherRouteID" ) func buildCacheInstRevPrefixes() {